Merge pull request #13 from jwillikers/update-home-manager

Update Home Manager release as part of updating the NixOS release
jwillikers · Nov 19, 2024 · a546901 · a546901
2 parents 8bfb11f + d4e2799
commit a546901
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 13 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,19 +3,27 @@
     "adoc",
     "Asciidoctor",
     "autofix",
+    "cachix",
+    "deadnix",
     "direnv",
     "envrc",
     "ifdef",
     "ifndef",
+    "jsonfmt",
     "justfile",
     "jwillikers",
+    "nixfmt",
     "nixos",
     "nixpkgs",
     "numtide",
     "nushell",
     "ostree",
     "reviewdog",
-    "treefmt"
+    "statix",
+    "taplo",
+    "treefmt",
+    "webp",
+    "yamlfmt"
   ],
   "files.watcherExclude": {
     ".direnv/**": true,

diff --git a/README.adoc b/README.adoc
@@ -15,7 +15,7 @@ endif::[]
 :Nix: https://nixos.org/[Nix]
 :nix-direnv: https://github.com/nix-community/nix-direnv[nix-direnv]
 
-Scripts to automatically update a few Nix-related things, like the version of `nix-direnv` in `.envrc` files and the NixOS release in of the `nixpkgs` flake input.
+Scripts to automatically update a few Nix-related things, like the version of `nix-direnv` in `.envrc` files and the NixOS release in the `nixpkgs` and `home-manager` flake inputs.
 
 == Usage
 

diff --git a/packages/update-nix-direnv/package.nix b/packages/update-nix-direnv/package.nix
@@ -3,14 +3,11 @@
   nushell,
   stdenvNoCC,
 }:
-let
-  pname = "update-nix-direnv";
-in
 if lib.versionOlder nushell.version "0.99" then
-  throw "${pname} is not available for Nushell ${nushell.version}"
+  throw "update-nix-direnv is not available for Nushell ${nushell.version}"
 else
   stdenvNoCC.mkDerivation {
-    inherit pname;
+    pname = "update-nix-direnv";
     version = "0.1.0";
 
     src = ./.;

diff --git a/packages/update-nixos-release/package.nix b/packages/update-nixos-release/package.nix
@@ -3,11 +3,8 @@
   nushell,
   stdenvNoCC,
 }:
-let
-  pname = "update-nixos-release";
-in
 if lib.versionOlder nushell.version "0.94" then
-  throw "${pname} is not available for Nushell ${nushell.version}"
+  throw "update-nixos-release is not available for Nushell ${nushell.version}"
 else
   stdenvNoCC.mkDerivation {
     pname = "update-nixos-release";

diff --git a/packages/update-nixos-release/update-nixos-release-tests.nu b/packages/update-nixos-release/update-nixos-release-tests.nu
@@ -1,6 +1,7 @@
 #!/usr/bin/env nu
 use update-nixos-release.nu get_latest_nixos_release
 use update-nixos-release.nu update_nixos_release_in_flake
+use update-nixos-release.nu update_home_manager_release_in_flake
 
 use std assert
 
@@ -82,8 +83,70 @@ def test_update_nixos_release_in_flake [] {
     }
 }
 
+def test_update_home_manager_release_in_flake [] {
+    for t in [
+        [flake release expected];
+        ['
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    flake-utils.url = "github:numtide/flake-utils";
+    home-manager.url = "github:nix-community/home-manager/release-22.11";
+  };
+  outputs = { self, nixpkgs, flake-utils, home-manager, }:
+    flake-utils.lib.eachDefaultSystem
+      (system:
+        let
+          overlays = [
+          ];
+          pkgs = import nixpkgs {
+            inherit system overlays;
+          };
+          nativeBuildInputs = with pkgs; [
+          ];
+          buildInputs = with pkgs; [
+          ];
+        in
+        with pkgs;
+        {
+          devShells.default = mkShell {
+            inherit buildInputs nativeBuildInputs;
+          };
+        }
+      );' "24.11" '
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    flake-utils.url = "github:numtide/flake-utils";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
+  };
+  outputs = { self, nixpkgs, flake-utils, home-manager, }:
+    flake-utils.lib.eachDefaultSystem
+      (system:
+        let
+          overlays = [
+          ];
+          pkgs = import nixpkgs {
+            inherit system overlays;
+          };
+          nativeBuildInputs = with pkgs; [
+          ];
+          buildInputs = with pkgs; [
+          ];
+        in
+        with pkgs;
+        {
+          devShells.default = mkShell {
+            inherit buildInputs nativeBuildInputs;
+          };
+        }
+      );']
+    ] {
+        assert equal ($t.flake | update_home_manager_release_in_flake $t.release) $t.expected
+    }
+}
+
 def main [] [] {
     test_get_latest_nixos_release
     test_update_nixos_release_in_flake
+    test_update_home_manager_release_in_flake
     echo "All tests passed!"
 }
diff --git a/packages/update-nixos-release/update-nixos-release.nu b/packages/update-nixos-release/update-nixos-release.nu
@@ -46,10 +46,25 @@ export def update_nixos_release_in_flake [
     )
 }
 
+export def update_home_manager_release_in_flake [
+    release: string # Home Manager release, i.e. 24.05
+] [ string -> string ] {
+    (
+        $in | str replace --regex "github:nix-community/home-manager/release-[0-9][0-9]\\.[0-9][0-9]"
+        $"github:nix-community/home-manager/release-($release)"
+    )
+}
+
 def main [
     flake_file: string = "flake.nix" # Path to the flake.nix file to update
 ] {
     let release = get_latest_nixos_release (date now)
-    open $flake_file | update_nixos_release_in_flake $release | $"($in)\n" | save --force $flake_file
+    (
+        open $flake_file |
+        update_nixos_release_in_flake $release |
+        update_home_manager_release_in_flake $release |
+        $"($in)\n" |
+        save --force $flake_file
+    )
     exit 0
 }
diff --git a/pre-commit-hooks.nix b/pre-commit-hooks.nix
@@ -21,7 +21,7 @@
     editorconfig-checker.enable = true;
     end-of-file-fixer.enable = true;
     fix-byte-order-marker.enable = true;
-    flake-checker.enable = true;
+    # flake-checker.enable = true;
     forbid-new-submodules.enable = true;
     # todo Enable lychee when asciidoc is supported.
     # See https://github.com/lycheeverse/lychee/issues/291