diff options
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/bash/bash-5.0-patches.nix | 1 | ||||
-rw-r--r-- | pkgs/shells/fish/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix index e6481aa4da1..ca7361b8a1f 100644 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ b/pkgs/shells/bash/bash-5.0-patches.nix @@ -17,4 +17,5 @@ patch: [ (patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") (patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") (patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") +(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") ] diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7cd31f14abd..3faa7f99657 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -7,6 +7,7 @@ , gnused , gnugrep , groff +, gawk , man-db , getent , libiconv @@ -165,6 +166,9 @@ let -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} + sed -e "s| awk | ${gawk}/bin/awk |" \ + -i $out/share/fish/functions/{__fish_print_packages.fish,__fish_print_addresses.fish,__fish_describe_command.fish,__fish_complete_man.fish,__fish_complete_convert_options.fish} \ + $out/share/fish/completions/{cwebp,adb,ezjail-admin,grunt,helm,heroku,lsusb,make,p4,psql,rmmod,vim-addons}.fish cat > $out/share/fish/functions/__fish_anypython.fish <<EOF function __fish_anypython diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 75fe569a437..87eed5a94aa 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-07-03"; + version = "2020-07-06"; pname = "oh-my-zsh"; - rev = "a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b"; + rev = "1c58a746af7a67f311ee47f97285a855eaf18b5e"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1byyhkd17sdrm5pz1k31xy1w8r6y85dsmhwqzy5kqzlsxbinjwxr"; + sha256 = "0qlwcyzrsrcmdi1fdd9a9niwf5sl8gg754l8r7p7cwzv0xq4jfpx"; }; pathsToLink = [ "/share/oh-my-zsh" ]; |