From 0e5cfdb8c568f9280e23ee5fae276569b34438b8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 17 Jul 2021 22:39:28 +0200 Subject: [PATCH] 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. --- pkgs/shells/zsh/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index d9927638577..71f526525e4 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 ];