diff options
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/bash/4.4.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/bash/5.0.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/nushell/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index deeb4093c68..d06157fa77c 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, binutils ? null, bison, autoconf, utillinux +, fetchurl, binutils ? null, bison, autoconf, util-linux # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline70 ? null @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { "SHOBJ_LIBS=-lbash" ]; - checkInputs = [ utillinux ]; + checkInputs = [ util-linux ]; doCheck = false; # dependency cycle, needs to be interactive postInstall = '' diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index 09030493fb6..7120910d79e 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, fetchurl, binutils ? null, bison, utillinux +, fetchurl, binutils ? null, bison, util-linux # patch for cygwin requires readline support , interactive ? stdenv.isCygwin, readline80 ? null @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "SHOBJ_LIBS=-lbash" ]; - checkInputs = [ utillinux ]; + checkInputs = [ util-linux ]; doCheck = false; # dependency cycle, needs to be interactive postInstall = '' diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 3faa7f99657..eabed40e8eb 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , coreutils -, utillinux +, util-linux , which , gnused , gnugrep @@ -178,7 +178,7 @@ let EOF '' + optionalString stdenv.isLinux '' - sed -e "s| ul| ${utillinux}/bin/ul|" \ + sed -e "s| ul| ${util-linux}/bin/ul|" \ -i "$out/share/fish/functions/__fish_print_help.fish" for cur in $out/share/fish/functions/*.fish; do sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \ diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 411d6eba000..44961696195 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f"; + sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4"; }; - cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w"; + cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8a2a9902599..7062fc60783 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-22"; + version = "2020-11-25"; pname = "oh-my-zsh"; - rev = "7a76afd61e5daab6fb33f955930efa7f4cf16021"; + rev = "d88887195fd5535ef2fd95180baa73af2a8c88f8"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0zcy8ydyk6ba497q7m0l24wqy8ri616304w76mcxmpv7hh6yfnqa"; + sha256 = "0p7j3y1g8x486g2fd2baap1nhfyg5hmcl9dyf4r4dj4l0xzb45wi"; }; installPhase = '' |