1 files changed, 69 insertions, 35 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
index 80ef87217d83..89a626fef672 100644
--- a/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/home-manager/default.nix
@@ -1,58 +1,92 @@
-#Adapted from
-#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix
-
-{ bash, coreutils, findutils, gnused, less, ncurses, gettext, nixos-option, lib, stdenv, makeWrapper, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, bash
+, coreutils
+, findutils
+, gettext
+, gnused
+, less
+, ncurses
+, nixos-option
+, unixtools
+, installShellFiles
+, unstableGitUpdater
+}:
 
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "2022-04-17";
+  version = "2023-05-30";
 
   src = fetchFromGitHub {
+    name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "620ed197f3624dafa5f42e61d5c043f39b8df366";
-    sha256 = "sha256-BoBvGT71yOfrNDTZQs7+FX0zb4yjMBETgIjtTsdJw+o=";
+    rev = "54a9d6456eaa6195998a0f37bdbafee9953ca0fb";
+    hash = "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    gettext
+    installShellFiles
+  ];
+
+  dontConfigure = true;
   dontBuild = true;
 
   installPhase = ''
-    install -v -D -m755 ${src}/home-manager/home-manager $out/bin/home-manager
+    runHook preInstall
+
+    install -D -m755 home-manager/home-manager $out/bin/home-manager
+    install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh
 
     substituteInPlace $out/bin/home-manager \
       --subst-var-by bash "${bash}" \
       --subst-var-by DEP_PATH "${
-        lib.makeBinPath [ coreutils findutils gettext gnused less ncurses nixos-option ]
+        lib.makeBinPath [
+          coreutils
+          findutils
+          gettext
+          gnused
+          less
+          ncurses
+          nixos-option
+          unixtools.hostname
+        ]
       }" \
-      --subst-var-by HOME_MANAGER_LIB '${src}/lib/bash/home-manager.sh' \
-      --subst-var-by HOME_MANAGER_PATH '${src}' \
-      --subst-var-by OUT "$out"
-
-    install -D -m755 ${src}/home-manager/completion.bash \
-      $out/share/bash-completion/completions/home-manager
-    install -D -m755 ${src}/home-manager/completion.zsh \
-      $out/share/zsh/site-functions/_home-manager
-    install -D -m755 ${src}/home-manager/completion.fish \
-      $out/share/fish/vendor_completions.d/home-manager.fish
-
-    install -D -m755 ${src}/lib/bash/home-manager.sh \
-      "$out/share/bash/home-manager.sh"
-
-    for path in ${src}/home-manager/po/*.po; do
-      lang="''${path##*/}"
+      --subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \
+      --subst-var-by HOME_MANAGER_PATH "" \
+      --subst-var-by OUT '${placeholder "out"}'
+
+    installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
+    installShellCompletion --fish --name home-manager.fish home-manager/completion.fish
+    installShellCompletion --zsh --name _home-manager home-manager/completion.zsh
+
+    for pofile in home-manager/po/*.po; do
+      lang="''${pofile##*/}"
       lang="''${lang%%.*}"
       mkdir -p "$out/share/locale/$lang/LC_MESSAGES"
-      ${gettext}/bin/msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$path"
+      msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile"
     done
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
-    description = "A user environment configurator";
-    homepage = "https://rycee.gitlab.io/home-manager/";
-    platforms = platforms.unix;
-    license = licenses.mit;
+  passthru.updateScript = unstableGitUpdater {
+    url = "https://github.com/nix-community/home-manager/";
   };
 
-}
+  meta = {
+    homepage = "https://nix-community.github.io/home-manager/";
+    description = "A Nix-based user environment configurator";
+    longDescription = ''
+      The Home-Manager project provides a basic system for managing a user
+      environment using the Nix package manager together with the Nix libraries
+      found in Nixpkgs. It allows declarative configuration of user specific
+      (non global) packages and dotfiles.
+    '';
+    platforms = lib.platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+  };
+})