alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #174721 from Artturin/zsh1

Browse source 
zsh: 5.8.1 -> 5.9 && add artturin to maintainers
This commit is contained in:
Sandro 2022-06-01 02:13:12 +02:00 committed by GitHub
parent 2f18afa90c c8474bca54
commit 9024c69378
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/shells/zsh/default.nix
View file

@ -13,7 +13,7 @@
, buildPackages }: , buildPackages }:
let let
version = "5.8.1"; version = "5.9";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk="; sha256 = "sha256-m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU=";
}; };
patches = [ patches = [
@ -82,6 +82,8 @@ EOF
${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile" ${lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile"
''} ''}
mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
rm $out/bin/zsh-${version}
''; '';
# XXX: patch zsh to take zwc if newer _or equal_ # XXX: patch zsh to take zwc if newer _or equal_
@ -97,7 +99,7 @@ EOF
''; '';
license = "MIT-like"; license = "MIT-like";
homepage = "https://www.zsh.org/"; homepage = "https://www.zsh.org/";
maintainers = with lib.maintainers; [ pSub ]; maintainers = with lib.maintainers; [ pSub artturin ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };