diff options
| author | Felix Buehler <account@buehler.rocks> | 2021-07-14 17:10:11 +0200 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2021-07-16 00:17:12 +0200 |
| commit | 1e9baed56b85263104f21170a1d2be315876a101 (patch) | |
| tree | 903ccb3615c2b22ae30f5299af147e497d1b8bbf /pkgs/shells | |
| parent | b141a58ff28c1b14fea9292dbcfe2a5af2da923c (diff) | |
| download | nixlib-1e9baed56b85263104f21170a1d2be315876a101.tar nixlib-1e9baed56b85263104f21170a1d2be315876a101.tar.gz nixlib-1e9baed56b85263104f21170a1d2be315876a101.tar.bz2 nixlib-1e9baed56b85263104f21170a1d2be315876a101.tar.lz nixlib-1e9baed56b85263104f21170a1d2be315876a101.tar.xz nixlib-1e9baed56b85263104f21170a1d2be315876a101.tar.zst nixlib-1e9baed56b85263104f21170a1d2be315876a101.zip | |
various: cleanup of '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 5efb860c1d5f..52131a214a5e 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 71f526525e4f..d99276385775 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 c48bf209d0f9..f60bb966003f 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"; |