public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* PCRE updated to 8.21. Also enable Unicode support by default, since

Browse Source 
it only increases the size of the library a little bit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30886
This commit is contained in:
Eelco Dolstra 2011-12-14 13:36:38 +00:00
parent 86415488bb
commit bad4ed8717
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/pcre/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}: { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "pcre-8.10"; name = "pcre-8.21";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/pcre/pcre-8.10.tar.bz2; url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
sha256 = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480"; sha256 = "1qwrqldbwszbmr4cw4f0xmcl889cmmjbf58l9vxn89zw26fm1f54";
}; };
# The compiler on Darwin crashes with an internal error while building the # The compiler on Darwin crashes with an internal error while building the

5
pkgs/top-level/all-packages.nix
View File

@ -3215,8 +3215,7 @@ let
cln = callPackage ../development/libraries/cln { }; cln = callPackage ../development/libraries/cln { };
clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { };
};
clucene_core = callPackage ../development/libraries/clucene-core { }; clucene_core = callPackage ../development/libraries/clucene-core { };
@ -4400,7 +4399,7 @@ let
}; };
pcre = callPackage ../development/libraries/pcre { pcre = callPackage ../development/libraries/pcre {
unicodeSupport = getConfig ["pcre" "unicode"] false; unicodeSupport = getConfig ["pcre" "unicode"] true;
cplusplusSupport = !stdenv ? isDietLibC; cplusplusSupport = !stdenv ? isDietLibC;
}; };