Commit Graph

405 Commits

Author SHA1 Message Date
Vladimír Čunát
9b64158404
git: disable a test on aarch64-darwin
I don't know what's wrong, but it does fail on Hydra
despite on (reportedly) not failing on some user systems.
https://hydra.nixos.org/build/174778232
2022-04-27 22:47:23 +02:00
Randy Eckenrode
0e5763e31b
git: fix failing build on Darwin 2022-04-25 14:33:46 -04:00
techknowlogick
1ea980a082 git: 2.35.3 -> 2.36.0 2022-04-18 15:02:36 -04:00
Martin Weinelt
329623c04f
Merge pull request #168581 from qowoz/git
git: 2.35.2 -> 2.35.3
2022-04-14 16:20:28 +02:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
zowoq
5d520171ef git: 2.35.2 -> 2.35.3
https://lore.kernel.org/git/xmqq1qy04iqa.fsf@gitster.g/T/#u
2022-04-14 13:33:57 +10:00
Vladimír Čunát
7186bdfcf9
Merge #168412: git: 2.35.1 -> 2.35.2 (into staging) 2022-04-13 20:22:26 +02:00
Sandro Jäckel
cae8d1a2ed
git: only hardcode path to ssh binary on full build
Requirement for #146702
2022-04-13 15:18:50 +02:00
Martin Weinelt
c875467fa2
git: 2.35.1 -> 2.35.2
https://lore.kernel.org/git/xmqqv8veb5i6.fsf@gitster.g/

