Merge pull request #130492 from roberth/revert-130196-partially

Partially revert "various: cleanup of 'inherit version;'"

authored by

Robert Hensing and committed by
GitHub
66c6ec45 da37c8eb

+11 -7
+11 -7
pkgs/shells/zsh/default.nix
··· 1 1 { lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: 2 2 3 - stdenv.mkDerivation rec { 4 - pname = "zsh"; 3 + let 5 4 version = "5.8"; 6 5 7 - src = fetchurl { 8 - url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; 9 - sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; 10 - }; 11 - 12 6 documentation = fetchurl { 13 7 url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; 14 8 sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; 9 + }; 10 + in 11 + 12 + stdenv.mkDerivation { 13 + pname = "zsh"; 14 + inherit version; 15 + 16 + src = fetchurl { 17 + url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; 18 + sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; 15 19 }; 16 20 17 21 buildInputs = [ ncurses pcre ];