about summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2021-07-17 22:39:28 +0200
committerRobert Hensing <robert@roberthensing.nl>2021-07-17 22:39:28 +0200
commit0e5cfdb8c568f9280e23ee5fae276569b34438b8 (patch)
treec7e0cb3716c0e24b8ba14184f2aa777e80be0c5b /pkgs/shells
parent795ffc7c21fe8a758dd548cbe70c8f8937802ef4 (diff)
Partially revert "various: cleanup of 'inherit version;'"
I forgot to unresolve a conversation, causing the PR to be merged
prematurely by someone else.

This partially reverts commit 1e9baed56b85263104f21170a1d2be315876a101.
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/zsh/default.nix18
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index d992763857752..71f526525e4f0 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,18 +1,22 @@
 { lib, stdenv, fetchurl, ncurses, pcre, buildPackages }:
 
-stdenv.mkDerivation rec {
-  pname = "zsh";
+let
   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";
   };
+in
+
+stdenv.mkDerivation {
+  pname = "zsh";
+  inherit version;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
+    sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
+  };
 
   buildInputs = [ ncurses pcre ];