Fix nix dependency, update Hydra
Eelco Dolstra committed
Oct 23, 2019 at 20:38 UTC
fcf6d38a7f8ab0d78b7cc01652e9b969a54064e9
4 files changed
+7
-10
bastion/network.nix
-5
@@ -151,11 +151,6 @@ in
151
#nix.gc.automatic = true;
152
nix.gc.dates = "daily";
153
154
- nix.extraOptions =
155
- ''
156
- experimental-features = nix-command flakes ca-references
157
- '';
158
-
154
# Temporary hack until we have proper users/roles.
155
services.openssh.extraConfig =
156
''
delft/common.nix
-2
@@ -49,8 +49,6 @@ with lib;
49
boot.kernel.sysctl."kernel.panic" = 60;
50
boot.kernel.sysctl."kernel.panic_on_oops" = 1;
51
52
- nix.package = pkgs.nixFlakes;
53
-
52
nix.nrBuildUsers = 100;
53
54
nix.extraOptions =
delft/flake.lock
+2
-2
@@ -22,9 +22,9 @@
22
"url": "github:edolstra/nixpkgs/bcceb882ccdfa818c1e18f4c1e88f2db68964305"
23
}
24
},
25
- "narHash": "sha256-cOwNDkeFcJ3JCWIGup7fgUzW6iDca9C29OS59MiVO2s=",
25
+ "narHash": "sha256-FNEoqvd2lvoi7EYHfUMDW4nEurmuXKkFocIBeDjq00Q=",
26
"originalUrl": "hydra",
27
- "url": "github:NixOS/hydra/43d4bc910890e251cebb9216891924eb08e19236"
27
+ "url": "github:NixOS/hydra/a816730d8b3b95a6cbb96fc64c483957d6e8573e"
28
},
29
"nixpkgs": {
30
"inputs": {},
modules/common.nix
+5
-1
@@ -12,7 +12,11 @@ with lib;
12
13
nix.useSandbox = true;
14
nix.buildCores = 0;
15
- nix.nixPath = [ "nixpkgs=channel:nixos-19.03-small" ];
15
+ nix.nixPath = [ "nixpkgs=channel:nixos-19.09-small" ];
16
+ nix.extraOptions =
17
+ ''
18
+ experimental-features = nix-command flakes ca-references
19
+ '';
20
21
environment.systemPackages =
22
[ pkgs.emacs