From 368d0b42136f02db474ae958c18cc201f3666888 Mon Sep 17 00:00:00 2001 From: muflax Date: Sat, 27 Sep 2014 08:31:44 +0100 Subject: [PATCH 1/2] zsh: enable pcre --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index d187c50f251..5729314b3e1 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, coreutils }: +{ stdenv, fetchurl, ncurses, coreutils, pcre }: let @@ -19,10 +19,10 @@ stdenv.mkDerivation { sha256 = "1bwfz9n850pclzmzrb437icfhzv1s5pgh2dhs92f194gdkxx4936"; }; - buildInputs = [ ncurses coreutils ]; + buildInputs = [ ncurses coreutils pcre ]; preConfigure = '' - configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp" + configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" ''; # XXX: think/discuss about this, also with respect to nixos vs nix-on-X From 9d9258be5c6fb093d3aeb1c1eb941d77d9eb84e1 Mon Sep 17 00:00:00 2001 From: muflax Date: Sat, 27 Sep 2014 08:31:59 +0100 Subject: [PATCH 2/2] zsh: bump version --- pkgs/shells/zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5729314b3e1..349d1719e56 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.0.5"; + version = "5.0.6"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "1wljqii2lkz5kc4y3xs65isnahvnlj678b9zv31bn444mapjpwp4"; + sha256 = "1mngi85q56szzlrdzv60vg7wl03lih8vlnl800gwr0i6d1laawxj"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "1bwfz9n850pclzmzrb437icfhzv1s5pgh2dhs92f194gdkxx4936"; + sha256 = "0ic86y35v82d87ixjzdb6zrnzf002b7gn573jnva6cqm2jdm1jl4"; }; buildInputs = [ ncurses coreutils pcre ];