Browse Source

Update flake inputs

master
Emery Hemingway 3 months ago
parent
commit
59a85a3f3d
2 changed files with 29 additions and 60 deletions
  1. 20
    45
      flake.lock
  2. 9
    15
      flake.nix

+ 20
- 45
flake.lock View File

@@ -1,39 +1,33 @@
1 1
 {
2 2
   "nodes": {
3 3
     "hydra": {
4
-      "info": {
5
-        "lastModified": 1587883324,
6
-        "narHash": "sha256-WQxv9rrG2HX8j2UfXjifeBkMjgea3uIAEB3Swv+IIus="
7
-      },
8 4
       "inputs": {
9 5
         "nix": "nix",
10 6
         "nixpkgs": "nixpkgs_2"
11 7
       },
12 8
       "locked": {
13
-        "owner": "ehmry",
9
+        "lastModified": 1593509723,
10
+        "narHash": "sha256-ESv86LNnQQy5cYqeC1S4otpvkA8ABgs/zbge8xp35aE=",
11
+        "owner": "NixOS",
14 12
         "repo": "hydra",
15
-        "rev": "e93c36aab1bf96cf392ab0e40157b0620638b599",
13
+        "rev": "d0deebc4fc95dbeb0249f7b774b03d366596fbed",
16 14
         "type": "github"
17 15
       },
18 16
       "original": {
19
-        "owner": "ehmry",
20
-        "ref": "sotest",
21
-        "repo": "hydra",
22
-        "type": "github"
17
+        "id": "hydra",
18
+        "type": "indirect"
23 19
       }
24 20
     },
25 21
     "nix": {
26
-      "info": {
27
-        "lastModified": 1586440843,
28
-        "narHash": "sha256-7YxrpRPmAOoCSl6KtepKCXcae5MUm1Pl+lwDunBFGoo="
29
-      },
30 22
       "inputs": {
31 23
         "nixpkgs": "nixpkgs"
32 24
       },
33 25
       "locked": {
26
+        "lastModified": 1592818267,
27
+        "narHash": "sha256-t66Ny6NDA9sQa0U79iqo4w7tEBitUGgio9U/H6z3QpE=",
34 28
         "owner": "NixOS",
35 29
         "repo": "nix",
36
-        "rev": "3aaceeb7e2d3fb8a07a1aa5a21df1dca6bbaa0ef",
30
+        "rev": "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221",
37 31
         "type": "github"
38 32
       },
39 33
       "original": {
@@ -42,14 +36,12 @@
42 36
       }
43 37
     },
44 38
     "nixpkgs": {
45
-      "info": {
46
-        "lastModified": 1585405475,
47
-        "narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE="
48
-      },
49 39
       "locked": {
40
+        "lastModified": 1591633336,
41
+        "narHash": "sha256-oVXv4xAnDJB03LvZGbC72vSVlIbbJr8tpjEW5o/Fdek=",
50 42
         "owner": "NixOS",
51 43
         "repo": "nixpkgs",
52
-        "rev": "b88ff468e9850410070d4e0ccd68c7011f15b2be",
44
+        "rev": "70717a337f7ae4e486ba71a500367cad697e5f09",
53 45
         "type": "github"
54 46
       },
55 47
       "original": {
@@ -59,14 +51,12 @@
59 51
       }
60 52
     },
61 53
     "nixpkgs_2": {
62
-      "info": {
63
-        "lastModified": 1586219474,
64
-        "narHash": "sha256-fvfrMnEA2lDnXvH/eInGV5i0sO/EGLVHa4pOek8VG78="
65
-      },
66 54
       "locked": {
55
+        "lastModified": 1592263354,
56
+        "narHash": "sha256-1wHPn5qKfzfG06dZhpXDEg5Zt6HwvfyPPgW1tkYFejg=",
67 57
         "owner": "NixOS",
68 58
         "repo": "nixpkgs",
69
-        "rev": "29eddfc36d720dcc4822581175217543b387b1e8",
59
+        "rev": "a84b797b28eb104db758b5cb2b61ba8face6744b",
70 60
         "type": "github"
71 61
       },
72 62
       "original": {
@@ -75,31 +65,16 @@
75 65
         "type": "indirect"
76 66
       }
77 67
     },
78
-    "nixpkgs_3": {
79
-      "info": {
80
-        "lastModified": 1586724123,
81
-        "narHash": "sha256-VQ7zZy2xpz6dULpjar4jxNaQ0N/2q68l+EYO2nXaXDo="
82
-      },
83
-      "locked": {
84
-        "owner": "nixos",
85
-        "repo": "nixpkgs-channels",
86
-        "rev": "708cb6b307b04ad862cc50de792e57e7a4a8bb5a",
87
-        "type": "github"
88
-      },
89
-      "original": {
90
-        "owner": "nixos",
91
-        "ref": "nixos-20.03",
92
-        "repo": "nixpkgs-channels",
93
-        "type": "github"
94
-      }
95
-    },
96 68
     "root": {
97 69
       "inputs": {
98 70
         "hydra": "hydra",
99
-        "nixpkgs": "nixpkgs_3"
71
+        "nixpkgs": [
72
+          "hydra",
73
+          "nixpkgs"
74
+        ]
100 75
       }
101 76
     }
102 77
   },
103 78
   "root": "root",
104
-  "version": 5
79
+  "version": 7
105 80
 }

+ 9
- 15
flake.nix View File

@@ -1,27 +1,21 @@
1 1
 {
2 2
   description = "C3D2 NixOS configurations";
3 3
 
4
-  edition = 201909;
5
-
6
-  inputs.nixpkgs.url = "github:nixos/nixpkgs-channels/nixos-20.03";
7
-  inputs.hydra.url = "github:ehmry/hydra/sotest";
4
+  inputs = {
5
+    nixpkgs.follows = "hydra/nixpkgs";
6
+    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
7
+    # secrets.url = "git+file:///etc/nixos/secrets";
8
+  };
8 9
 
9 10
   outputs = { self, nixpkgs, hydra }: {
10 11
 
11 12
     nixosConfigurations = {
12 13
 
13 14
       server7 = nixpkgs.lib.nixosSystem {
14
-        modules = [ ./hosts/server7 hydra.nixosModules.hydra ];
15
-        system = "x86_64-linux";
16
-      };
17
-
18
-      hydra = nixpkgs.lib.nixosSystem {
19
-        modules = [ ./hosts/hydra/configuration.nix ];
20
-        system = "x86_64-linux";
21
-      };
22
-
23
-      pulsebert = nixpkgs.lib.nixosSystem {
24
-        modules = [ ./hosts/pulsebert/configuration.nix ];
15
+        modules = [
16
+          ./hosts/server7
17
+          hydra.nixosModules.hydra
18
+        ];
25 19
         system = "x86_64-linux";
26 20
       };
27 21
 

Loading…
Cancel
Save