diff options
Diffstat (limited to 'pkgs/shells')
28 files changed, 61 insertions, 40 deletions
diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/shells/bash/blesh/default.nix index 9428703e7a2d..88633760fdc0 100644 --- a/pkgs/shells/bash/blesh/default.nix +++ b/pkgs/shells/bash/blesh/default.nix @@ -54,6 +54,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/akinomyoga/ble.sh"; description = "Bash Line Editor -- a full-featured line editor written in pure Bash"; + mainProgram = "blesh-share"; license = licenses.bsd3; maintainers = with maintainers; [ aiotter ]; platforms = platforms.unix; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 356979253383..0e462149e67a 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.30.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-gYYNwDUL00b9orq1suxa9VtHBLUgRgntQcYw24vgncg="; + hash = "sha256-lc+oU9adFbtQyb4wKLgbf5i6UwxsKUJo3giquDTO6qg="; }; - vendorHash = "sha256-RML1al1XlONzeCCkz34Ij1I/WDQSTVrm3P6RaOdyWKI="; + vendorHash = "sha256-XAdTLfMnOAcOiRYZGrom2Q+qp+epfg6Y9Jv0V0T12/8="; ldflags = [ "-s" diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 308a684e6f68..1a75aca391b1 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An extensible shell with higher order functions"; + mainProgram = "es"; longDescription = '' Es is an extensible shell. The language was derived diff --git a/pkgs/shells/fish/babelfish.nix b/pkgs/shells/fish/babelfish.nix index 9af0c2ce9138..a08944262cc4 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 3703644a73ae..0013c205f31f 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/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index e5e226665989..920eb5be382e 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.03.1"; + version = "24.03.2"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-DIaoD6o+oY+/FnwQadQh0XqMVP4xbE8gAPtWrvwsG+c="; + hash = "sha256-DnGQHWx3uFHFEI1kMTB6hfmaE4tY4O/hesPKj5s4uwQ="; }; postInstall = '' diff --git a/pkgs/shells/fish/plugins/puffer.nix b/pkgs/shells/fish/plugins/puffer.nix index 0365c55e5351..107191ca52e6 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/fzf-git-sh/default.nix b/pkgs/shells/fzf-git-sh/default.nix index 598c2d0eb0b2..8d7ce5d1e0f7 100644 --- a/pkgs/shells/fzf-git-sh/default.nix +++ b/pkgs/shells/fzf-git-sh/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "unstable-2022-09-30"; + version = "0-unstable-2024-03-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "9190e1bf7273d85f435fa759a5c3b20e588e9f7e"; - sha256 = "sha256-2CGjk1oTXip+eAJMuOk/X3e2KTwfwzcKTcGToA2xPd4="; + rev = "e4cba1fcf8aed9a2348e47b0ba64299122b81709"; + hash = "sha256-glI+TldLGGiXyI5ZghaEgjc+2DJCMdmBnho/Z7IgJoE="; }; dontBuild = true; diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index 57b7abc59e25..ed6bc7a159db 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "An interactive Unix-like shell written in Go"; + mainProgram = "hilbish"; changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}"; homepage = "https://github.com/Rosettea/Hilbish"; maintainers = with maintainers; [ moni ]; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 72b6387f8e16..0440a79e760f 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Modern system shell with simple (and powerful) syntax"; + mainProgram = "ion"; homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index a09024608bb6..42e8e13cceae 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "just a useless shell"; + mainProgram = "jush"; homepage = "https://github.com/troglobit/jush"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 47e2e72c7ab7..acb34377d28d 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; homepage = "https://github.com/nojhan/liquidprompt"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/shells/mrsh/default.nix index 2b9bc4e3e22e..3bb76cb04df8 100644 --- a/pkgs/shells/mrsh/default.nix +++ b/pkgs/shells/mrsh/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A minimal POSIX shell"; + mainProgram = "mrsh"; homepage = "https://mrsh.sh"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index d44c32e81cfc..4e44b6bd7ecf 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Bash-like shell and scripting environment with advanced features designed for safety and productivity"; + mainProgram = "murex"; homepage = "https://murex.rocks"; license = licenses.gpl2; maintainers = with maintainers; [ dit7ya kashw2 ]; diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix index 9489fd4cf5a6..c93b8ab547e8 100644 --- a/pkgs/shells/nix-your-shell/default.nix +++ b/pkgs/shells/nix-your-shell/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = pname; rev = "v${version}"; - hash = "sha256-pa52demadLi5VN+GixQKVL9iD1kb9c32PqIh86BIUR8="; + hash = "sha256-pBryTpCFwOkK5astzpYzhj/fJ9QS7IiKUck/Y4gLZZw="; }; - cargoHash = "sha256-btM9AUH1S1AA8gEwXwouOT/E2oio0CmOZ738M+DUMiE="; + cargoHash = "sha256-6A7Lvys22dnFMKm1uRo2CCZk9LBRqHPBnmRPbvbDryI="; meta = with lib; { mainProgram = "nix-your-shell"; diff --git a/pkgs/shells/nsh/default.nix b/pkgs/shells/nsh/default.nix index 881d14002ebd..3280bc9b2a38 100644 --- a/pkgs/shells/nsh/default.nix +++ b/pkgs/shells/nsh/default.nix @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command-line shell like fish, but POSIX compatible"; + mainProgram = "nsh"; homepage = "https://github.com/nuta/nsh"; changelog = "https://github.com/nuta/nsh/raw/v${version}/docs/changelog.md"; license = [ licenses.cc0 /* or */ licenses.mit ]; diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 69f5f3045ad4..dc36f5296813 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2024-03-09"; + version = "unstable-2024-03-20"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "5e51b23b1f25eef426da5548964e14fef4b4a485"; - hash = "sha256-sAqTGy7pXDCgJ9UImJPYwUfbYgRjNjZdHHSyH/+QRNs="; + rev = "707cda345078553f3e878a100ca103a28f440705"; + hash = "sha256-pgihFkuPIjFTLYtVKaXA+NPUfs/8TpWoojpGyi5TLhY="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index fad270fb8df5..e95ea5513049 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A formats plugin for Nushell"; + mainProgram = "nu_plugin_formats"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats"; license = licenses.mpl20; maintainers = with maintainers; [ viraptor aidalgol ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 8a11be39ef59..c13e7d665330 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A git status plugin for Nushell"; + mainProgram = "nu_plugin_gstat"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat"; license = licenses.mpl20; maintainers = with maintainers; [ mrkkrp aidalgol ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index daee91a6e919..d9cbb5f25033 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "A Nushell plugin to query JSON, XML, and various web data"; + mainProgram = "nu_plugin_query"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query"; license = licenses.mpl20; maintainers = with maintainers; [ happysalada aidalgol ]; diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 4504d6c86176..d58de0b3f0d8 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -16,6 +16,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/michaelmacinnis/oh"; description = "A new Unix shell"; + mainProgram = "oh"; license = licenses.mit; }; diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index 7576a8ab9bda..4c309ad30614 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable OpenBSD ksh, based on the Public Domain Korn Shell (pdksh)"; + mainProgram = "oksh"; homepage = "https://github.com/ibara/oksh"; license = licenses.publicDomain; maintainers = with maintainers; [ siraben ]; diff --git a/pkgs/shells/scponly/default.nix b/pkgs/shells/scponly/default.nix index f15f04cfe227..41a09adf9e7c 100644 --- a/pkgs/shells/scponly/default.nix +++ b/pkgs/shells/scponly/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A shell that only permits scp and sftp-server"; + mainProgram = "scponly"; homepage = "https://github.com/scponly/scponly"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ wmertens ]; diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 4957c657b86d..4643898fec84 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yash"; - version = "2.55"; + version = "2.56.1"; src = fetchFromGitHub { owner = "magicant"; repo = pname; rev = version; - hash = "sha256-raTIqklo69JEuhzdWUK3uywuLjqeQJCJ9nvnLRxlGr4="; + hash = "sha256-G4l0JmtrYaVKfQiJKTOiNWgpsKNhHtbAT0l/VboMJTc="; }; strictDeps = true; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://yash.osdn.jp/index.html.en"; description = "Yet another POSIX-compliant shell"; + mainProgram = "yash"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qbit ]; platforms = platforms.all; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 8df75ac15b95..02f872730a74 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "The fastest shell plugin manager"; + mainProgram = "antibody"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 32565af35be9..2d4edf3d34ba 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-zsh-completions"; rev = "refs/tags/${version}"; - hash = "sha256-DKvCpjAeCiUwD5l6PUW7WlEvM0cNZEOk41IiVXoh9D8="; + hash = "sha256-bgbMc4HqigqgdkvUe/CWbUclwxpl17ESLzCIP8Sz+F8="; }; strictDeps = true; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "ZSH completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ olejorgenb hedning ma27 ]; + maintainers = with maintainers; [ olejorgenb hedning ma27 sebtm ]; }; } diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 28847369a9c8..08f31a995aeb 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/wfxr/forgit"; description = "A utility tool powered by fzf for using git interactively"; + mainProgram = "git-forgit"; license = licenses.mit; maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 97a6992ee672..dcb3ffd19ec7 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; rev = "v${version}"; - hash = "sha256-o3R9dh9t8w/SVO3IUeJqP8kkQxwnRjNX8oZ4wSZxBYo="; + hash = "sha256-0/YOL1/G2SWncbLNaclSYUz7VyfWu+OB8TYJYm4NYkM="; }; strictDeps = true; @@ -31,8 +31,8 @@ in stdenv.mkDerivation rec { pushd modules tar -xf ${zsh.src} - ln -s $(pwd)/src/fzftab.c zsh-${zsh.version}/Src/Modules/ - ln -s $(pwd)/src/fzftab.mdd zsh-${zsh.version}/Src/Modules/ + ln -s $(pwd)/Src/fzftab.c zsh-${zsh.version}/Src/Modules/ + ln -s $(pwd)/Src/fzftab.mdd zsh-${zsh.version}/Src/Modules/ pushd zsh-${zsh.version} |