Author: eelco
Date: Wed Dec 14 13:36:38 2011
New Revision: 30886
URL: https://nixos.org/websvn/nix/?rev=30886&sc=1
Log:
* PCRE updated to 8.21. Also enable Unicode support by default, since
it only increases the size of the library a little bit.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
Wed Dec 14 10:42:49 2011 (r30885)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
Wed Dec 14 13:36:38 2011 (r30886)
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, unicodeSupport ? false, cplusplusSupport ? true}:
+{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
-stdenv.mkDerivation {
- name = "pcre-8.10";
+stdenv.mkDerivation rec {
+ name = "pcre-8.21";
src = fetchurl {
- url = mirror://sourceforge/pcre/pcre-8.10.tar.bz2;
- sha256 =
"7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480";
+ url =
"ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";;
+ sha256 = "1qwrqldbwszbmr4cw4f0xmcl889cmmjbf58l9vxn89zw26fm1f54";
};
# The compiler on Darwin crashes with an internal error while building the
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Dec
14 10:42:49 2011 (r30885)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Dec
14 13:36:38 2011 (r30886)
@@ -3215,8 +3215,7 @@
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 { };
@@ -4400,7 +4399,7 @@
};
pcre = callPackage ../development/libraries/pcre {
- unicodeSupport = getConfig ["pcre" "unicode"] false;
+ unicodeSupport = getConfig ["pcre" "unicode"] true;
cplusplusSupport = !stdenv ? isDietLibC;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
