diff options
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/carapace/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/fish/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/murex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/nix-your-shell/default.nix | 1 | ||||
-rw-r--r-- | pkgs/shells/nushell/nu_scripts/default.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/powershell/default.nix | 10 | ||||
-rw-r--r-- | pkgs/shells/zsh/antidote/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/zsh/default.nix | 7 | ||||
-rw-r--r-- | pkgs/shells/zsh/fzf-zsh/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/zsh/spaceship-prompt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/zsh/zsh-f-sy-h/default.nix | 32 | ||||
-rw-r--r-- | pkgs/shells/zsh/zsh-you-should-use/default.nix | 2 |
14 files changed, 61 insertions, 23 deletions
diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index ee5f254089c48..b94201c96d77b 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-UcJbWOYkNUJEilJL/LG5o+I1ugqEOEGfs+uvKUMnTMU="; + hash = "sha256-0ubZt4KsjsoIcglo/lh9JDAZjuACBNdVLJazH0Csxl0="; }; - vendorHash = "sha256-PN8ARsJQqRj333ervoy24PZoWkrCIYiGxOovzEhPNZQ="; + vendorHash = "sha256-35Gmye5NPOtUaW8zNkjK0cQ3FRB1fK7UyqT5c17rls4="; ldflags = [ "-s" diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 4df95a9ca6fe5..bd816f9a89919 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -79,7 +79,7 @@ let # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH - builtin status --is-login + builtin status is-login or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" ${if fishEnvPreInit != null then '' and begin diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix index 75213809821f2..62ae03ec9ef99 100644 --- a/pkgs/shells/fish/wrapper.nix +++ b/pkgs/shells/fish/wrapper.nix @@ -18,7 +18,7 @@ let name = "wrapfish.aliases.fish"; destination = "/share/fish/vendor_conf.d/aliases.fish"; text = '' - status --is-interactive; and begin + status is-interactive; and begin # Aliases ${aliasesStr} end diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index aa8ddafd40358..81b585b28fdf5 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "5.0.9310"; + version = "5.1.2210"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gwaNz4OgYs5mAMi/HtLOXoIJA/iHPKX+eiVBP2l2YFU="; + sha256 = "sha256-N0sWTWZJT4hjivTreYfG5VkxiWgTjlH+/9VZD6YKQXY="; }; vendorHash = "sha256-PClKzvpztpry8xsYLfWB/9s/qI5k2m8qHBxkxY0AJqI="; diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix index 87a3c06312916..8b2c36daf1279 100644 --- a/pkgs/shells/nix-your-shell/default.nix +++ b/pkgs/shells/nix-your-shell/default.nix @@ -17,6 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-4Z/z4VgnJQd8Uc0tMDnx7sChzXtG5ZDL88jTlhPSonM="; meta = with lib; { + mainProgram = "nix-your-shell"; description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; license = [ licenses.mit ]; diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 0abe1d4abfe92..8643faccd8ffe 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-2023-08-24"; + version = "unstable-2023-10-07"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "36a45f28a39ee1526a748b53f438a41ae939fc7c"; - hash = "sha256-QhERyWomyOOk9aYRjm69ykzOR3G/uGM/A4Pr9PlB71w="; + rev = "85da8c2fb5967a7f575d8f63ebeb8d49d36fc139"; + hash = "sha256-tT/BTnIXEgcMoyfujzWMFlOM7EclWT9LL/dt5jj7Y2M="; }; installPhase = '' diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 0366dac5b944f..b84cfb5be7a60 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.3.7"; + version = "7.3.8"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -88,19 +88,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-KSBsYw369fURSmoD/YyZm9CLEIbhDR12mRp1xLCJ4Wc="; + hash = "sha256-0FyTt+tn3mpr6LxC3oQvmULNO8+Jp7qsjISRdTesCCI="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-GaAu3nD0xRqqE0Lm7Z5Da6YUQGiCFc5xHuJYDLKySGc="; + hash = "sha256-BNf157sdXg7pV6Hfg9luw3Xi03fTekesBQCwDFeO8ZI="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-+6cy4PLpt3ZR7ui3H9rAg3C39kVryPtqE5HKzMpBa24="; + hash = "sha256-Ts+nF6tPQZfYgJAvPtijvYBGSrg5mxCeNEa0X74/g4M="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-GKsAH+A89/M1fxvw4C4yb7+ITcfD6Y4Oicb1K8AswwI="; + hash = "sha256-iELDoFTy/W6Wm0gNJmywwvp811WycjffBTMDRtrWdVU="; }; }; tests.version = testers.testVersion { diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index a1bb818f6d8f7..3506f0853f5ff 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.1"; + version = "1.9.2"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-wRLMjaBpzttQ6MUgl1AFC2SRlEEwjASdEnguGlP+XgU="; + hash = "sha256-h+Gay1InnOY6tc8Iir5QzCC7FQj9cVWSn5YViEAHraU="; }; dontPatch = true; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 4a05ee9ead57f..5af94223ec83c 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -11,7 +11,9 @@ , ncurses , pcre , pkg-config -, buildPackages }: +, buildPackages +, nixosTests +}: let version = "5.9"; @@ -143,5 +145,8 @@ EOF passthru = { shellPath = "/bin/zsh"; + tests = { + inherit (nixosTests) zsh-history oh-my-zsh; + }; }; } diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index aa5af013e43e7..40c4edaff86e9 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index eae5f77904b5e..f64f96a60aa74 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 41935f75bddd3..b7c7284e9f43b 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aoifMAjJvv1WAlINNkMwCCop6znxyivoD3vQDo/ZbfQ="; + sha256 = "sha256-dl8Ao9Sg+wbFpp6LfWD6isEKou75UzfJkTjZrue4A0A="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-f-sy-h/default.nix b/pkgs/shells/zsh/zsh-f-sy-h/default.nix new file mode 100644 index 0000000000000..0e18eaa95838d --- /dev/null +++ b/pkgs/shells/zsh/zsh-f-sy-h/default.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "zsh-f-sy-h"; + version = "1.67"; + + src = fetchFromGitHub { + owner = "z-shell"; + repo = "F-Sy-H"; + rev = "v${version}"; + sha256 = "0bcsc4kgda577fs3bnvymmxdz3z5mf19pn8ngfqsklabnf79f5nf"; + }; + + strictDeps = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + plugindir="$out/share/zsh/site-functions" + + mkdir -p "$plugindir" + cp -r -- F-Sy-H.plugin.zsh chroma functions share themes "$plugindir"/ + ''; + + meta = with lib; { + description = "Feature-rich Syntax Highlighting for Zsh"; + homepage = "https://github.com/z-shell/F-Sy-H"; + license = licenses.bsd3; + maintainers = with maintainers; [ mrfreezeex ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 95cdb3273c548..b3db825bbba68 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } |