diff --git a/meta/nixpkgs.nix b/meta/nixpkgs.nix index 08fe650..27728d7 100644 --- a/meta/nixpkgs.nix +++ b/meta/nixpkgs.nix @@ -8,6 +8,7 @@ "unstable" "23.11" "24.05" + "24.11" ]; }; diff --git a/meta/nodes.nix b/meta/nodes.nix index 0973322..c43f209 100644 --- a/meta/nodes.nix +++ b/meta/nodes.nix @@ -35,6 +35,11 @@ "root@vault01.hyp01.infra.dgnum.eu" ]; }; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; compute01 = { @@ -44,7 +49,11 @@ stateVersion = "23.05"; nix-modules = [ "services/stirling-pdf" ]; - nixpkgs.version = "24.05"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; geo01 = { @@ -54,7 +63,11 @@ hashedPassword = "$y$j9T$2XmDpJu.QLhV57yYCh5Lf1$LK.X0HKB02Q0Ujvhj5nIofW2IRrIAL/Uxnvl9AXM1L8"; stateVersion = "24.05"; - nixpkgs.version = "24.05"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; geo02 = { @@ -64,7 +77,11 @@ hashedPassword = "$y$j9T$Q4fbMpSm9beWu4DPNAR9t0$dx/1pH4GPY72LpS5ZiECXAZFDdxwmIywztsX.qo2VVA"; stateVersion = "24.05"; - nixpkgs.version = "24.05"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; rescue01 = { @@ -76,6 +93,11 @@ stateVersion = "23.11"; vm-cluster = "Hyperviseur Luj"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; storage01 = { @@ -84,7 +106,11 @@ hashedPassword = "$y$j9T$tvRu1EJ9MwDSvEm0ogwe70$bKSw6nNteN0L3NOy2Yix7KlIvO/oROQmQ.Ynq002Fg8"; stateVersion = "23.11"; - nixpkgs.version = "24.05"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; nix-modules = [ "services/forgejo-nix-runners" @@ -99,7 +125,11 @@ hashedPassword = "$y$j9T$5osXVNxCDxu3jIndcyh7G.$UrjiDRpMu3W59tKHLGNdLWllZh.4p8IM4sBS5SrNrN1"; stateVersion = "23.11"; - nixpkgs.version = "24.05"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; adminGroups = [ "fai" ]; }; @@ -114,7 +144,10 @@ stateVersion = "23.05"; vm-cluster = "Hyperviseur NPS"; - nixpkgs.version = "24.05"; + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; web02 = { @@ -123,8 +156,12 @@ hashedPassword = "$y$j9T$p42UVNy78PykkQOjPwXNJ/$B/zCUOrHXVSFGUY63wnViMiSmU2vCWsiX0y62qqgNQ5"; stateVersion = "24.05"; - nixpkgs.version = "24.05"; vm-cluster = "Hyperviseur NPS"; + + nixpkgs = { + version = "24.05"; + system = "nixos"; + }; }; web03 = { @@ -133,7 +170,11 @@ hashedPassword = "$y$j9T$Un/tcX5SPKNXG.sy/BcTa.$kyNHELjb1GAOWnauJfcjyVi5tacWcuEBKflZDCUC6x4"; stateVersion = "24.05"; - nixpkgs.version = "unstable"; vm-cluster = "Hyperviseur NPS"; + + nixpkgs = { + version = "24.11"; + system = "nixos"; + }; }; } diff --git a/npins/sources.json b/npins/sources.json index 089db58..6c84b8b 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -261,6 +261,12 @@ "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.6668.e8c38b73aeb2/nixexprs.tar.xz", "hash": "0lhh36z3fvd3b64dz7an08y3c3shb67aj17ny9z28bs21i3dc5yh" }, + "nixos-24.11": { + "type": "Channel", + "name": "nixos-24.11", + "url": "https://releases.nixos.org/nixos/24.11/nixos-24.11.710486.4dc2fc4e62db/nixexprs.tar.xz", + "hash": "1pby8y3dcbdcjb6dklyy0wnn1dhzbbqaki6l2nlw9x13n6qqj4mb" + }, "nixos-generators": { "type": "Git", "repository": {