diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
| commit | cff9e6429a4341e924594f5e057b03ca8101b314 (patch) | |
| tree | f8c1a31c9ad11b4c417b9c331747f3b3dc47bdf4 /pkgs/shells | |
| parent | a6055b7d8705d3c3a008e67cde1d43cf5727f76b (diff) | |
| parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) | |
| download | nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.tar nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.tar.gz nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.tar.bz2 nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.tar.lz nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.tar.xz nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.tar.zst nixpkgs-cff9e6429a4341e924594f5e057b03ca8101b314.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/powershell/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 8a5956161e0..a434ef7e4fb 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0w4dvkbi9jbybq7kvcgdccv8byp4ahlah45w2z8fwq961h3qnhg1" - else if stdenv.isLinux then "19dagxqvw0fpsjm6vbimqbax3bkmdm6wwifkfaq3ylrk0a9wwsrm" + platformSha = if stdenv.isDarwin then "005ax54l7752lhrvlpsyn2yywr4zh58psc7sc1qv9p86d414pmkq" + else if stdenv.isLinux then "1b3n6d2xgvqybmh61smyr415sfaymiilixlvs04yxm6ajsbnsm82" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.2.1"; + version = "6.2.2"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index b74b2fc43f3..e9458520bb4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, pcre }: +{ stdenv, fetchurl, ncurses, pcre, buildPackages }: let version = "5.7.1"; @@ -7,7 +7,6 @@ let url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; }; - in stdenv.mkDerivation { @@ -61,7 +60,11 @@ else fi fi EOF - $out/bin/zsh -c "zcompile $out/etc/zprofile" + ${if stdenv.hostPlatform == stdenv.buildPlatform then '' + $out/bin/zsh -c "zcompile $out/etc/zprofile" + '' else '' + ${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" + ''} mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used ''; # XXX: patch zsh to take zwc if newer _or equal_ |