1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

4394 commits

Author SHA1 Message Date
Ryan Burns 40299257cc Merge branch 'master' into staging-next 2021-09-23 18:43:00 -07:00
Sandro 692de8a71d
Merge pull request #139105 from r-ryantm/auto-update/gitRepo 2021-09-23 17:31:33 +02:00
R. RyanTM 405c90d2bf gitRepo: 2.16.7 -> 2.16.8 2021-09-23 06:55:15 +00:00
figsoda 69b52d2bdf git-machete: switch to github version to enable tests 2021-09-22 17:45:01 -04:00
github-actions[bot] 09a7436fcc
Merge master into staging-next 2021-09-22 18:01:01 +00:00
superherointj 240faba8b9 git-machete: fix tests 2021-09-22 13:21:04 -03:00
Alyssa Ross b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
Sandro f30f2edb86
Merge pull request #138834 from Ma27/bump-gitea 2021-09-22 00:35:05 +02:00
figsoda ecca3b5e19 glitter: init at 1.4.4 2021-09-21 16:28:11 -04:00
Maximilian Bosch a8b29bdb27
gitea: 1.15.2 -> 1.15.3
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.3
2021-09-21 21:41:22 +02:00
github-actions[bot] fd3d37414d
Merge master into staging-next 2021-09-21 12:01:29 +00:00
Lara e5f70272c5
gitlab: 14.2.3 -> 14.2.4 2021-09-20 21:44:10 +02:00
Alyssa Ross e2bb7997c4
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-09-19 17:08:00 +00:00
Sybrand Aarnoutse 5218777714 gitoxide: 0.7.0 -> 0.8.4 2021-09-19 09:42:09 +09:00
github-actions[bot] a21275cdae
Merge master into staging-next 2021-09-17 18:01:14 +00:00
figsoda fba54052cd
Merge pull request #138038 from figsoda/update-verco
verco: 6.4.0 -> 6.5.5
2021-09-17 08:13:04 -04:00
figsoda d925a0bbc4 verco: 6.4.0 -> 6.5.5 2021-09-15 21:37:36 -04:00
github-actions[bot] 24a34e5706
Merge staging-next into staging 2021-09-15 12:01:34 +00:00
Bobby Rong a5aaee4a2e
Merge pull request #136245 from boppyt/radicle-upstream
radicle-upstream: 0.2.9 -> 0.2.10
2021-09-15 19:47:26 +08:00
Bobby Rong 1395a6fb63
Merge pull request #137945 from r-ryantm/auto-update/thicket
thicket: 0.1.4 -> 0.1.5
2021-09-15 15:07:22 +08:00
github-actions[bot] 636ebe3a72
Merge staging-next into staging 2021-09-15 06:01:54 +00:00
github-actions[bot] 5663f4625d
Merge master into staging-next 2021-09-15 06:01:20 +00:00
happysalada 964b74f6b4 gitui: do not compile openssl 2021-09-15 10:48:44 +09:00
R. RyanTM 2ecd21c1cc thicket: 0.1.4 -> 0.1.5 2021-09-15 01:27:07 +00:00
Andreas Rammhold 413da4c0f4
Merge pull request #137784 from andir/staging-git
git: disable flaky test & patch shebangs in test scripts
2021-09-14 15:55:42 +02:00
github-actions[bot] 6f038e8b11
Merge master into staging-next 2021-09-14 12:01:03 +00:00
Sandro 9b09f4724a
Merge pull request #137726 from r-ryantm/auto-update/topgit 2021-09-14 13:41:54 +02:00
R. RyanTM 9db8c0be81 gitui: 0.17 -> 0.17.1 2021-09-14 11:49:42 +02:00
R. RyanTM e1d6d8138c git-cliff: 0.2.6 -> 0.3.0 2021-09-14 11:48:21 +02: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
R. RyanTM 053eff5a46 top-git: 0.19.12 -> 0.19.13 2021-09-14 02:14:31 +00:00
github-actions[bot] a13bf1828b
Merge master into staging-next 2021-09-12 18:01:21 +00:00
Sandro 3ca823aa9a
Merge pull request #137538 from SuperSandro2000/gitstatus
gitstatus: 1.5.2 -> 1.5.3
2021-09-12 17:31:27 +02:00
Sandro Jäckel a88557ec5f
gitstatus: 1.5.2 -> 1.5.3 2021-09-12 16:36:52 +02:00
Sandro Jäckel ce79b66953
git-interactive-rebase-tool: fix compile error 2021-09-12 15:56:52 +02:00
github-actions[bot] 3f2255106a
Merge master into staging-next 2021-09-12 00:01:45 +00:00
Sandro b42c52e470
Merge pull request #137413 from r-ryantm/auto-update/gitRepo 2021-09-11 21:28:03 +02:00
Sandro cf819b86e7
Merge pull request #136748 from r-ryantm/auto-update/yadm 2021-09-11 21:25:34 +02:00
github-actions[bot] c435b0e35f
Merge master into staging-next 2021-09-11 18:01:16 +00:00
R. RyanTM 7d7ab4f895 gitRepo: 2.16 -> 2.16.7 2021-09-11 17:34:04 +00:00
Sandro 1b6e16479b
Merge pull request #137218 from figsoda/verco
verco: init at 6.4.0
2021-09-11 18:12:15 +02:00
Martin Weinelt bae10ead99 Merge remote-tracking branch 'origin/master' into staging-next 2021-09-11 02:29:58 +02:00
Guillaume Girol 330090f6c8
Merge pull request #136052 from r-burns/fossil
fossil: 2.15.1 -> 2.16
2021-09-10 19:57:48 +00:00
github-actions[bot] 36ce45efae
Merge master into staging-next 2021-09-10 18:01:17 +00:00
Sandro Jäckel b99bcb5b9f
git-open: add SuperSandro2000 as maintainer 2021-09-10 16:34:56 +02:00
Sandro Jäckel 69e1161ff6
git-open: install man page 2021-09-10 16:34:44 +02:00
figsoda 0ec70102dd verco: init at 6.4.0 2021-09-09 15:37:33 -04:00
github-actions[bot] ad1de317ad
Merge master into staging-next 2021-09-08 06:01:19 +00:00
Sandro 894d652ed1
Merge pull request #137027 from Artturin/blackboxdarwintest
blackbox: only doCheck on x86_64-linux
2021-09-08 02:23:19 +02:00