diff --git a/flake.lock b/flake.lock index a9675a0..00c4fe1 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -78,16 +78,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685533922, - "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", + "lastModified": 1707347730, + "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", + "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c3f36ff..726850d 100644 --- 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 index 85cd31d..7c2955b 100644 --- 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 index bcd8d92..40414e8 100644 --- a/test/nixcfg/default.nix +++ b/test/nixcfg/default.nix @@ -75,7 +75,7 @@ sources = { }; moduleArgs = { }; modules = [ ./nixcfg/nixos/configs/hello.nix ]; - stateVersion = "23.05"; + stateVersion = "23.11"; system = "x86_64-linux"; }; ubuntu = { @@ -83,7 +83,7 @@ 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 index cfedaac..74c375d 100644 --- a/test/nixcfg/flake.lock +++ b/test/nixcfg/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1687083327, - "narHash": "sha256-1ZHIwhBaieb/Lvbph5NTgPta+r7V0RlaffgX3kbO9Jw=", + "lastModified": 1699821751, + "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "8f729fcbb4deccb0a588f1ec2fdb01785b4f0059", + "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", "type": "github" }, "original": { @@ -42,31 +42,31 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixos-23_05" + "nixos-23_11" ] }, "locked": { - "lastModified": 1687163790, - "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, "nixos-22_11": { "locked": { - "lastModified": 1687019075, - "narHash": "sha256-YjB+tp0DPfzct8XmXNW1UAfQp0irIVM7nGcJPiqT61c=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50d2e0780758fcb41cf5e494a51624cbf6c40b20", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { @@ -76,29 +76,29 @@ "type": "github" } }, - "nixos-23_05": { + "nixos-23_11": { "locked": { - "lastModified": 1687017257, - "narHash": "sha256-jbk0Szj1DPe9KwySeMr3KzYqW1JaUKJ6lYwSLMvc1n0=", + "lastModified": 1707238373, + "narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaef163eac75c2ac7f882c1fae4e0c08aa18d186", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", "repo": "nixpkgs", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" } }, "nixos-unstable": { "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -113,9 +113,9 @@ "extra-container": "extra-container", "home-manager": "home-manager", "nixos-22_11": "nixos-22_11", - "nixos-23_05": "nixos-23_05", + "nixos-23_11": "nixos-23_11", "nixos-stable": [ - "nixos-23_05" + "nixos-23_11" ], "nixos-unstable": "nixos-unstable", "nixpkgs": [ diff --git a/test/nixcfg/flake.nix b/test/nixcfg/flake.nix index 3a3eee5..4792e69 100644 --- a/test/nixcfg/flake.nix +++ b/test/nixcfg/flake.nix @@ -3,9 +3,11 @@ inputs = { nixos-22_11.url = "github:NixOS/nixpkgs/nixos-22.11"; - nixos-23_05.url = "github:NixOS/nixpkgs/nixos-23.05"; + # This is pinned to a commit of the day before nixcfg.lib its nixos 23.11, + # such that we can differentiate them and properly test whether the fallbacks work as intended. + nixos-23_11.url = "github:NixOS/nixpkgs/fb0c047e30b69696acc42e669d02452ca1b55755"; 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 +16,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 index d9f47ce..29e0769 100644 --- a/tests/nixcfg/flake.lock +++ b/tests/nixcfg/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1683579895, - "narHash": "sha256-bjcFOul4kiq/a+wpUQP3l0XRY1/burbPdvxxqmlZx30=", + "lastModified": 1699821751, + "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=", "owner": "erikarvstedt", "repo": "extra-container", - "rev": "46d9d7afb3d3de822217cd6515c150decf05868f", + "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49", "type": "github" }, "original": { @@ -22,12 +22,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -40,56 +43,52 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": [ - "extra-container", - "flake-utils" ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, - "nixos-22_11": { + "nixos-23_11": { "locked": { - "lastModified": 1682134069, - "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "lastModified": 1707238373, + "narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" } }, "nixos-unstable": { "locked": { - "lastModified": 1679437018, - "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "lastModified": 1707238373, + "narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "rev": "fb0c047e30b69696acc42e669d02452ca1b55755", "type": "github" } }, @@ -97,12 +96,27 @@ "inputs": { "extra-container": "extra-container", "home-manager": "home-manager", - "nixos-22_11": "nixos-22_11", + "nixos-23_11": "nixos-23_11", "nixos-unstable": "nixos-unstable", "nixpkgs": [ - "nixos-22_11" + "nixos-23_11" ] } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/tests/nixcfg/flake.nix b/tests/nixcfg/flake.nix index 1bd0029..2ebe948 100644 --- a/tests/nixcfg/flake.nix +++ b/tests/nixcfg/flake.nix @@ -2,9 +2,9 @@ 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"; @@ -12,7 +12,7 @@ }; 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"; };