diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-27 07:01:38 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-27 07:01:38 +0200 |
| commit | 883232c00ddc5e2a804084a8cdf94ffaf4c1cb0c (patch) | |
| tree | 1f6366122193b376ae045a520f4e05610ac0a7b1 /pkgs/tools/package-management | |
| parent | 1aff8dc4074013e0018bb749fd82b771c41ea839 (diff) | |
| parent | 3f46165af3f74df4eed27418377733cf237a33a0 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/home-manager/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 2b50e81dfc4f..43a8c4644639 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -1,18 +1,18 @@ #Adapted from -#https://github.com/rycee/home-manager/blob/9c1b3735b402346533449efc741f191d6ef578dd/home-manager/default.nix +#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix -{ bash, coreutils, less, stdenv, makeWrapper, fetchFromGitHub }: +{ bash, coreutils, findutils, gnused, less, stdenv, makeWrapper, fetchFromGitHub }: stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2018-11-04"; + version = "2019-04-23"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "05c93ff3ae13f1a2d90a279a890534cda7dc8ad6"; - sha256 = "0ymfvjnnz98ynws3v6dcil1cmp7x2cmm6zy8yqgkn8z7wyrrqq0v"; + rev = "ba0375bf06e0e0c3b2377edf913b7fddfd5a0b40"; + sha256 = "1ksr8fw5p5ai2a02whppc0kz9b3m5363hvfjghkzkd623kfh9073"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/home-manager \ --subst-var-by bash "${bash}" \ --subst-var-by coreutils "${coreutils}" \ + --subst-var-by findutils "${findutils}" \ + --subst-var-by gnused "${gnused}" \ --subst-var-by less "${less}" \ --subst-var-by HOME_MANAGER_PATH '${src}' ''; |