diff options
Diffstat (limited to 'nixpkgs/pkgs/shells')
-rw-r--r-- | nixpkgs/pkgs/shells/es/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/fish/plugins/done.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/nushell/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/antigen/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix | 2 |
8 files changed, 17 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/shells/es/default.nix b/nixpkgs/pkgs/shells/es/default.nix index 5efb860c1d5f..52131a214a5e 100644 --- a/nixpkgs/pkgs/shells/es/default.nix +++ b/nixpkgs/pkgs/shells/es/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl, readline, bison }: -let - version = "0.9.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "es"; - inherit version; + version = "0.9.1"; src = fetchurl { url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/shells/fish/plugins/done.nix b/nixpkgs/pkgs/shells/fish/plugins/done.nix index 25065b21fb14..8d1a14e19f23 100644 --- a/nixpkgs/pkgs/shells/fish/plugins/done.nix +++ b/nixpkgs/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - sha256 = "NFysKzRZgDXXZW/sUlZNu7ZpMCKwbjAhIfspSK3UqCY="; + sha256 = "Xld66z9vVp3kxikndZ9k/zlNvP0YSoSCNTBkJ8rT3uo="; }; checkPlugins = [ fishtape ]; diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix index 65ed6d5000c2..b7fa5453d87a 100644 --- a/nixpkgs/pkgs/shells/nushell/default.nix +++ b/nixpkgs/pkgs/shells/nushell/default.nix @@ -12,7 +12,7 @@ , Security , nghttp2 , libgit2 -, withStableFeatures ? true +, withExtraFeatures ? true }: rustPlatform.buildRustPackage rec { @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; - cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths diff --git a/nixpkgs/pkgs/shells/zsh/antigen/default.nix b/nixpkgs/pkgs/shells/zsh/antigen/default.nix index c80471677f09..935939f90e60 100644 --- a/nixpkgs/pkgs/shells/zsh/antigen/default.nix +++ b/nixpkgs/pkgs/shells/zsh/antigen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' outdir=$out/share/antigen diff --git a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix index 4d5331543fbf..6196658723f6 100644 --- a/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/nixpkgs/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c="; + sha256 = "sha256-Vn8NzpvJ1W/+UUuhr1plLqskVBUOFJHvy+hxKE3DmIs="; }; nativeBuildInputs = [ txt2tags ]; diff --git a/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix index c48bf209d0f9..f60bb966003f 100644 --- a/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/nixpkgs/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let - version = "0.4.4"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nix-zsh-completions"; - inherit version; + version = "0.4.4"; src = fetchFromGitHub { owner = "spwhitt"; diff --git a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix index a15c9b5bbb99..0ba449870b83 100644 --- a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-fnk4lLRASX7FFAovAiRd9sm4jNlnFIJ78UCzdsXYVfM="; + sha256 = "sha256-6j6QZtsA5ZgfXthYjXRrND2zAJwZx0/6WRI1f3c+2mE="; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix index 9696e441cf5a..b92ced6be71c 100644 --- a/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' install -Dm0444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh/plugins/command-time |