Commit Graph

423 Commits

Author SHA1 Message Date
techknowlogick
62527b2a4b git: 2.38.0 -> 2.38.1 2022-10-20 15:25:36 +10:00
Sandro
e0d4d69e9d
Merge pull request #172091 from SuperSandro2000/git-jump 2022-10-15 00:01:06 +02:00
Vladimír Čunát
115a7e20e6
Merge #191423: git: Disable tests that fail on ZFS
...into staging
2022-10-13 22:53:09 +02:00
zowoq
cf7be5db71 git: 2.37.3 -> 2.38.0
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.38.0.txt
2022-10-06 12:49:42 +10:00
Artturin
0734f54ef2 treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs
found with nixpkgs-lint
2022-09-26 17:53:26 +03:00
Graham Christensen
c2b898da76 treewide: drop -l$NIX_BUILD_CORES
Passing `-l$NIX_BUILD_CORES` improperly limits the overall system load.

For a build machine which is configured to run `$B` builds where each
build gets `total cores / B` cores (`$C`), passing `-l $C` to make will
improperly limit the load to `$C` instead of `$B * $C`.

This effect becomes quite pronounced on machines with 80 cores, with
40 simultaneous builds and a cores limit of 2. On a machine with this
configuration, Nix will run 40 builds and make will limit the overall
system load to approximately 2. A build machine with this many cores
can happily run with a load approaching 80.

A non-solution is to oversubscribe the machine, by picking a larger
`$C`. However, there is no way to divide the number of cores in a way
which fairly subdivides the available cores when `$B` is greater than
1.

There has been exploration of passing a jobserver in to the sandbox,
or sharing a jobserver between all the builds. This is one option, but
relatively complicated and only supports make. Lots of other software
uses its own implementation of `-j` and doesn't support either `-l` or
the Make jobserver.

For the case of an interactive user machine, the user should limit
overall system load using `$B`, `$C`, and optionally systemd's
cpu/network/io limiting features.

Making this change should significantly improve the utilization of our
build farm, and improve the throughput of Hydra.
2022-09-22 16:01:23 -04:00
Martin Weinelt
d8cdbe8298
git: Disable tests that fail on ZFS with formD normalization
These two tests are regularly creating problems for my hydra instance,
because its builders run on ZFS and that makes them fail consistently.

The issue has something to do with unicode normalization. My pools have
formD normalization configured, that might be the culprit in this case.

Closes: #185882
2022-09-17 04:35:20 +02:00
zowoq
f3ac787b7a git: 2.37.2 -> 2.37.3
https://lore.kernel.org/git/xmqqzgflk211.fsf@gitster.g/T/#u
2022-09-02 06:49:49 +10:00
github-actions[bot]
1c4d690e15
Merge staging-next into staging 2022-08-15 12:01:56 +00:00
Winter
88132767ce git: actually add fetchgit tests to passthru.tests
Nested attrsets don't get built when running `nix-build -A git.tests`, so we use the update operator to add the attributes from `tests.fetchgit` to `passthru.tests`.
2022-08-15 07:59:50 +00:00
github-actions[bot]
842c52c5ba
Merge staging-next into staging 2022-08-15 00:03:15 +00:00
Winter
419dda4c60 git: add fetchgit tests to passthru.tests 2022-08-14 23:03:07 +02:00
zowoq
c20092f878 git: 2.37.1 -> 2.37.2
https://lore.kernel.org/git/xmqqedxmfyhe.fsf@gitster.g/
2022-08-14 09:05:43 +10:00
Robert Scott
8dc0768762 git: don't doInstallCheck on darwin by default
however *do* provide a `passthru.tests.withInstallCheck`.

doInstallCheck takes a ridiculous amount of time on darwin, making
staging builds ever more painful.
2022-07-16 17:43:05 +01:00
zowoq
dd6f2768b1 git: 2.37.0 -> 2.37.1
https://lore.kernel.org/git/xmqqv8s2fefi.fsf@gitster.g/T/#u
2022-07-16 07:49:32 +10:00
zowoq
e7cd9046ca git: 2.36.1 -> 2.37.0
https://lore.kernel.org/git/xmqqy1xinf00.fsf@gitster.g/T/#u
2022-07-05 09:16:10 +10:00
Michael Weiss
d97482f6c6
git: 2.36.0 -> 2.36.1 2022-05-18 23:33:09 +02:00
Sandro Jäckel
0ca06156c7
git: add git-jump to PATH 2022-05-09 17:38:03 +02:00
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