diff options
Diffstat (limited to 'pkgs/shells/fish')
-rw-r--r-- | pkgs/shells/fish/babelfish.nix | 1 | ||||
-rw-r--r-- | pkgs/shells/fish/default.nix | 17 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/autopair.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/done.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/fifc.nix | 23 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/forgit.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/fzf-fish.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/hydro.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/puffer.nix | 18 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/pure.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/sdkman-for-fish.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/transient-fish.nix | 22 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/wakatime-fish.nix | 4 |
14 files changed, 83 insertions, 30 deletions
diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix index 9af0c2ce91381..a08944262cc48 100644 --- a/pkgs/shells/fish/babelfish.nix +++ b/pkgs/shells/fish/babelfish.nix @@ -14,6 +14,7 @@ buildGoModule rec { meta = with lib; { description = "Translate bash scripts to fish"; + mainProgram = "babelfish"; homepage = "https://github.com/bouk/babelfish"; license = licenses.mit; maintainers = with maintainers; [ bouk kevingriffin ]; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 3703644a73ae8..0013c205f31f2 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -135,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -145,7 +145,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-3xtzeLcU8GkLKF7Z5OWK/icKyY28nKWDlYnBr8yjOrE="; + hash = "sha256-YUyfVkPNB5nfOROV+mu8NklCe7g5cizjsRTTu8GjslA="; }; # Fix FHS paths in tests @@ -308,7 +308,7 @@ let passthru = { shellPath = "/bin/fish"; tests = { - nixos = nixosTests.fish; + nixos = lib.optionalAttrs stdenv.isLinux nixosTests.fish; # Test the fish_config tool by checking the generated splash page. # Since the webserver requires a port to run, it is not started. @@ -322,18 +322,17 @@ let # if we don't set `delete=False`, the file will get cleaned up # automatically (leading the test to fail because there's no # tempfile to check) - sed -e 's@, mode="w"@, mode="w", delete=False@' -i webconfig.py + ${lib.getExe gnused} -e 's@, mode="w"@, mode="w", delete=False@' -i webconfig.py # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py + ${lib.getExe gnused} -e '/fileurl =/q' -i webconfig.py echo "print(fileurl)" >> webconfig.py # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - # cannot test the http server because it needs a localhost port + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | ${lib.getExe gnused} -e 's|file://||' \ + ) | ${lib.getExe gnugrep} -q 'a href="http://localhost.*Start the Fish Web config' ''; in runCommand "test-web-config" { } '' diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix index 50b5a30b1d93a..7c75cc1236010 100644 --- a/pkgs/shells/fish/plugins/autopair.nix +++ b/pkgs/shells/fish/plugins/autopair.nix @@ -15,6 +15,6 @@ buildFishPlugin rec { description = "Auto-complete matching pairs in the Fish command line"; homepage = "https://github.com/jorgebucaran/autopair.fish"; license = licenses.mit; - maintainers = with maintainers; [ figsoda kidonng thehedgeh0g ]; + maintainers = with maintainers; [ figsoda kidonng pyrox0 ]; }; } diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 12157883d963b..d69c2ac2c29ef 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -19,6 +19,8 @@ lib.makeScope newScope (self: with self; { done = callPackage ./done.nix { }; + fifc = callPackage ./fifc.nix { }; + # Fishtape 2.x and 3.x aren't compatible, # but both versions are used in the tests of different other plugins. fishtape = callPackage ./fishtape.nix { }; @@ -56,6 +58,8 @@ lib.makeScope newScope (self: with self; { tide = callPackage ./tide.nix { }; + transient-fish = callPackage ./transient-fish.nix { }; + wakatime-fish = callPackage ./wakatime-fish.nix { }; z = callPackage ./z.nix { }; diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index f53840743bd27..4e5aa8e9a0900 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - hash = "sha256-VSCYsGjNPSFIZSdLrkc7TU7qyPVm8UupOoav5UqXPMk="; + hash = "sha256-DMIRKRAVOn7YEnuAtz4hIxrU93ULxNoQhW6juxCoh4o="; }; checkPlugins = [ fishtape ]; diff --git a/pkgs/shells/fish/plugins/fifc.nix b/pkgs/shells/fish/plugins/fifc.nix new file mode 100644 index 0000000000000..0b287d39ba2fc --- /dev/null +++ b/pkgs/shells/fish/plugins/fifc.nix @@ -0,0 +1,23 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, +}: +buildFishPlugin rec { + pname = "fifc"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "gazorby"; + repo = "fifc"; + rev = "v${version}"; + hash = "sha256-p5E4Mx6j8hcM1bDbeftikyhfHxQ+qPDanuM1wNqGm6E="; + }; + + meta = with lib; { + description = "Fzf powers on top of fish completion engine and allows customizable completion rules"; + homepage = "https://github.com/gazorby/fifc"; + license = licenses.mit; + maintainers = with maintainers; [ hmajid2301 ]; + }; +} diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 253208d479815..01e297b4225a1 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.02.0"; + version = "24.05.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI="; + hash = "sha256-XZeLF0YwUl8N8j8tRRU1QVd8tenTDorZyAHItCE4Jlw="; }; postInstall = '' diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index a9557d70c36c0..3a70c888c352d 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -5,13 +5,13 @@ let in buildFishPlugin rec { pname = "fzf.fish"; - version = "10.2"; + version = "10.3"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - hash = "sha256-1/MLKkUHe4c9YLDrH+cnL+pLiSOSERbIZSM4FTG3wF0="; + hash = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM="; }; nativeCheckInputs = [ fzf fd unixtools.script procps ]; diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix index cd8705d547166..c8e6eed725824 100644 --- a/pkgs/shells/fish/plugins/hydro.nix +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -15,6 +15,6 @@ buildFishPlugin rec { description = "Ultra-pure, lag-free prompt with async Git status"; homepage = "https://github.com/jorgebucaran/hydro"; license = licenses.mit; - maintainers = with maintainers; [ thehedgeh0g ]; + maintainers = with maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/shells/fish/plugins/puffer.nix b/pkgs/shells/fish/plugins/puffer.nix index 0365c55e53516..107191ca52e69 100644 --- a/pkgs/shells/fish/plugins/puffer.nix +++ b/pkgs/shells/fish/plugins/puffer.nix @@ -1,20 +1,24 @@ -{ lib, buildFishPlugin, fetchFromGitHub }: +{ + lib, + buildFishPlugin, + fetchFromGitHub, +}: buildFishPlugin rec { pname = "puffer"; - version = "unstable-2022-10-07"; + version = "1.0.0"; src = fetchFromGitHub { owner = "nickeb96"; repo = "puffer-fish"; - rev = "fd0a9c95da59512beffddb3df95e64221f894631"; - hash = "sha256-aij48yQHeAKCoAD43rGhqW8X/qmEGGkg8B4jSeqjVU0="; + rev = "v${version}"; + hash = "sha256-2niYj0NLfmVIQguuGTA7RrPIcorJEPkxhH6Dhcy+6Bk="; }; - meta = with lib; { + meta = { description = "Text Expansions for Fish"; homepage = "https://github.com/nickeb96/puffer-fish"; - license = licenses.mit; - maintainers = with maintainers; [ quantenzitrone ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ quantenzitrone ]; }; } diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 04334f14fa99b..25ea8aea89b8b 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "pure"; - version = "4.8.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw="; + hash = "sha256-8zxqPU9N5XGbKc0b3bZYkQ3yH64qcbakMsHIpHZSne4="; }; nativeCheckInputs = [ git ]; diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/shells/fish/plugins/sdkman-for-fish.nix index ee8b4757fc61f..6a0c7c7d25f04 100644 --- a/pkgs/shells/fish/plugins/sdkman-for-fish.nix +++ b/pkgs/shells/fish/plugins/sdkman-for-fish.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "sdkman-for-fish"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "reitzig"; repo = "sdkman-for-fish"; rev = "v${version}"; - hash = "sha256-cgDTunWFxFm48GmNv21o47xrXyo+sS6a3CzwHlv0Ezo="; + hash = "sha256-7cgyR3hQ30Jv+9lJS5qaBvSaI/0YVT8xPXlUhDBTdFc="; }; meta = with lib; { diff --git a/pkgs/shells/fish/plugins/transient-fish.nix b/pkgs/shells/fish/plugins/transient-fish.nix new file mode 100644 index 0000000000000..846436d2d1960 --- /dev/null +++ b/pkgs/shells/fish/plugins/transient-fish.nix @@ -0,0 +1,22 @@ +{ lib +, buildFishPlugin +, fetchFromGitHub +}: +buildFishPlugin { + pname = "transient-fish"; + version = "0-unstable-2024-03-10"; + + src = fetchFromGitHub { + owner = "zzhaolei"; + repo = "transient.fish"; + rev = "be0093f1799462a93953e69896496dee4d063fd6"; + hash = "sha256-rEkCimnkxcydKRI2y4DxEM7FD7F2/cGTZJN2Edq/Acc="; + }; + + meta = with lib; { + description = "Fish plugin to enable a transient prompt"; + homepage = "https://github.com/zzhaolei/transient.fish"; + license = licenses.mit; + maintainers = with maintainers; [ iynaix ]; + }; +} diff --git a/pkgs/shells/fish/plugins/wakatime-fish.nix b/pkgs/shells/fish/plugins/wakatime-fish.nix index 3bd6585d19cae..c265c8020d061 100644 --- a/pkgs/shells/fish/plugins/wakatime-fish.nix +++ b/pkgs/shells/fish/plugins/wakatime-fish.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "wakatime-fish"; - version = "0.0.3"; + version = "0.0.6"; src = fetchFromGitHub { owner = "ik11235"; repo = "wakatime.fish"; rev = "v${version}"; - hash = "sha256-t0b8jvkNU7agF0A8YkwQ57qGGqcYJF7l9eNr12j2ZQ0="; + hash = "sha256-Hsr69n4fCvPc64NztgaBZQuR0znkzlL8Uotw9Jf2S1o="; }; preFixup = '' |