refactor: update to nixos 23.11

msteen · Feb 9, 2024 · 68c5e90 · 68c5e90
1 parent 6fd6d04
commit 68c5e90
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 51 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     # We use the latest stable release because it also acts as the fallback nixpkgs.
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     flake-compat = {
       url = "github:edolstra/flake-compat";

diff --git a/nixcfg/mkModule.nix b/nixcfg/mkModule.nix
@@ -49,7 +49,7 @@
 
     stateVersion = mkOption {
       type = types.str;
-      default = "23.05";
+      default = "23.11";
       description = ''
         The state version of this ${type} configuration.
 

diff --git a/test/nixcfg/default.nix b/test/nixcfg/default.nix
@@ -75,15 +75,15 @@
           sources = { };
           moduleArgs = { };
           modules = [ ./nixcfg/nixos/configs/hello.nix ];
-          stateVersion = "23.05";
+          stateVersion = "23.11";
           system = "x86_64-linux";
         };
         ubuntu = {
           channelName = "nixpkgs";
           sources = { };
           moduleArgs = { };
           modules = [ ./nixcfg/nixos/configs/ubuntu ];
-          stateVersion = "23.05";
+          stateVersion = "23.11";
           system = "x86_64-linux";
         };
       };
@@ -101,7 +101,7 @@
           channelName = "nixpkgs";
           sources = { inherit (sources) home-manager; };
           moduleArgs = { };
-          stateVersion = "23.05";
+          stateVersion = "23.11";
           system = "x86_64-linux";
           users.matthijs = {
             homeDirectory = "/home/matthijs";
@@ -215,7 +215,7 @@
           sources = { };
           moduleArgs = { };
           modules = [ ./nixcfg/container/configs/hello.nix ];
-          stateVersion = "23.05";
+          stateVersion = "23.11";
           system = "x86_64-linux";
         };
       };
@@ -249,7 +249,7 @@
         };
         pkgsPath = toString example.configurations.home.ubuntu_matthijs.pkgs.path;
       in {
-        isStableNixpkgs = pkgsPath == sources.nixos-23_05;
+        isStableNixpkgs = pkgsPath == sources.nixos-23_11;
         isNixcfgNixpkgs = pkgsPath == nixpkgs;
       };
       expected = {
@@ -261,7 +261,7 @@
     testDefaultNixpkgs_3 = {
       expr = let
         example = exampleWith {
-          sources = removeAttrs sources [ "nixpkgs" "nixos-22_11" "nixos-23_05" "nixos-stable" "nixos-unstable" ];
+          sources = removeAttrs sources [ "nixpkgs" "nixos-22_11" "nixos-23_11" "nixos-stable" "nixos-unstable" ];
         };
         pkgsPath = toString example.configurations.home.ubuntu_matthijs.pkgs.path;
       in

diff --git a/test/nixcfg/flake.lock b/test/nixcfg/flake.lock
diff --git a/test/nixcfg/flake.nix b/test/nixcfg/flake.nix
@@ -3,9 +3,9 @@
 
   inputs = {
     nixos-22_11.url = "github:NixOS/nixpkgs/nixos-22.11";
-    nixos-23_05.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixos-23_11.url = "github:NixOS/nixpkgs/nixos-23.11";
     nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixos-stable.follows = "nixos-23_05";
+    nixos-stable.follows = "nixos-23_11";
     nixpkgs.follows = "nixos-stable";
 
     extra-container = {
@@ -14,8 +14,8 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
-      inputs.nixpkgs.follows = "nixos-23_05";
+      url = "github:nix-community/home-manager/release-23.11";
+      inputs.nixpkgs.follows = "nixos-23_11";
     };
   };
 

diff --git a/tests/nixcfg/flake.lock b/tests/nixcfg/flake.lock
diff --git a/tests/nixcfg/flake.nix b/tests/nixcfg/flake.nix
@@ -2,17 +2,17 @@
   description = "Nix configuration";
 
   inputs = {
-    nixpkgs.follows = "nixos-23_05";
-    nixos-23_05.url = "github:NixOS/nixpkgs/fd901ef4bf93499374c5af385b2943f5801c0833";
-    nixos-unstable.url = "github:NixOS/nixpkgs/19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e";
+    nixpkgs.follows = "nixos-23_11";
+    nixos-23_11.url = "github:NixOS/nixpkgs/fb0c047e30b69696acc42e669d02452ca1b55755";
+    nixos-unstable.url = "github:NixOS/nixpkgs/fb0c047e30b69696acc42e669d02452ca1b55755";
 
     extra-container = {
       url = "github:erikarvstedt/extra-container";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.utils.follows = "extra-container/flake-utils";
     };