diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
| commit | 25e60feb725f1ce58590a097ffe088bbf14717e2 (patch) | |
| tree | 1cccfe708e755ca59aaa18135d8c1bc516688298 /pkgs/shells | |
| parent | 333f145d7604f07e3b2164b459b46e075fea81f4 (diff) | |
| parent | 369febb9569bdd3ddb76d8de2db6e27441d13e9f (diff) | |
| download | nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.gz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.bz2 nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.lz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.xz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.zst nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/shells/mksh/default.nix | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 2460c511850f..12cd864ca7c4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv, coreutils }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ python which groff gettext ] ++ stdenv.lib.optional (!stdenv.isDarwin) man_db - ++ [ bc ]; + ++ [ bc coreutils ]; postInstall = '' - sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" + sed -e "s|bc|${bc}/bin/bc|" \ + -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ + -i "$out/share/fish/functions/seq.fish" sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|gettext |${gettext}/bin/gettext |" \ diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 28359bb555d0..397b38180ebc 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, groff }: -with stdenv.lib; -stdenv.mkDerivation rec { - +let version = "51"; in +stdenv.mkDerivation { name = "mksh-${version}"; - version = "R50d"; src = fetchurl { urls = [ - "http://www.mirbsd.org/MirOS/dist/mir/mksh/${name}.tgz" - "http://pub.allbsd.org/MirOS/dist/mir/mksh/${name}.tgz" + "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 = "10prcdffwziksq9sw96c1r09h4kg2zwznybrggzmjfa6l4k8h9m2"; + sha256 = "1pyscl3w4aw067a5hb8mczy3z545jz1dwx9n2b09k09xydgsmvlz"; }; buildInputs = [ groff ]; @@ -31,7 +29,8 @@ stdenv.mkDerivation rec { install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc ''; - meta = { + meta = with stdenv.lib; { + inherit version; description = "MirBSD Korn Shell"; longDescription = '' The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = stdenv.lib.licenses.free; + license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; |