makemake: Update to latest Hydra
Eelco Dolstra committed
Dec 4, 2023 at 14:54 UTC
bfe18b4025ca7499964a86db09a5333f25bdd9eb
2 files changed
+18
-29
ngi0/makemake/flake.lock
+14
-25
@@ -22,16 +22,17 @@
22
"nixpkgs": "nixpkgs"
23
},
24
"locked": {
25
- "lastModified": 1687719230,
26
- "narHash": "sha256-VRNI3H/WUTi7VTNLwO/I0gMnJ6ZMYRbBfgdsAj+TmP4=",
25
+ "lastModified": 1701446871,
26
+ "narHash": "sha256-ILB2BOaNY+UBs8iSMZYJI2LfV+R/+I6zU9kV1/Sz6oU=",
27
"owner": "NixOS",
28
"repo": "hydra",
29
- "rev": "526e8bd7441d1beb271ff89bbca3604077ecffdb",
29
+ "rev": "f216bce0e62654ab4809003ec0756ee3e40d5172",
30
"type": "github"
31
},
32
"original": {
33
- "id": "hydra",
34
- "type": "indirect"
33
+ "owner": "NixOS",
34
+ "repo": "hydra",
35
+ "type": "github"
36
}
37
},
38
"lowdown-src": {
@@ -61,16 +62,16 @@
62
"nixpkgs-regression": "nixpkgs-regression"
63
},
64
"locked": {
64
- "lastModified": 1686048923,
65
- "narHash": "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU=",
65
+ "lastModified": 1701122567,
66
+ "narHash": "sha256-iA8DqS+W2fWTfR+nNJSvMHqQ+4NpYMRT3b+2zS6JTvE=",
67
"owner": "NixOS",
68
"repo": "nix",
68
- "rev": "84050709ea18f3285a85d729f40c8f8eddf5008e",
69
+ "rev": "50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d",
70
"type": "github"
71
},
72
"original": {
73
"owner": "NixOS",
73
- "ref": "2.16.1",
74
+ "ref": "2.19.2",
75
"repo": "nix",
76
"type": "github"
77
}
@@ -107,21 +108,6 @@
108
"type": "github"
109
}
110
},
110
- "nixpkgs_2": {
111
- "locked": {
112
- "lastModified": 1687829761,
113
- "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
114
- "owner": "NixOS",
115
- "repo": "nixpkgs",
116
- "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
117
- "type": "github"
118
- },
119
- "original": {
120
- "id": "nixpkgs",
121
- "ref": "nixos-23.05",
122
- "type": "indirect"
123
- }
124
- },
111
"root": {
112
"inputs": {
113
"hydra": "hydra",
@@ -129,7 +115,10 @@
115
"hydra",
116
"nix"
117
],
132
- "nixpkgs": "nixpkgs_2"
118
+ "nixpkgs": [
119
+ "hydra",
120
+ "nixpkgs"
121
+ ]
122
}
123
}
124
},
ngi0/makemake/flake.nix
+4
-4
@@ -1,7 +1,7 @@
1
{
2
- inputs.nixpkgs.url = "nixpkgs/nixos-23.05";
2
+ inputs.nixpkgs.follows = "hydra/nixpkgs";
3
inputs.nix.follows = "hydra/nix";
4
- #inputs.hydra.url = github:regnat/hydra/nix-ca;
4
+ inputs.hydra.url = "github:NixOS/hydra";
5
6
outputs = { self, nixpkgs, nix, hydra }: {
7
@@ -23,8 +23,8 @@
23
[ nix.overlays.default
24
];
25
26
- system.configurationRevision = self.rev
27
- or (throw "Cannot deploy from an unclean source tree!");
26
+ #system.configurationRevision = self.rev
27
+ # or (throw "Cannot deploy from an unclean source tree!");
28
29
nix.registry.nixpkgs.flake = nixpkgs;
30
nix.nixPath = [ "nixpkgs=${nixpkgs}" ];