diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-22 22:31:30 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-22 22:31:30 +0300 |
commit | 3c6e077301146c221c3780afb66d93523fbebd27 (patch) | |
tree | e3f1b18251e151298e15fa0727c0bd42695aec93 /pkgs/applications/version-management/git-and-tools/git/default.nix | |
parent | c70a245bb314250271c0fa1b6bcc78f80f867dfe (diff) | |
parent | 6a819c8f8c9100eb1a79515f10ad2d0d49b42ed5 (diff) | |
download | nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.gz nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.bz2 nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.lz nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.xz nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.zst nixlib-3c6e077301146c221c3780afb66d93523fbebd27.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/development/tools/misc/binutils/default.nix
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6669d6d6044f..b1d5ad5b242c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,9 +1,9 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc -, gzip, openssh, pcre2 +, openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs +, svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , withManual ? true , pythonSupport ? true @@ -25,6 +25,8 @@ stdenv.mkDerivation { sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; }; + outputs = [ "out" "gitweb" ]; + hardeningDisable = [ "format" ]; patches = [ @@ -139,15 +141,8 @@ stdenv.mkDerivation { substituteInPlace $out/libexec/git-core/git-sh-i18n \ --subst-var-by gettext ${gettext} - # gzip (and optionally bzip2, xz, zip) are runtime dependencies for - # gitweb.cgi, need to patch so that it's found - sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ - $out/share/gitweb/gitweb.cgi - # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do - sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \ - "$out/share/gitweb/gitweb.cgi" - done + # put in separate package for simpler maintenance + mv $out/share/gitweb $gitweb/ # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing |