get rid of nix/hydra overlays
Jörg Thalheim committed
Apr 23, 2025 at 23:36 UTC
d472155a76901ac2756ec33ab6804bbcc91dc77b
3 files changed
+11
-20
build/flake-module.nix
+3
-13
@@ -12,19 +12,6 @@ let
12
];
13
14
nixpkgs.overlays = [
15
- inputs.nix.overlays.default
16
- inputs.hydra.overlays.default
17
- (
18
- final: prev:
19
- inputs.nixos-channel-scripts.overlays.default (
20
- final
21
- // {
22
- # Doesn't yet work with Nix 2.28
23
- # https://github.com/NixOS/nixos-channel-scripts/issues/79
24
- nix = final.nixVersions.nix_2_24;
25
- }
26
- ) prev
27
- )
15
inputs.rfc39.overlays.default
16
];
17
};
@@ -43,6 +30,7 @@ in
30
nixosConfigurations.haumea = lib.nixosSystem {
31
system = "x86_64-linux";
32
33
+ specialArgs = { inherit inputs; };
34
modules = [
35
flakesModule
36
./haumea
@@ -52,6 +40,7 @@ in
40
nixosConfigurations.pluto = lib.nixosSystem {
41
system = "x86_64-linux";
42
43
+ specialArgs = { inherit inputs; };
44
modules = [
45
flakesModule
46
./pluto
@@ -61,6 +50,7 @@ in
50
nixosConfigurations.mimas = lib.nixosSystem {
51
system = "x86_64-linux";
52
53
+ specialArgs = { inherit inputs; };
54
modules = [
55
flakesModule
56
./mimas
flake.lock
+6
-6
@@ -404,11 +404,11 @@
404
]
405
},
406
"locked": {
407
- "lastModified": 1742385144,
408
- "narHash": "sha256-9GwA/NISFyjAM7/ATK0Txy35K6YZphAfmK0iImK+ZM0=",
407
+ "lastModified": 1745395326,
408
+ "narHash": "sha256-ppe+1f5cwkUWZQnOtwYdv5k/SXFv/Ms9h65AnvjruFY=",
409
"owner": "NixOS",
410
"repo": "nixos-channel-scripts",
411
- "rev": "01a30270cf4a47bd1d9b721124d97e1318fdc871",
411
+ "rev": "43c524d3c8ad4bc32e8e743974fc776ea1b07971",
412
"type": "github"
413
},
414
"original": {
@@ -419,11 +419,11 @@
419
},
420
"nixpkgs": {
421
"locked": {
422
- "lastModified": 1743987495,
423
- "narHash": "sha256-46T2vMZ4/AfCK0Y2OjlFzJPxmdpP8GtsuEqSSJv3oe4=",
422
+ "lastModified": 1745408698,
423
+ "narHash": "sha256-JT1wMjLIypWJA0N2V27WpUw8feDmTok4Dwkb0oYXDS4=",
424
"owner": "NixOS",
425
"repo": "nixpkgs",
426
- "rev": "db8f4fe18ce772a9c8f3adf321416981c8fe9371",
426
+ "rev": "eea3403f7ca9f9942098f4f2756adab4ec924b2b",
427
"type": "github"
428
},
429
"original": {
modules/hydra-mirror.nix
+2
-1
@@ -2,6 +2,7 @@
2
config,
3
lib,
4
pkgs,
5
+ inputs,
6
...
7
}:
8
@@ -16,7 +17,7 @@ let
17
description = "Update Channel ${channelName}";
18
path = with pkgs; [
19
git
19
- nixos-channel-scripts
20
+ inputs.nixos-channel-scripts.packages.${pkgs.hostPlatform.system}.default
21
];
22
script = ''
23
# Hardcoded in channel scripts.