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

Merge #27962: git: pcre1 -> pcre2

Browse Source 
Except for gitMinimal, as pcre1 is in closure anyway so using pcre2
increases the size by ~1.4 MB.
This commit is contained in:
Vladimír Čunát 2017-08-27 15:12:18 +02:00
commit aea7216cf8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -1,12 +1,13 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, gzip, openssh , gzip, openssh, pcre2
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, libiconv , libxslt, tcl, tk, makeWrapper, libiconv
, svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs , svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs
, guiSupport , guiSupport
, withManual ? true , withManual ? true
, pythonSupport ? true , pythonSupport ? true
, withpcre2 ? true
, sendEmailSupport , sendEmailSupport
, darwin , darwin
}: }:
@ -44,6 +45,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ] docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk] ++ stdenv.lib.optionals guiSupport [tcl tk]
++ stdenv.lib.optionals withpcre2 [ pcre2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
@ -70,7 +72,9 @@ stdenv.mkDerivation {
# so that `SPARSE_FLAGS' corresponds to the current architecture... # so that `SPARSE_FLAGS' corresponds to the current architecture...
#doCheck = true; #doCheck = true;
installFlags = "NO_INSTALL_HARDLINKS=1"; installFlags = "NO_INSTALL_HARDLINKS=1"
+ (if withpcre2 then " USE_LIBPCRE2=1" else "");
preInstall = stdenv.lib.optionalString stdenv.isDarwin '' preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/bin mkdir -p $out/bin

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

@ -14448,6 +14448,7 @@ with pkgs;
gitMinimal = git.override { gitMinimal = git.override {
withManual = false; withManual = false;
pythonSupport = false; pythonSupport = false;
withpcre2 = false;
}; };
gitRepo = callPackage ../applications/version-management/git-repo { gitRepo = callPackage ../applications/version-management/git-repo {