diff options
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/bash-4.3-patches.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/fish/command-not-found.patch | 13 | ||||
| -rw-r--r-- | pkgs/shells/fish/default.nix | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix index c994ed636a9..f84ac836e94 100644 --- a/pkgs/shells/bash/bash-4.3-patches.nix +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -42,5 +42,5 @@ patch: [ (patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b") (patch "040" "0sypv66vsldmc95gwvf7ylz1k7y37vnvdsjg8ajjr6b2j9mkkfw4") (patch "041" "06ic2gdpbi1afik3wqf9d4vh95if4bz8bmhcgr555621dsb35i2f") -(patch "042" "1bwhssay66n75fy0pxcrwbm032s6fvfg7dblzbrzzn5k38a56nmp") +(patch "042" "06a90k0p6bqc4wk2dsmapna69124an76xvlnlj3xm497vci968dc") ] diff --git a/pkgs/shells/fish/command-not-found.patch b/pkgs/shells/fish/command-not-found.patch new file mode 100644 index 00000000000..aaca001dcb6 --- /dev/null +++ b/pkgs/shells/fish/command-not-found.patch @@ -0,0 +1,13 @@ +diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish +index c3864a8..a12ac4d 100644 +--- a/share/functions/__fish_config_interactive.fish ++++ b/share/functions/__fish_config_interactive.fish +@@ -230,7 +230,7 @@ function __fish_config_interactive -d "Initializations that should be performed + # Check for NixOS handler + else if test -f /run/current-system/sw/bin/command-not-found + function __fish_command_not_found_handler --on-event fish_command_not_found +- /run/current-system/sw/bin/command-not-found $argv[1] ++ /run/current-system/sw/bin/command-not-found $argv + end + # Ubuntu Feisty places this command in the regular path instead + else if type -q -p command-not-found diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 6fa250a4ea7..0fa8e82fb89 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { name = "fish-${version}"; version = "2.2.0"; + patches = [ ./command-not-found.patch ]; + src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7"; |