diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-17 08:53:35 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-17 08:53:35 +0100 |
| commit | 1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947 (patch) | |
| tree | 9fd16ff6cf9ab05124b8e0443b5e305f7d541aa0 /pkgs/shells | |
| parent | 04d993417fec284a8f754de2d4a171e791f0ae2e (diff) | |
| parent | 330afe9f4e7e4de4779c654b48225bed7ae1e0cb (diff) | |
| download | nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.gz nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.bz2 nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.lz nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.xz nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.zst nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/mksh/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c4386b1a9fb8..ef3794d5144c 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { -i "$out/share/fish/functions/seq.fish" \ "$out/share/fish/functions/math.fish" sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" - sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ -e "s|which |${which}/bin/which |" \ @@ -31,6 +30,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \ --replace "clear;" "${ncurses}/bin/clear;" '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish" sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py" '' + '' sed -i "s|/sbin /usr/sbin||" \ diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 397b38180ebc..4e1570a3838c 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, groff }: -let version = "51"; in +let version = "52"; in stdenv.mkDerivation { name = "mksh-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1pyscl3w4aw067a5hb8mczy3z545jz1dwx9n2b09k09xydgsmvlz"; + sha256 = "13vnncwfx4zq3yi7llw3p6miw0px1bm5rrps3y1nlfn6sb6zbhj5"; }; buildInputs = [ groff ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; homepage = "https://www.mirbsd.org/mksh.htm"; license = licenses.free; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres nckx ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 7b12ab7cab81..5ce686cb8fcf 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.1.1"; + version = "5.2"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; - sha256 = "0p99dr7kck0a6im1w9qiiz2ai78mgy53gbbn87bam9ya2885gf05"; + sha256 = "1r9r91gmrrflzl0yq10bib9gxbqyhycb09hcx28m2g3vv9skmccj"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; - sha256 = "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl"; + sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"; }; buildInputs = [ ncurses coreutils pcre ]; |