diff --git a/flake.lock b/flake.lock index e320826..4d5ef29 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ }, "nixlib": { "locked": { - "lastModified": 1724547350, - "narHash": "sha256-WKkGeNpenNMKD1gOF0Xuqi3VsKX/QCAiwz9qe5PDvzA=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b741d900fecd2f0c32d90f853b24be9f5f098b7d", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -119,19 +119,19 @@ "type": "github" } }, - "nixos-generators-2311": { + "nixos-generators-2405": { "inputs": { "nixlib": "nixlib", "nixpkgs": [ - "nixpkgs-2311" + "nixpkgs-2405" ] }, "locked": { - "lastModified": 1724893087, - "narHash": "sha256-M3+Z8SSpzKPQ+/vw9a99G9HfqKWbVGzhFz4p3KAX0NI=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0dd0205bc3f6d602ddb62aaece5f62a8715a9e85", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -371,7 +371,7 @@ "home-manager-2405": "home-manager-2405", "home-manager-edge": "home-manager-edge", "nix-index-database": "nix-index-database", - "nixos-generators-2311": "nixos-generators-2311", + "nixos-generators-2405": "nixos-generators-2405", "nixos-hardware": "nixos-hardware", "nixos-nspawn": "nixos-nspawn", "nixpkgs-1909": "nixpkgs-1909", diff --git a/flake.nix b/flake.nix index b951eeb..04de58f 100644 --- a/flake.nix +++ b/flake.nix @@ -43,8 +43,8 @@ #flake-programs-sqlite-2311.inputs.nixpkgs.follows = "nixpkgs-2311"; # https://github.com/nix-community/nixos-generators - nixos-generators-2311.url = "github:nix-community/nixos-generators"; - nixos-generators-2311.inputs.nixpkgs.follows = "nixpkgs-2311"; + nixos-generators-2405.url = "github:nix-community/nixos-generators"; + nixos-generators-2405.inputs.nixpkgs.follows = "nixpkgs-2405"; # https://github.com/Mic92/sops-nix sops-nix-edge.url = "github:Mic92/sops-nix"; @@ -102,7 +102,7 @@ self, nixos-hardware, nixos-nspawn, - nixos-generators-2311, + nixos-generators-2405, ... } @ inputs': let @@ -272,14 +272,14 @@ in builtins.mapAttrs (hostname: curried: curried hostname) { #hostname "domain" "system" inputs "state" [ modules ... ] noximilien = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au ts intel ]; - brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au amd nspawn ]; - nord = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au ts intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ]; - sopp = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au ts nixld intel cuda p1005 ]; - bjarte = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ ts nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; - bolle = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel ]; - eple = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel rocm ]; - garp = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel-novga cuda ]; - hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2311 "23.11" [ ts hw.pine64-pinebook-pro ]; + brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au amd nspawn ]; + nord = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au ts intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ]; + sopp = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au ts nixld intel cuda p1005 ]; + bjarte = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ ts nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; + bolle = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au dns64 intel ]; + eple = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au ts dns64 intel rocm ]; + garp = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au dns64 intel-novga cuda ]; + hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2405 "24.05" [ ts hw.pine64-pinebook-pro ]; #gomperud smattkuken skrytebiffen skalkesnerken balleby bingus skjrlaltatjlstad #bergjlot snortheimsmoen ditlefsen skrukkerud podebusk zmaragd makrell alfnes blix urke pytte uddu imdorf rosenqvist }; @@ -327,7 +327,7 @@ in pbsdspkgs // { nspawn-setup-brumlebasse = mk-nspawn-setup "brumlebasse"; - image-brumlebasse-openstack = nixos-generators-2311.nixosGenerate { + image-brumlebasse-openstack = nixos-generators-2405.nixosGenerate { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ (mkHosts (mkModule [])).brumlebasse ];