Merge pull request #324 from DarkKirb/update-hydra

update hydra
This commit is contained in:
Charlotte 🦝 Delenk 2023-12-18 18:33:51 +01:00 committed by GitHub
commit bfe5046ef5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 33 deletions

View file

@ -294,6 +294,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -387,15 +403,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697704332, "lastModified": 1702321565,
"narHash": "sha256-XDDllf7VLpSuQcBxv4v2BGoeKhbqDqISAu8r48eqc3Y=", "narHash": "sha256-RVTM37NcfrIGjnA35d2rlTmXntCWdwUQiEfKMYqZLQk=",
"owner": "DarkKirb", "owner": "thufschmitt",
"repo": "hydra", "repo": "hydra",
"rev": "30ba162924d53d4daafb09414b86241e7ecaa9ab", "rev": "7f3e2c807651f312d37d59b3fb1402407dff8d5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "DarkKirb", "owner": "thufschmitt",
"ref": "nix-ca",
"repo": "hydra", "repo": "hydra",
"type": "github" "type": "github"
} }
@ -543,21 +560,25 @@
}, },
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2",
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs", "nixpkgs": [
"hydra",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1677045134, "lastModified": 1702510710,
"narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=", "narHash": "sha256-9K+w1mQgmUxCmEsPaSFkpYsj/cxjO2PSwTCPkNZ/NiU=",
"owner": "nixos", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85", "rev": "b38e5a665e9d0aa7975beb0ed12e42d13a392e74",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "2.13.3", "ref": "2.19-maintenance",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@ -677,16 +698,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1670461440, "lastModified": 1702889381,
"narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", "narHash": "sha256-D9Pj7cm5h+7mWLdmjbxwvQtQtfwY0+6ndFcFOzE+Z2U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", "rev": "b4f9bed389be23eaa123b39bb7c19222db7165aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -707,21 +727,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1702889381,
"narHash": "sha256-D9Pj7cm5h+7mWLdmjbxwvQtQtfwY0+6ndFcFOzE+Z2U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b4f9bed389be23eaa123b39bb7c19222db7165aa",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1702889123, "lastModified": 1702889123,
@ -761,7 +766,7 @@
"nix-packages": "nix-packages", "nix-packages": "nix-packages",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-vscode-server": "nixos-vscode-server", "nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

View file

@ -86,7 +86,7 @@ rec {
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hydra = { hydra = {
url = "github:DarkKirb/hydra"; url = "github:thufschmitt/hydra/nix-ca";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lib-aggregate = { lib-aggregate = {