diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-04-09 02:27:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 02:27:49 +0200 |
| commit | 2fdca0eb58698a1c379d55e23a6dbde51416e048 (patch) | |
| tree | 1fbeca061e93b49c42c226df04a1ae2c6aad97d9 /pkgs/shells | |
| parent | 902ab43a91b6e550c25c385782fae0a3da8e259c (diff) | |
| parent | 1d03cbb87527c088aa7828226a28e7d8dc556fad (diff) | |
| download | nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.tar nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.tar.gz nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.tar.bz2 nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.tar.lz nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.tar.xz nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.tar.zst nixpkgs-2fdca0eb58698a1c379d55e23a6dbde51416e048.zip | |
Merge pull request #59134 from NickHu/zsh-prezto
zsh-prezto: 2017-12-03 -> 2019-03-18
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/zsh-prezto/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 8acdd8bb516..764459958bf 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "zsh-prezto-2017-12-03"; + name = "zsh-prezto-2019-03-18"; src = fetchgit { url = "https://github.com/sorin-ionescu/prezto"; - rev = "029414581e54f5b63156f81acd0d377e8eb78883"; - sha256 = "0crrj2nq0wcv5in8qimnkca2an760aqald13vq09s5kbwwc9rs1f"; + rev = "1f4601e44c989b90dc7314b151891fa60a101251"; + sha256 = "1dcd5r7pc4biiplm0lh7yca0h6hs0xpaq9dwaarmfsh9wrd68350"; fetchSubmodules = true; }; buildPhase = '' - sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh + sed -i '/\''${ZDOTDIR:\-\$HOME}\/.zpreztorc" ]]/i\ + if [[ -s "/etc/zpreztorc" ]]; then\ + source "/etc/zpreztorc"\ + fi' init.zsh sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh for i in runcoms/*; do sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i done - sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh ''; installPhase = '' mkdir -p $out |