Skip to content

Commit 835e7bd

Browse files
authored
Merge pull request #657 from NixOS/no-overlays
get rid of nix/hydra overlays
2 parents d0189c1 + d472155 commit 835e7bd

3 files changed

Lines changed: 11 additions & 20 deletions

File tree

build/flake-module.nix

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,6 @@ let
1212
];
1313

1414
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-
)
2815
inputs.rfc39.overlays.default
2916
];
3017
};
@@ -43,6 +30,7 @@ in
4330
nixosConfigurations.haumea = lib.nixosSystem {
4431
system = "x86_64-linux";
4532

33+
specialArgs = { inherit inputs; };
4634
modules = [
4735
flakesModule
4836
./haumea
@@ -52,6 +40,7 @@ in
5240
nixosConfigurations.pluto = lib.nixosSystem {
5341
system = "x86_64-linux";
5442

43+
specialArgs = { inherit inputs; };
5544
modules = [
5645
flakesModule
5746
./pluto
@@ -61,6 +50,7 @@ in
6150
nixosConfigurations.mimas = lib.nixosSystem {
6251
system = "x86_64-linux";
6352

53+
specialArgs = { inherit inputs; };
6454
modules = [
6555
flakesModule
6656
./mimas

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/hydra-mirror.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
config,
33
lib,
44
pkgs,
5+
inputs,
56
...
67
}:
78

@@ -16,7 +17,7 @@ let
1617
description = "Update Channel ${channelName}";
1718
path = with pkgs; [
1819
git
19-
nixos-channel-scripts
20+
inputs.nixos-channel-scripts.packages.${pkgs.hostPlatform.system}.default
2021
];
2122
script = ''
2223
# Hardcoded in channel scripts.

0 commit comments

Comments
 (0)