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

Partially revert "various: cleanup of 'inherit version;'"
This commit is contained in:
Robert Hensing 2021-07-17 23:09:59 +02:00 committed by GitHub
commit 66c6ec450f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,18 +1,22 @@
{ lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: { lib, stdenv, fetchurl, ncurses, pcre, buildPackages }:
stdenv.mkDerivation rec { let
pname = "zsh";
version = "5.8"; version = "5.8";
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
};
documentation = fetchurl { documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv";
}; };
in
stdenv.mkDerivation {
pname = "zsh";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
};
buildInputs = [ ncurses pcre ]; buildInputs = [ ncurses pcre ];