pcre: update library to version 8.31
This commit is contained in:
parent
3fafdb362b
commit
592e4abe2b
@ -1,38 +0,0 @@
|
|||||||
{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "pcre-8.30";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
|
|
||||||
sha256 = "c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac";
|
|
||||||
};
|
|
||||||
|
|
||||||
# The compiler on Darwin crashes with an internal error while building the
|
|
||||||
# C++ interface. Disabling optimizations on that platform remedies the
|
|
||||||
# problem. In case we ever update the Darwin GCC version, the exception for
|
|
||||||
# that platform ought to be removed.
|
|
||||||
configureFlags = ''
|
|
||||||
${if unicodeSupport then "--enable-unicode-properties" else ""}
|
|
||||||
${if !cplusplusSupport then "--disable-cpp" else ""}
|
|
||||||
'' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0";
|
|
||||||
|
|
||||||
doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://www.pcre.org/";
|
|
||||||
description = "A library for Perl Compatible Regular Expressions";
|
|
||||||
license = "BSD-3";
|
|
||||||
|
|
||||||
longDescription = ''
|
|
||||||
The PCRE library is a set of functions that implement regular
|
|
||||||
expression pattern matching using the same syntax and semantics as
|
|
||||||
Perl 5. PCRE has its own native API, as well as a set of wrapper
|
|
||||||
functions that correspond to the POSIX regular expression API. The
|
|
||||||
PCRE library is free, even for building proprietary software.
|
|
||||||
'';
|
|
||||||
|
|
||||||
platforms = stdenv.lib.platforms.all;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
|
{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "pcre-8.21";
|
name = "pcre-8.31";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
|
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
|
||||||
sha256 = "1qwrqldbwszbmr4cw4f0xmcl889cmmjbf58l9vxn89zw26fm1f54";
|
sha256 = "5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c";
|
||||||
};
|
};
|
||||||
|
|
||||||
# The compiler on Darwin crashes with an internal error while building the
|
# The compiler on Darwin crashes with an internal error while building the
|
||||||
|
@ -2394,7 +2394,6 @@ let
|
|||||||
|
|
||||||
julia = callPackage ../development/compilers/julia {
|
julia = callPackage ../development/compilers/julia {
|
||||||
llvm = llvm_3_1;
|
llvm = llvm_3_1;
|
||||||
pcre = pcre_8_30;
|
|
||||||
liblapack = liblapack.override {shared = true;};
|
liblapack = liblapack.override {shared = true;};
|
||||||
fftw = fftw.override {pthreads = true;};
|
fftw = fftw.override {pthreads = true;};
|
||||||
fftwSinglePrec = fftwSinglePrec.override {pthreads = true;};
|
fftwSinglePrec = fftwSinglePrec.override {pthreads = true;};
|
||||||
@ -4563,11 +4562,6 @@ let
|
|||||||
cplusplusSupport = !stdenv ? isDietLibC;
|
cplusplusSupport = !stdenv ? isDietLibC;
|
||||||
};
|
};
|
||||||
|
|
||||||
pcre_8_30 = callPackage ../development/libraries/pcre/8.30.nix {
|
|
||||||
unicodeSupport = getConfig ["pcre" "unicode"] true;
|
|
||||||
cplusplusSupport = !stdenv ? isDietLibC;
|
|
||||||
};
|
|
||||||
|
|
||||||
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
|
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
|
||||||
|
|
||||||
phonon = callPackage ../development/libraries/phonon { };
|
phonon = callPackage ../development/libraries/phonon { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user