ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge #18585: pcre2: 10.21 -> 10.22

Browse Source
This commit is contained in:
Vladimír Čunát 2016-09-16 23:09:36 +02:00
commit 0fc5900665
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/julia/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr
pcre2 openblas openlibm openspecfun readline suitesparse utf8proc pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
zlib zlib
] ++ ] ++
stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ;
@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_OPENSPECFUN=1"
"USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1" "USE_SYSTEM_PCRE=1"
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
"USE_SYSTEM_READLINE=1" "USE_SYSTEM_READLINE=1"
"USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_UTF8PROC=1"
"USE_SYSTEM_ZLIB=1" "USE_SYSTEM_ZLIB=1"

4
pkgs/development/compilers/julia/git.nix
View File

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
pcre2 openblas openlibm openspecfun readline suitesparse utf8proc pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
zlib zlib
]; ];
@ -131,6 +131,8 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_OPENSPECFUN=1"
"USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1" "USE_SYSTEM_PCRE=1"
"PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
"PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
"USE_SYSTEM_READLINE=1" "USE_SYSTEM_READLINE=1"
"USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_UTF8PROC=1"
"USE_SYSTEM_ZLIB=1" "USE_SYSTEM_ZLIB=1"

19
pkgs/development/libraries/pcre2/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcre2-10.21"; name = "pcre2-${version}";
version = "10.22";
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 = "1q6lrj9b08l1q39vxipb0fi88x6ybvkr6439h8bjb9r8jd81fsn6"; sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j";
}; };
configureFlags = [ configureFlags = [
@ -13,11 +14,17 @@ stdenv.mkDerivation rec {
"--enable-jit" "--enable-jit"
]; ];
meta = { outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
postFixup = ''
moveToOutput bin/pcre2-config "$dev"
'';
meta = with stdenv.lib; {
description = "Perl Compatible Regular Expressions"; description = "Perl Compatible Regular Expressions";
homepage = "http://www.pcre.org/"; homepage = "http://www.pcre.org/";
license = stdenv.lib.licenses.bsd3; license = licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.ttuegel ]; maintainers = with maintainers; [ ttuegel ];
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
}; };
} }