@cryptotaxi247 / infra-1 / commits / 81ca75ad

delft: Update flake.lock

Eelco Dolstra committed Feb 3, 2020 at 18:22 UTC 81ca75ad7277c056ea8711be420fbf9b131f7286
4 files changed +166 -39
delft/common.nix
-5
@@ -6,11 +6,6 @@ with lib;
6 imports =
7 [ ./static-net-config.nix
8 ./diffoscope.nix
9 - # broke due to flakes, and then pinned back
10 - ((builtins.fetchGit {
11 - url = https://github.com/edolstra/dwarffs.git;
12 - rev = "531a2338101f0b6db2d9d512c3f98145f7b75397";
13 - }) + "/module.nix")
9 ../modules/common.nix
10 ../modules/prometheus
11 ];
delft/flake.lock
+158 -31
@@ -1,37 +1,164 @@
1 {
2 - "inputs": {
3 - "hydra": {
4 - "inputs": {
5 - "nix": {
6 - "inputs": {
7 - "nixpkgs": {
8 - "inputs": {},
9 - "narHash": "sha256-HkMF+s/yqNOOxqZGp+rscaC8LPtOGc50nEAjLFsnJpg=",
10 - "originalUrl": "nixpkgs/release-19.09",
11 - "url": "github:edolstra/nixpkgs/e7223c602152ee4544b05157fc9d88a3feed22c2"
12 - }
13 - },
14 - "narHash": "sha256-krYwU0ENuDqUIsqs9Fa/ig2MoMeVacoNU+oQkpwRYeU=",
15 - "originalUrl": "nix",
16 - "url": "github:NixOS/nix/6fadb3fc03a1a3d51a1aaea003bfbe347c3879b3"
17 - },
18 - "nixpkgs": {
19 - "inputs": {},
20 - "narHash": "sha256-HkMF+s/yqNOOxqZGp+rscaC8LPtOGc50nEAjLFsnJpg=",
21 - "originalUrl": "nixpkgs/release-19.09",
22 - "url": "github:edolstra/nixpkgs/e7223c602152ee4544b05157fc9d88a3feed22c2"
23 - }
24 - },
25 - "narHash": "sha256-IsiJTeLnVOc/Ij6C6ctsBTTyUwJ7C49vfhM9ZrB64dw=",
26 - "originalUrl": "hydra",
27 - "url": "github:NixOS/hydra/e7f2139e251cb73195eea6fb84e2a6167b4db968"
2 + "inputs": {
3 + "dwarffs": {
4 + "info": {
5 + "lastModified": 1577739225,
6 + "narHash": "sha256-xsBEEuAhHhZgDz2ARhD8teFTuVgxc1a2x20wSFZMeu0="
7 + },
8 + "inputs": {
9 + "nixpkgs": {
10 + "info": {
11 + "narHash": "sha256-HKuPcp/pBpKNBOnDlrSzObee5eB0LdzhI0RpRjTVxik="
12 + },
13 + "inputs": {},
14 + "locked": {
15 + "owner": "edolstra",
16 + "repo": "nixpkgs",
17 + "rev": "03f3def66a104a221aac8b751eeb7075374848fd",
18 + "type": "github"
19 + },
20 + "original": {
21 + "id": "nixpkgs",
22 + "ref": "release-19.09",
23 + "type": "indirect"
24 + }
25 + }
26 + },
27 + "locked": {
28 + "owner": "edolstra",
29 + "repo": "dwarffs",
30 + "rev": "47218f1b8f971925241b1b307a1e770a7c220b5e",
31 + "type": "github"
32 + },
33 + "original": {
34 + "id": "dwarffs",
35 + "type": "indirect"
36 + }
37 + },
38 + "hydra": {
39 + "info": {
40 + "lastModified": 1580750046,
41 + "narHash": "sha256-xsEq3SU9KyycQAcxp0yXuZ2s+fG/uagfCeQ67RUqERM="
42 + },
43 + "inputs": {
44 + "nix": {
45 + "info": {
46 + "lastModified": 1580749449,
47 + "narHash": "sha256-wEPYfs8ULx0dK6R4hrsXC/r8omxJLc86OhQg39eCo0c="
48 + },
49 + "inputs": {
50 + "nixpkgs": {
51 + "info": {
52 + "narHash": "sha256-V4jz8Hbt+mZkXhH+3KmUQcRGETOFd8mVPhgQlS4Lu5E="
53 + },
54 + "inputs": {},
55 + "locked": {
56 + "owner": "edolstra",
57 + "repo": "nixpkgs",
58 + "rev": "dd45a16733f4469a0dded6ad0bf9a662ea39bdea",
59 + "type": "github"
60 + },
61 + "original": {
62 + "id": "nixpkgs",
63 + "ref": "release-19.09",
64 + "type": "indirect"
65 + }
66 + }
67 + },
68 + "locked": {
69 + "owner": "NixOS",
70 + "repo": "nix",
71 + "rev": "0a4e911cf478d0d38082a8840a5acc8f57d00086",
72 + "type": "github"
73 + },
74 + "original": {
75 + "id": "nix",
76 + "type": "indirect"
77 + }
78 },
79 "nixpkgs": {
30 - "inputs": {},
31 - "narHash": "sha256-HkMF+s/yqNOOxqZGp+rscaC8LPtOGc50nEAjLFsnJpg=",
32 - "originalUrl": "nixpkgs/release-19.09",
33 - "url": "github:edolstra/nixpkgs/e7223c602152ee4544b05157fc9d88a3feed22c2"
80 + "info": {
81 + "lastModified": 1580555706,
82 + "narHash": "sha256-ly5Gxl9yZgW2w1F3aDU5bvg34Ct+juUaOg8vue+Mkbo="
83 + },
84 + "inputs": {},
85 + "locked": {
86 + "owner": "edolstra",
87 + "repo": "nixpkgs",
88 + "rev": "43e283790fbe330b723ac44b584824cf6d85c1ee",
89 + "type": "github"
90 + },
91 + "original": {
92 + "id": "nixpkgs",
93 + "ref": "release-19.09",
94 + "type": "indirect"
95 + }
96 + }
97 + },
98 + "locked": {
99 + "owner": "NixOS",
100 + "repo": "hydra",
101 + "rev": "f0e8e56f8963cac54e8dd07573acc3de79769f58",
102 + "type": "github"
103 + },
104 + "original": {
105 + "id": "hydra",
106 + "type": "indirect"
107 + }
108 + },
109 + "nix": {
110 + "info": {
111 + "lastModified": 1580749449,
112 + "narHash": "sha256-wEPYfs8ULx0dK6R4hrsXC/r8omxJLc86OhQg39eCo0c="
113 + },
114 + "inputs": {
115 + "nixpkgs": {
116 + "info": {
117 + "narHash": "sha256-V4jz8Hbt+mZkXhH+3KmUQcRGETOFd8mVPhgQlS4Lu5E="
118 + },
119 + "inputs": {},
120 + "locked": {
121 + "owner": "edolstra",
122 + "repo": "nixpkgs",
123 + "rev": "dd45a16733f4469a0dded6ad0bf9a662ea39bdea",
124 + "type": "github"
125 + },
126 + "original": {
127 + "id": "nixpkgs",
128 + "ref": "release-19.09",
129 + "type": "indirect"
130 + }
131 }
132 + },
133 + "locked": {
134 + "owner": "NixOS",
135 + "repo": "nix",
136 + "rev": "0a4e911cf478d0d38082a8840a5acc8f57d00086",
137 + "type": "github"
138 + },
139 + "original": {
140 + "id": "nix",
141 + "type": "indirect"
142 + }
143 },
36 - "version": 3
144 + "nixpkgs": {
145 + "info": {
146 + "lastModified": 1580555706,
147 + "narHash": "sha256-ly5Gxl9yZgW2w1F3aDU5bvg34Ct+juUaOg8vue+Mkbo="
148 + },
149 + "inputs": {},
150 + "locked": {
151 + "owner": "edolstra",
152 + "repo": "nixpkgs",
153 + "rev": "43e283790fbe330b723ac44b584824cf6d85c1ee",
154 + "type": "github"
155 + },
156 + "original": {
157 + "id": "nixpkgs",
158 + "ref": "release-19.09",
159 + "type": "indirect"
160 + }
161 + }
162 + },
163 + "version": 4
164 }
delft/flake.nix
+2 -2
@@ -4,11 +4,11 @@
4 #inputs.nixpkgs.uri = "/home/deploy/src/edolstra-nixpkgs"; # toString ../../edolstra-nixpkgs; # = "nixpkgs/release-19.09";
5 inputs.nixpkgs.uri = "nixpkgs/release-19.09";
6
7 - outputs = flakes @ { self, nixpkgs, hydra }: {
7 + outputs = flakes @ { self, nixpkgs, nix, hydra, dwarffs }: {
8
9 nixopsConfigurations.default =
10 { inherit nixpkgs; }
11 - // import ./network.nix { inherit self nixpkgs hydra flakes; };
11 + // import ./network.nix flakes;
12
13 };
14 }
delft/network.nix
+6 -1
@@ -35,15 +35,20 @@ in {
35 imports = [
36 ../modules/wireguard.nix
37 ../modules/prometheus
38 + flakes.dwarffs.nixosModules.dwarffs
39 + { system.configurationRevision = flakes.self.rev
40 + or (throw "Cannot deploy from an unclean source tree!");
41 + nixpkgs.overlays = [ flakes.nix.overlay ];
42 + }
43 ];
44 };
45 +
46 hydra = { deployment.targetHost = "hydra.ewi.tudelft.nl"; imports = [ ./build-machines-dell-1950.nix ]; };
47 lucifer = { deployment.targetHost = "lucifer.ewi.tudelft.nl"; imports = [ ./lucifer.nix ]; };
48 wendy = { deployment.targetHost = "wendy.ewi.tudelft.nl"; imports = [ ./wendy.nix ]; };
49 ike = { deployment.targetHost = "ike.ewi.tudelft.nl"; imports = [ ./build-machines-dell-r815.nix ]; };
50
51 chef = {
46 - system.configurationRevision = flakes.self.rev;
52 imports = [./chef.nix ];
53 };
54