Update flake.lock, use nixos-channel-scripts flake
Eelco Dolstra committed
Dec 30, 2019 at 23:33 UTC
76f7d2991ec495ac7a71698e11318eea29ebd672
4 files changed
+44
-16
bastion/flake.lock
+37
-11
@@ -4,45 +4,71 @@
4
"inputs": {
5
"nixpkgs": {
6
"inputs": {},
7
- "narHash": "sha256:1kg1afn84yxixvmanz030336kbi21f010bp0v0zn3mn97pdypd00",
7
+ "narHash": "sha256-HKuPcp/pBpKNBOnDlrSzObee5eB0LdzhI0RpRjTVxik=",
8
"originalUrl": "nixpkgs/release-19.09",
9
- "url": "github:edolstra/nixpkgs/bcceb882ccdfa818c1e18f4c1e88f2db68964305"
9
+ "url": "github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd"
10
}
11
},
12
- "narHash": "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=",
12
+ "narHash": "sha256-wiOmdFFMhuBGEcAURvj7c1LAcVbO82QjcFr+5WjuNzM=",
13
"originalUrl": "nix",
14
- "url": "github:NixOS/nix/9cac895406724e0304dff140379783c4d786e855"
14
+ "url": "github:NixOS/nix/c7866733d7ce2836fbb43de90dd64d17b0d20753"
15
},
16
"nixops": {
17
"inputs": {
18
"nixops-aws": {
19
"inputs": {},
20
- "narHash": "sha256:09c886dwa63flxqzkf7fjz6rp717pi5k3l6g5dxj8nclxnyxgn56",
20
+ "narHash": "sha256-ptjXve2UWSR7K8/QMUu8J5ybzZfuuPlxp24YxZtBiCU=",
21
"originalUrl": "github:NixOS/nixops-aws",
22
"url": "github:NixOS/nixops-aws/48a97f5b4825ff136d06340306d43996ff1fac5b"
23
},
24
"nixops-hetzner": {
25
"inputs": {},
26
- "narHash": "sha256:15cnis9q7cgjfl8k76fd47gmf1xr1v7siqsbvpr2bx5r8iirgza1",
26
+ "narHash": "sha256-Qf2XY0S59CXy3UvjqM8OuQdX3yHNmTMRdfKxg5OOlpU=",
27
"originalUrl": "github:NixOS/nixops-hetzner",
28
"url": "github:NixOS/nixops-hetzner/ef99acaa329476beb45fc10753d9de3d2d257671"
29
},
30
"nixpkgs": {
31
"inputs": {},
32
- "narHash": "sha256:1kg1afn84yxixvmanz030336kbi21f010bp0v0zn3mn97pdypd00",
32
+ "narHash": "sha256-HKuPcp/pBpKNBOnDlrSzObee5eB0LdzhI0RpRjTVxik=",
33
"originalUrl": "nixpkgs/release-19.09",
34
- "url": "github:edolstra/nixpkgs/bcceb882ccdfa818c1e18f4c1e88f2db68964305"
34
+ "url": "github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd"
35
}
36
},
37
- "narHash": "sha256:1y941vzyg5hvil6zm8yf75b5h9lxgh2dmqldggp2kmn8kz3llbxb",
37
+ "narHash": "sha256-qy9Kx5/I1inue43i2gR8nSZYVjnOo/oNjRuW5/8OJPk=",
38
"originalUrl": "nixops",
39
"url": "github:NixOS/nixops/a9d9996c3564c4b34c92f97e6e658ffe6140460c"
40
},
41
+ "nixos-channel-scripts": {
42
+ "inputs": {
43
+ "nix": {
44
+ "inputs": {
45
+ "nixpkgs": {
46
+ "inputs": {},
47
+ "narHash": "sha256-HKuPcp/pBpKNBOnDlrSzObee5eB0LdzhI0RpRjTVxik=",
48
+ "originalUrl": "nixpkgs/release-19.09",
49
+ "url": "github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd"
50
+ }
51
+ },
52
+ "narHash": "sha256-wiOmdFFMhuBGEcAURvj7c1LAcVbO82QjcFr+5WjuNzM=",
53
+ "originalUrl": "nix",
54
+ "url": "github:NixOS/nix/c7866733d7ce2836fbb43de90dd64d17b0d20753"
55
+ },
56
+ "nixpkgs": {
57
+ "inputs": {},
58
+ "narHash": "sha256-HKuPcp/pBpKNBOnDlrSzObee5eB0LdzhI0RpRjTVxik=",
59
+ "originalUrl": "nixpkgs/release-19.09",
60
+ "url": "github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd"
61
+ }
62
+ },
63
+ "narHash": "sha256-M9bn25lMT66f4HYpDxTbcRLZyYgO7VDqw38rhBrVDuk=",
64
+ "originalUrl": "github:NixOS/nixos-channel-scripts",
65
+ "url": "github:NixOS/nixos-channel-scripts/059ee08f5c73fdff81231cf23fa14fd6fcec8a2d"
66
+ },
67
"nixpkgs": {
68
"inputs": {},
43
- "narHash": "sha256:1kg1afn84yxixvmanz030336kbi21f010bp0v0zn3mn97pdypd00",
69
+ "narHash": "sha256-HKuPcp/pBpKNBOnDlrSzObee5eB0LdzhI0RpRjTVxik=",
70
"originalUrl": "nixpkgs/release-19.09",
45
- "url": "github:edolstra/nixpkgs/bcceb882ccdfa818c1e18f4c1e88f2db68964305"
71
+ "url": "github:edolstra/nixpkgs/03f3def66a104a221aac8b751eeb7075374848fd"
72
}
73
},
74
"version": 3
bastion/flake.nix
+4
-2
@@ -4,11 +4,13 @@
4
inputs.nixpkgs.uri = "nixpkgs/release-19.09";
5
#inputs.nixops.uri = "/home/deploy/src/nixops";
6
7
- outputs = { self, nixpkgs, nix, nixops }: {
7
+ inputs.nixos-channel-scripts.uri = github:NixOS/nixos-channel-scripts;
8
+
9
+ outputs = { self, nixpkgs, nix, nixops, nixos-channel-scripts }: {
10
11
nixopsConfigurations.default =
12
{ inherit nixpkgs; }
11
- // import ./network.nix { inherit self nix nixops; };
13
+ // import ./network.nix { inherit self nix nixops nixos-channel-scripts; };
14
15
};
16
}
bastion/network.nix
+2
-1
@@ -1,4 +1,4 @@
1
-{ self, nix, nixops }:
1
+{ self, nix, nixops, nixos-channel-scripts }:
2
3
let
4
region = "eu-west-1";
@@ -128,6 +128,7 @@ in
128
nixpkgs.overlays =
129
[ nix.overlay
130
nixops.overlay
131
+ nixos-channel-scripts.overlay
132
];
133
134
users.extraUsers.tarball-mirror.openssh.authorizedKeys.keys = [ sshKeys.eelco ];
modules/hydra-mirror.nix
+1
-2
@@ -3,7 +3,6 @@
3
let
4
channels = (import ../channels.nix).channels-with-urls;
5
6
- channelScripts = import /home/deploy/src/nixos-channel-scripts { inherit pkgs; }; # FIXME
6
orderLib = import ../lib/service-order.nix { inherit lib; };
7
8
makeUpdateChannel = channelName: mainJob:
@@ -11,7 +10,7 @@ let
10
name = "update-${channelName}";
11
value = {
12
description = "Update Channel ${channelName}";
14
- path = [ channelScripts ];
13
+ path = [ pkgs.nixos-channel-scripts ];
14
script =
15
''
16
# FIXME: use IAM role.