summary refs log tree commit diff
path: root/pkgs/shells/zsh
diff options
context:
space:
mode:
authorNick Hu <me@nickhu.co.uk>2019-04-07 15:48:01 +0100
committerNick Hu <me@nickhu.co.uk>2019-04-07 15:48:01 +0100
commit1d03cbb87527c088aa7828226a28e7d8dc556fad (patch)
tree5623fcb2703b486e4aa7795325084c23557e93f3 /pkgs/shells/zsh
parentb7302ddbeae75c761b0df0a14cdaa37b06a77628 (diff)
downloadnixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.tar
nixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.tar.gz
nixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.tar.bz2
nixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.tar.lz
nixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.tar.xz
nixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.tar.zst
nixpkgs-1d03cbb87527c088aa7828226a28e7d8dc556fad.zip
zsh-prezto: 2017-12-03 -> 2019-03-18
Diffstat (limited to 'pkgs/shells/zsh')
-rw-r--r--pkgs/shells/zsh/zsh-prezto/default.nix12
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