Fixes: CVE-2022-24765
2022-04-12 23:51:54 +02:00
Sandro Jäckel
a26c5495cd
git: add reasonable defaults for boolean flags 2022-04-12 00:58:51 +02:00
Alyssa Ross
4345b27ded git: enable debug info 2022-03-27 12:49:22 +00:00
Sandro
a6659c6444
Merge pull request #162518 from SuperSandro2000/git-contrib-hooks 2022-03-03 16:49:54 +01:00
Sandro Jäckel
c90cc201b3
git: install contrib git hooks 2022-03-03 14:01:33 +01:00
Felix Bühler
cba041c35d
gitSVN,gitMinimal: remove appendToName to have a consistent package n… (#161390)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-01 10:47:32 +01:00
Michael Weiss
6c771046db
git: 2.35.0 -> 2.35.1
From the release notes [0]:
> Git 2.35 shipped with a regression that broke use of "rebase" and
> "stash" in a secondary worktree.  This maintenance release ought to
> fix it.

[0]: https://github.com/git/git/blob/v2.35.1/Documentation/RelNotes/2.35.1.txt
2022-01-29 14:01:33 +01:00
Michael Weiss
cea3ade4b2
git: 2.34.1 -> 2.35.0 2022-01-24 22:15:48 +01:00
Michael Weiss
2d05c5dcf2
git: 2.34.0 -> 2.34.1 2021-11-24 21:03:54 +01:00
Michael Weiss
6e78c9331e
git: 2.33.1 -> 2.34.0 2021-11-15 23:00:11 +01:00
Artturin
e7dbe3bd20 git: fix build with strictDeps 2021-11-05 19:57:03 +02:00
Christian Kögler
7bfd3a8454 gitMinimal: Fix wrong shell for cross compiled package 2021-11-04 00:36:15 +02:00
Vladimír Čunát
20ecf57704
Merge #142801: git: disable t5003 on darwin (into staging-next) 2021-10-25 08:14:10 +02:00
Martin Weinelt
c1fe3d4cda
git: disable t5003 on darwin
The following failure was visible on v2.33.1 on staging-next.

t5003-archive-zip.sh ............................... 1/?
not ok 1 - populate workdir
t5003-archive-zip.sh ............................... Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/76 subtests
        (less 58 skipped subtests: 17 okay)
2021-10-25 01:48:23 +02:00
Martin Weinelt
adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Michael Adler
1c2c055883 git: 2.33.0 -> 2.33.1 2021-10-13 19:39:36 +02:00
happysalada
903dc5bf92 git: darwin: disable flaky tests 2021-10-09 20:27:25 +09:00
Andreas Rammhold
6f3ee459de git: disable flaky test 6421-merge-partial-clone
Occasionally the test fails for unknown reasons but works as soon as we
change the derivation in any way. For now it is better to not have a
test that is flaky than having a test that occasionally breaks and
continously wastes time on debugging it.

This was found as part of a random build failure of gitMinimal in
response to the systemd v249 PR being merged [0].

[0] 64556974b6 (commitcomment-56385360)
2021-09-14 11:24:11 +02:00
Andreas Rammhold
a683d78ed0 git: ensure we are using the correct shell binary for tests
Previosuly the test scripts used /bin/sh which is a bit of an impurity.
It is mostly well-behaved but it essentially leaks the hosts state into
the build as /bin/sh points to some minimal shell implementation
configured on the host OS.

By patching the shebgangs of all the test scripts in the test folder
(t/*.sh) we can make sure that those run with the correct shell binary.

This was found as part of a random build failure of gitMinimal in
response to the systemd v249 PR being merged [0]. Since we have to
somehow touch the hash of the derivation to make the build failure go
away we might as well fix the hardcoded /bin/sh issue.

[0] 64556974b6 (commitcomment-56385360)
2021-09-14 11:24:11 +02:00
Michael Weiss
cfc0b37a05
git: 2.32.0 -> 2.33.0 2021-08-17 11:25:09 +02:00
edef
1630eccc5f
Merge pull request #128062 from deviant/git-shell-path
git: add shellPath passthru
2021-07-14 01:10:13 +00:00
V
56f5cd3343 git: add shellPath passthru
git features a restricted login shell for allowing Git-only SSH access.
2021-06-25 03:26:19 +02:00
github-actions[bot]
538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot]
51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Thomas Gerbet
fc1c4bab77 git: fix pkgsStatic build 2021-06-16 18:46:39 +02:00
Michael Weiss
4ac67163c4
git: Drop POSIXPERM for the tests
Shared permissions are forbidden in the Nix build sandbox which is why
some of the tests fail. Dropping the POSIXPERM test prerequisite, that
is added unconditionally on Linux, should help us avoiding uninteresting
test failures after Git updates. The drawback is that this disables a
few additional tests (as of Git 2.32.0 approx. 71 out of more than 20k
subtests require POSIXPERM).
2021-06-08 20:36:34 +02:00
Michael Weiss
752bfa0496
git: 2.31.1 -> 2.32.0 2021-06-06 16:35:32 +02:00
Arnout Engelen
17ccfe3f51
Merge pull request #123502 from Atemu/minimalIso-remove-ruby2.7
minimalIso: remove ruby2.7
2021-05-21 18:41:02 +02:00
Atemu
88c2c543bf Revert "git: Use asciidoctor instead of asciidoc for manpages"
This reverts commit bbf96d898b.

Removes dependency on ruby 2.7 and isn't much slower.

See https://github.com/NixOS/nixpkgs/pull/123502 for more info
2021-05-21 09:50:48 +02:00
Rick van Schijndel
7dda632e2b git: support cross-compilation by disabling perl support 2021-05-19 20:35:30 +02:00
Léo Gaspard
45d1222d47 git: add link to related nixos test
It'd be better to have a git-only test, but in the meantime this is the
first available test I could find, and it's still better than nothing.
2021-05-08 21:40:56 +02:00
Michael Weiss
1372aa414c
git: 2.31.0 -> 2.31.1 2021-03-27 13:44:34 +01:00
Michael Weiss
571ddf1ba5
git: 2.30.2 -> 2.31.0 (#116471) 2021-03-15 22:45:09 +01:00
Sandro
54395344a8
git: disable flaky test (#115847)
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
2021-03-11 10:22:05 +01:00
Michael Weiss
4990d3c5f8
git: 2.30.1 -> 2.30.2 (CVE-2021-21300)
Links for the security issue:
- https://lore.kernel.org/git/xmqqim6019yd.fsf@gitster.c.googlers.com/
- https://github.com/git/git/security/advisories/GHSA-8prw-h3cq-mghm
- https://github.blog/2021-03-09-git-clone-vulnerability-announced/

For some reason meta.changelog was using ${version} instead of
v${version} for the tag name. This is fixed now.
2021-03-09 20:16:18 +01:00
Jan Tojnar
8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Ben Siraphob
e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Sandro Jäckel
3de228aefd
git: remove unused input 2021-02-18 22:25:20 +01:00
Andreas Schmid
b5a137b2a0
git: add osxkeychainSupport option (#112503)
in order to be able to disable osxkeychain credential helper if no
wanted / necessary. Keep it `true` by default such that current logic is
not affected.

Signed-off-by: Andreas Schmid <service@aaschmid.de>
2021-02-13 14:02:17 +01:00
Michael Weiss
8132d63bc5
git: 2.30.0 -> 2.30.1 (#112581) 2021-02-10 11:39:09 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00