diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-17 20:41:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 20:41:50 +0200 |
| commit | f64bb073efaca7795abd637fb6faba2737fbfbe0 (patch) | |
| tree | 2dfe399dff0f9f986e6ef299f88c22e13a4c0d17 /pkgs/shells | |
| parent | a22cd1991064d383f96a786d915507d237e042a0 (diff) | |
| parent | 1e9baed56b85263104f21170a1d2be315876a101 (diff) | |
| download | nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.tar nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.tar.gz nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.tar.bz2 nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.tar.lz nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.tar.xz nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.tar.zst nixpkgs-f64bb073efaca7795abd637fb6faba2737fbfbe0.zip | |
Merge pull request #130196 from Stunkymonkey/inherit-version
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/es/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/shells/zsh/nix-zsh-completions/default.nix | 8 |
3 files changed, 11 insertions, 22 deletions
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 5efb860c1d5..52131a214a5 100644 --- a/pkgs/shells/es/default.nix +++ b/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/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 71f526525e4..d9927638577 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,23 +1,19 @@ { lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: -let - version = "5.8"; - - documentation = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; - }; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "zsh"; - inherit version; + version = "5.8"; src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; }; + documentation = fetchurl { + url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; + sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; + }; + buildInputs = [ ncurses pcre ]; configureFlags = [ diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index c48bf209d0f..f60bb966003 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/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"; |