public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12000 from nathan7/nix-auto-run

Browse Source 
command-not-found: add NIX_AUTO_RUN option, to automatically invoke nix-shell
This commit is contained in:
Nikolay Amiantov
2016-01-03 03:22:50 +03:00
parent 91fbdd3ee2 e60c4995fd
commit e312276b01
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/shells/fish/command-not-found.patch Normal file
View File

@@ -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

2
pkgs/shells/fish/default.nix
View File

@@ -4,6 +4,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";