3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

284 commits

Author SHA1 Message Date
Frederik Rietdijk d108b49168 Merge master into staging-next 2019-04-09 16:38:35 +02:00
Tim Steinbach f53ffadbc5
git: Add update script 2019-04-07 09:15:28 -04:00
Artemis Tosini fc917e5346
git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
volth bb9557eb7c lib.makePerlPath -> perlPackages.makePerlPath 2018-12-15 03:50:31 +00:00
Craig Younkins 921d046537 git: wrap git-credential-netrc to set PERL5LIB (#50992) 2018-12-14 21:49:09 +01:00
Will Dietz 003a96c04c git: 2.19.1 -> 2.19.2
https://github.com/git/git/blob/master/Documentation/RelNotes/2.19.2.txt
2018-11-21 15:48:45 -06:00
Eelco Dolstra 7b9c4954f2
git: Strip libsecret
This reduces gitFull's closure size from 412 MiB to 271 MiB.
2018-10-08 18:13:29 +02:00
edef 5cdecca8b7 git: 2.19.0 -> 2.19.1 (CVE-2018-17456) 2018-10-05 18:36:08 +00:00
Andrew Childs 50454ec5f1 git: 2.18.0 -> 2.19.0 (#46723) 2018-09-18 17:54:22 +02:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Benjamin Staffin 815ae70556
gitFull: build libsecret credential helper (#43616)
...except on Darwin, where it won't be useful.
2018-07-22 15:20:37 -04:00
Will Dietz bb00076931 Revert "Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0""
This reverts commit 6d1955e0c4.
2018-06-28 07:01:14 -05:00
Will Dietz 6d1955e0c4 Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
This reverts commit 2624f90796, reversing
changes made to 37aab4cbb5.

See:
https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096

Basically this breaks at least some users of fetchgit,
so let's revert this until this is sorted out.
2018-06-24 22:36:50 -05:00
Will Dietz 26f24fe09a git: indicate when last tested to "still" fail, for checking updates 2018-06-22 10:10:20 -05:00
Will Dietz 1190af39b9 git: disable failing completion test as well 2018-06-22 10:02:57 -05:00
Will Dietz 4136cb5ba9 git: disable "editor with a space" tests due to fails
Need to investigate.
2018-06-22 10:00:42 -05:00
Will Dietz e65e6cad23 git: disable working-tree-encoding tests on musl
Makes assumptions about BOM.
2018-06-22 09:56:20 -05:00
Will Dietz 5f27396e8f git: remove symlinks-in-bin patch 2018-06-22 09:15:54 -05:00
Will Dietz 18231121f4 git: 2.17.1 -> 2.18.0 2018-06-22 09:12:06 -05:00
Matthew Bauer fc048073e6 git: remove object file from closure
This file pulls in some big dependencies that are unneeded (like
clang).
2018-06-21 19:47:10 -04:00
Tim Steinbach 9db1f486e1
git: 2.17.0 -> 2.17.1 2018-05-29 21:33:43 -04:00
Will Dietz 481ca44771 git: disable failing test w/musl for now
I'm working to resolve this but it will take some time
(patches sent to upstream musl, maybe to git afterwards)
and for now this blocks quite a lot.

If that doesn't work out we can explore options such as
always using GNU libiconv with musl.
2018-05-03 15:20:38 -05:00
Guillaume Maudoux 6dda53ad22 git: add install checks
(cherry picked from commit f57873f674)
2018-04-24 20:26:54 -05:00
Will Dietz 97372a1104 git: 2.16.3 -> 2.17.0... again! 2018-04-24 20:19:22 -05:00
Will Dietz f07f0c6009 Merge remote-tracking branch 'origin/master' into staging 2018-04-24 19:58:44 -05:00
Ben Gamari b26ae506a9 git: Set PERL_PATH when building manual
Otherwise the build fails with the perplexing error

    make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'.  Stop.
    make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation'

on NixOS (but not on Debian, where it succeeds, presumably since it picks up the
system perl).
2018-04-24 19:00:34 -04:00
Ben Gamari d111a42772 git: Enable cross-compilation 2018-04-24 14:58:58 -04:00
Ben Gamari 2d397f1b76 git: Allow perl support to be disabled 2018-04-24 14:58:58 -04:00
Ben Gamari 432df5b1cf git: Fix USE_LIBPCRE2 configuration
Previously this was injected during install, causing the build system to rebuild
the entire package.
2018-04-24 14:58:58 -04:00
Ben Gamari ae0a14d25d git: Refactor makeFlags using lib.optionals 2018-04-24 14:58:58 -04:00
Tuomas Tynkkynen 3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/development/tools/misc/binutils/default.nix
2018-04-22 22:31:30 +03:00
gnidorah 9029ed933c nixos/gitweb: add gitwebTheme option 2018-04-17 20:07:01 +03:00
Tuomas Tynkkynen 16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
Will Dietz 281775bb1a git: 2.16.2 -> 2.16.3
Cherry picked from 260194193c in staging as suggested by
https://github.com/NixOS/nixpkgs/pull/38763#issuecomment-380504142.
2018-04-12 08:55:31 +02:00
Guillaume Maudoux 2ddba49f59 git: fix perl libs path 2018-04-11 17:54:08 +02:00
Guillaume Maudoux ad076ff7ce git: 2.16.3 -> 2.17.0 2018-04-11 17:54:08 +02:00
Will Dietz 260194193c git: 2.16.2 -> 2.16.3 2018-04-11 17:54:08 +02:00
Frederik Rietdijk ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Peter Simons e4fd05449e git: revert "2.16.2 -> 2.17.0"
This reverts commit 5d65b4ebeb, because it broke
git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555
for details.
2018-04-11 09:51:06 +02:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Guillaume Maudoux 5d65b4ebeb git: 2.16.2 -> 2.17.0 2018-04-09 10:02:57 +02:00
Tim Steinbach 2bb28e1f01
Revert "git: 2.16.3 -> 2.17.0"
This reverts commit 3bd496faa8.
2018-04-04 08:35:19 -04:00
Tim Steinbach 3bd496faa8
git: 2.16.3 -> 2.17.0 2018-04-03 18:16:27 -04:00
Will Dietz 2b29239eff
Revert "git: 2.16.3 -> 2.17.0" 2018-04-03 07:52:38 -05:00
Will Dietz dee77f7e43 git: 2.16.3 -> 2.17.0 2018-04-02 16:40:08 -05:00
Will Dietz dcaea58eb7 git: 2.16.2 -> 2.16.3 2018-03-22 18:29:11 -05:00
Tuomas Tynkkynen b34274d363 git: 2.16.1 -> 2.16.2 2018-02-19 05:34:03 +02:00
Will Dietz f2aae45514 git: Disable use of <sys/poll.h> on musl, disable gettext 2018-02-13 09:44:47 -06:00
Tuomas Tynkkynen 630a26ac0b git: 2.16.0 -> 2.16.1 2018-01-22 10:57:00 +02:00
Tim Steinbach b5be5ef364
git: 2.15.1 -> 2.16.0 2018-01-18 09:13:17 -05:00