Commit Graph

4490 Commits

Author SHA1 Message Date
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
Artturin
a47005debe blackbox: only doCheck on x86_64-linux 2021-09-07 23:41:15 +03:00
github-actions[bot]
fbefda3466
Merge master into staging-next 2021-09-07 12:01:13 +00:00
Doron Behar
5c0a3345a8
Merge pull request #136720 from alerque/vcsh
vcsh: 1.20170915 → 2.0.2
2021-09-07 13:15:23 +03:00
github-actions[bot]
2f5ea43e02
Merge master into staging-next 2021-09-07 00:01:32 +00:00
Izorkin
5df4645b39
gitty: init at 0.3.0 2021-09-07 01:02:24 +03:00
Caleb Maclennan
074ef76e99 vcsh: 1.20170915 → 2.0.2
Co-authored-by: Bobby Rong <rjl931189261@126.com>
2021-09-06 12:52:11 +03:00
github-actions[bot]
79667a59e7
Merge master into staging-next 2021-09-06 00:01:28 +00:00
Ben Siraphob
f1312d514d git-cliff: init at 0.2.6 2021-09-05 16:16:35 -05:00
Fabian Affolter
e44bb98416 bump2version: 1.0.0 -> 1.0.1 2021-09-05 15:01:20 +02:00
github-actions[bot]
5b6c2380ad
Merge master into staging-next 2021-09-05 12:01:20 +00:00
Luke Granger-Brown
52411bf932
Merge pull request #136595 from lukegb/mercurial
mercurial: 5.8 -> 5.9.1
2021-09-05 11:24:35 +01:00
R. RyanTM
36e1c8753c yadm: 3.1.0 -> 3.1.1 2021-09-05 04:40:57 +00:00
github-actions[bot]
e3f1f8bba2
Merge master into staging-next 2021-09-04 00:01:34 +00:00
Leo Maroni
3a77817ee9 gitea: 1.15.0 -> 1.15.2 2021-09-04 07:58:30 +09:00
Alyssa Ross
071a7a4583
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-03 18:23:45 +00:00
Luke Granger-Brown
ed471ccf22 tortoisehg: 5.8 -> 5.9 2021-09-03 14:34:28 +00:00
Luke Granger-Brown
c418c4f8c6 mercurial: 5.8 -> 5.9.1 2021-09-03 14:34:18 +00:00
github-actions[bot]
ce434a97e2
Merge master into staging-next 2021-09-03 12:01:06 +00:00
Yureka
f007b794c7
gitlab: add back grpc patch
They downgraded grpc in the fix release
2021-09-03 13:23:45 +02:00
Yureka
6ede6d2740
gitlab: 14.2.1 -> 14.2.3 2021-09-03 13:23:40 +02:00
Kim Lindberger
d14e9188d1
gitaly: Fix gitaly-git2go binary name (#136569)
e7f8fe4f67
changed the binary name to always end with its module version. This
makes sure gitaly's internal version references are set to the package
version and renames the binary, postfixing it with the package
version.
2021-09-03 13:23:00 +02:00
github-actions[bot]
b2f58ca11e
Merge master into staging-next 2021-09-01 12:01:15 +00:00
Alyssa Ross
c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-01 07:47:01 +00:00
Zhenya Vinogradov
e444a24b0e danger-gitlab: init at 8.0.0 2021-09-01 08:39:22 +03:00
Harsh Shandilya
9a21867643 git-branchless: add msfjarvis as co-maintainer 2021-08-31 15:30:09 +00:00
Harsh Shandilya
65be0edee5 git-branchless: add support for Darwin builds 2021-08-31 15:30:09 +00:00
Zack A
ef7cb07023
radicle-upstream: 0.2.9 -> 0.2.10 2021-08-30 16:14:22 -07:00
Ryan Burns
5e72b0a076 fossil: 2.15.1 -> 2.16
For CVE-2021-36377

Add enableDeserialize option to sqlite,
which is required to build fossil v2.16+.
2021-08-28 12:42:41 -07:00
github-actions[bot]
b7f2a7d1ba
Merge master into staging-next 2021-08-28 00:01:34 +00:00
Florian Klink
f499d864bf
Merge pull request #135811 from talyz/gitlab-14.2.1
gitlab: 14.1.2 -> 14.2.1
2021-08-28 00:20:28 +02:00
talyz
3dd17ae22f
gitlab: Enable puma's systemd notify support 2021-08-27 17:38:40 +02:00
github-actions[bot]
8fb1ff7c31
Merge master into staging-next 2021-08-26 18:01:02 +00:00
talyz
99387372d5
gitlab: 14.1.2 -> 14.2.1 2021-08-26 19:01:22 +02:00
Sandro Jäckel
bd3377d9d2
git-delete-merged-branches: 6.3.0 -> 6.4.0 2021-08-26 16:29:11 +02:00
github-actions[bot]
b13b005f0e
Merge master into staging-next 2021-08-26 12:01:09 +00:00
zowoq
13ea123c74 treewide: buildFlagsArray -> ldflags 2021-08-26 21:35:06 +10:00
github-actions[bot]
572dfaae2c
Merge master into staging-next 2021-08-26 06:01:19 +00:00
zowoq
e6494966dd treewide: buildFlagsArray -> ldflags 2021-08-26 15:43:28 +10:00
Dmitry Kalinkin
262fd63a72
Merge branch 'master' into staging-next
Conflicts:
	pkgs/tools/networking/inetutils/default.nix
2021-08-26 00:57:08 -04:00
Martin Weinelt
6b77988f96
treewide: prometheus_client -> prometheus-client 2021-08-26 02:21:59 +02:00
github-actions[bot]
1bf55a993f
Merge master into staging-next 2021-08-26 00:01:37 +00:00
0x4A6F
d1f93e7bc6 gst: init at 5.0.4 2021-08-25 19:55:25 -04:00
Maximilian Bosch
52fe17a227
Merge pull request #135330 from r-ryantm/auto-update/gitui
gitui: 0.16.2 -> 0.17
2021-08-25 22:29:51 +02:00
Vladimír Čunát
70e05c1003
Merge branch 'master' into staging-next 2021-08-25 19:42:15 +02:00
zowoq
ec8a69a184 gh: 1.14.0 -> 2.0.0 2021-08-24 22:12:42 +10:00
Jan Tojnar
4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
Sandro
e72e0e3a7c
Merge pull request #135254 from Ma27/bump-gitea
gitea: 1.14.6 -> 1.15.0
2021-08-22 23:15:50 +02:00
R. RyanTM
36fa861a29 gitui: 0.16.2 -> 0.17 2021-08-22 19:24:02 +00:00
Sandro Jäckel
905174cb91
git-delete-merged-branches: 6.0.5 -> 6.3.0 2021-08-22 20:09:00 +02:00
Maximilian Bosch
15b41363c2
gitea: 1.14.6 -> 1.15.0
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.0
2021-08-22 12:37:43 +02:00
github-actions[bot]
095df456c2
Merge staging-next into staging 2021-08-22 06:01:44 +00:00
R. RyanTM
a2ce822382 git-filter-repo: 2.32.0 -> 2.33.0 2021-08-22 00:10:46 -04:00
Jan Tojnar
7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Sandro Jäckel
3b72220ba7
gitlab-triage: 1.13.0 -> 1.20.0 2021-08-21 12:11:58 +02:00
Michael Weiss
e20df22012
Merge pull request #134411 from primeos/git
git: 2.32.0 -> 2.33.0
2021-08-17 20:23:42 +02:00
github-actions[bot]
ad00d57d02
Merge master into staging-next 2021-08-17 18:01:12 +00:00
Michael Raskin
5dd7c7a079 monotone: fix key encryption 2021-08-17 19:27:34 +02:00
Michael Weiss
cfc0b37a05
git: 2.32.0 -> 2.33.0 2021-08-17 11:25:09 +02:00
github-actions[bot]
55a98e21e5
Merge master into staging-next 2021-08-15 18:00:56 +00:00
Robert Hensing
a201246bac treewide: runCommandNoCC -> runCommand in generated code
This has been synonymous for ~5y.

Note that many of these runCommand bindings are unused, but that's
ok for generated code.
2021-08-15 17:36:41 +02:00
github-actions[bot]
cf21487d22
Merge master into staging-next 2021-08-15 06:01:10 +00:00
Artturi
4dcf09adc4
Merge pull request #133863 from r-ryantm/auto-update/bcompare 2021-08-15 06:14:55 +03:00
Aaron Andersen
23c541189c redmine: 4.2.1 -> 4.2.2 2021-08-14 07:58:09 -04:00
Jan Tojnar
0aa35561e7 Merge branch 'master' into staging-next 2021-08-14 12:53:07 +02:00
R. RyanTM
0864142642 bcompare: 4.3.7.25118 -> 4.4.0.25886 2021-08-14 01:55:13 +00:00
Artturi
93a0370175
Merge pull request #133701 from r-ryantm/auto-update/nbstripout
nbstripout: 0.3.9 -> 0.5.0
2021-08-13 17:08:44 +03:00
R. RyanTM
270d068656 nbstripout: 0.3.9 -> 0.5.0 2021-08-13 05:45:17 +00:00
Jörg Thalheim
eaaea54a37 hub: fix aarch64-darwin build 2021-08-12 21:45:04 +02:00
Artturi
509a52913c
Merge pull request #133300 from Artturin/blackboxupdate
blackbox: 1.20181219 -> 2.0.0 and enable tests
2021-08-12 21:36:52 +03:00
Artturin
f46d15905d blackbox: 1.20181219 -> 2.0.0 and enable tests 2021-08-12 20:57:31 +03:00
github-actions[bot]
e60a466252
Merge master into staging-next 2021-08-12 00:01:27 +00:00
R. RyanTM
1685d65266 gitkraken: 7.7.1 -> 7.7.2 2021-08-11 18:39:59 +00:00
github-actions[bot]
234c0d62da
Merge master into staging-next 2021-08-11 18:01:11 +00:00
Jan Tojnar
4e7e464ae8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/tools/system/sg3_utils/default.nix
2021-08-11 16:22:42 +02:00
Martin Weinelt
c20f28657f glab: 1.19.0 -> 1.20.0 2021-08-11 13:41:28 +02:00
Martin Weinelt
0f9339ef32
glab: expose version, enable tests 2021-08-11 13:40:24 +02:00
Martin Weinelt
75485563d5
Merge pull request #133394 from r-ryantm/auto-update/glab 2021-08-11 13:25:45 +02:00
Nikolay Korotkiy
6b9dc66a14 radicle-upstream: 0.2.3 → 0.2.9, enable on darwin 2021-08-11 13:38:12 +09:00
R. RyanTM
4f0e6e9879 glab: 1.18.1 -> 1.19.0 2021-08-10 15:14:36 +00:00
Maximilian Bosch
394381f05f
Merge pull request #132878 from Ma27/bump-gitea
gitea: 1.14.5 -> 1.14.6
2021-08-10 10:20:20 +02:00
Pascal Bach
293026e7ca
Merge pull request #132991 from SuperSandro2000/gitstatus
Gitstatus
2021-08-09 23:24:59 +02:00
github-actions[bot]
610ef47b20
Merge master into staging-next 2021-08-08 18:01:03 +00:00
David Terry
c1186b572f
maintainers: xwvvvvwx -> d-xo 2021-08-08 19:11:45 +02:00
R. RyanTM
dbae6eea00 ghq: 1.1.7 -> 1.2.1 2021-08-08 12:09:59 +00:00
Maximilian Bosch
b15a7c718e
gitea: 1.14.5 -> 1.14.6
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.6
2021-08-08 09:58:09 +02:00
github-actions[bot]
825ed68c05
Merge master into staging-next 2021-08-08 06:01:18 +00:00
Sandro
6d84ed4252
Merge pull request #133071 from qowoz/go-tags 2021-08-08 04:46:39 +02:00
zowoq
60ca07fadc gogs: buildFlags{,Array} -> tags 2021-08-08 10:17:23 +10:00
Artturi
709741c679
Merge pull request #117183 from r-ryantm/auto-update/git-hub
git-hub: 2.1.0 -> 2.1.1
2021-08-08 03:02:33 +03:00
Sandro Jäckel
e4cbde6907
gitstatus: update libgit2 2021-08-06 17:23:08 +02:00
Sandro Jäckel
f4cae7047e
gitstatus: add SuperSandro2000 maintainer 2021-08-06 17:22:55 +02:00
Sandro Jäckel
52cab6b895
gitstatus: move scripts to $out/share/gitstatus, fix a bug when loading from home-manager 2021-08-06 17:22:13 +02:00
Sandro Jäckel
e3bb39daf7
gitstatus: format, cleanup 2021-08-06 17:21:32 +02:00
github-actions[bot]
a7d7790dd5
Merge master into staging-next 2021-08-06 06:01:01 +00:00
zowoq
0d2e76fdc9 gitaly: buildFlags -> tags 2021-08-06 11:29:32 +10:00
github-actions[bot]
56eaae3fbd
Merge master into staging-next 2021-08-06 00:01:38 +00:00
Fabián Heredia Montiel
88e451423f
pijul: 1.0.0-alpha.52 → 1.0.0-alpha.53 (#132827) 2021-08-05 19:13:50 -04:00
github-actions[bot]
cb64ec05dd
Merge master into staging-next 2021-08-05 18:03:00 +00:00
Yureka
5957f4edb9 gitlab: 14.1.1 -> 14.1.2 2021-08-05 14:45:10 +02:00
github-actions[bot]
a4174a93f2
Merge master into staging-next 2021-08-05 12:01:26 +00:00
Sandro
04b5e62d8d
Merge pull request #132468 from Stunkymonkey/applications-phases1 2021-08-05 09:37:57 +02:00
github-actions[bot]
7fac04f59c
Merge master into staging-next 2021-08-05 00:01:21 +00:00
zowoq
ea78c0ca73 gh: 1.13.1 -> 1.14.0
https://github.com/cli/cli/releases/tag/v1.14.0
2021-08-05 08:26:42 +10:00
github-actions[bot]
2e929613b4
Merge master into staging-next 2021-08-04 18:00:59 +00:00