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
Sandro
eaef571d76
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
...
git: fix pkgsStatic build
2021-06-17 01:10:00 +02:00
Ben Siraphob
8bae808a21
rcs: 5.9.4 -> 5.10.0 ( #112014 )
2021-06-17 01:00:33 +02:00
github-actions[bot]
8b9fa8d446
Merge staging-next into staging
2021-06-16 18:04:48 +00:00
github-actions[bot]
2d104c99a7
Merge master into staging-next
2021-06-16 18:04:45 +00:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Thomas Gerbet
fc1c4bab77
git: fix pkgsStatic build
2021-06-16 18:46:39 +02:00
Sandro
4d5f3b8d93
Merge pull request #127022 from r-ryantm/auto-update/glab
...
glab: 1.18.0 -> 1.18.1
2021-06-16 18:25:26 +02:00
github-actions[bot]
f060a3768b
Merge master into staging-next
2021-06-16 06:04:41 +00:00
R. RyanTM
76ceead4ec
lefthook: 0.7.5 -> 0.7.6
2021-06-15 20:01:41 -07:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
R. RyanTM
29cf0172e0
glab: 1.18.0 -> 1.18.1
2021-06-16 01:39:44 +00:00
Maximilian Bosch
9db4b84cfb
Merge pull request #126887 from Ma27/bump-diff-so-fancy
...
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
2021-06-15 22:04:09 +02:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Milan Pässler
5c04139da2
gitlab: 13.12.3 -> 13.12.4
...
https://about.gitlab.com/releases/2021/06/14/gitlab-13-12-4-released/
2021-06-15 00:03:56 +02:00
Maximilian Bosch
d387353590
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
...
ChangeLog: https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.4.2
2021-06-14 22:36:43 +02:00
Sandro
dfc55d71ec
Merge pull request #126530 from mweinelt/zsh-p10k
2021-06-14 19:26:34 +02:00
github-actions[bot]
dbed958bf2
Merge staging-next into staging
2021-06-14 12:04:44 +00:00
github-actions[bot]
f2ba460019
Merge master into staging-next
2021-06-14 12:04:41 +00:00
Milan Pässler
d62aac819b
gitlab: 13.12.2 -> 13.12.3
2021-06-14 08:04:31 +02:00
github-actions[bot]
9309a23dd3
Merge staging-next into staging
2021-06-12 18:04:58 +00:00
github-actions[bot]
65a7d168af
Merge master into staging-next
2021-06-12 18:04:56 +00:00
Sandro
6241f618f2
Merge pull request #126232 from siraben/fossil-update
...
fossil: 2.14 -> 2.15.1
2021-06-12 19:11:56 +02:00
Martin Weinelt
38b5368b7e
gitAndTools.gitstatus: 1.4.4 -> 1.5.1
2021-06-10 21:35:57 +02:00
github-actions[bot]
f023076314
Merge staging-next into staging
2021-06-10 18:14:20 +00:00
github-actions[bot]
870106ba69
Merge master into staging-next
2021-06-10 18:14:17 +00:00
Alyssa Ross
cf1f499e7e
cvs-fast-export: 1.56 -> 1.57
2021-06-10 14:08:28 +00:00
Alyssa Ross
db733deeed
cvs-fast-export: clean up; fix cross
...
Style was unidiomatic for modern Nixpkgs, there was no
nativeBuildInputs/buildInputs separation, and some dependencies were
unused.
I've removed doCheck here, because the default Nixpkgs checkPhase
wasn't actually running the tests (need to cd into tests first), and
when I did write a checkPhase to run the tests, they didn't work and I
couldn't make them work.
A note on RCS: There is code in cvsconvert that calls RCS, but I
analyzed it quite carefully, and came to the conclusion that all such
code is unreachable, so I removed the RCS dependency.
2021-06-10 14:04:46 +00:00
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging
2021-06-10 14:07:45 +02:00
github-actions[bot]
51dce04dde
Merge master into staging-next
2021-06-10 12:05:05 +00:00
Mario Rodas
1027d970df
Merge pull request #126152 from r-ryantm/auto-update/git-filter-repo
...
git-filter-repo: 2.29.0 -> 2.32.0
2021-06-10 05:38:19 -05:00
github-actions[bot]
da8d931c82
Merge master into staging-next
2021-06-10 06:07:24 +00:00
AndersonTorres
e9e5f5f84d
Change all alsaLib references to alsa-lib
2021-06-10 01:12:49 -03:00
github-actions[bot]
cf8441dd85
Merge staging-next into staging
2021-06-09 18:14:53 +00:00
github-actions[bot]
f242b07bc2
Merge master into staging-next
2021-06-09 18:14:51 +00:00
talyz
8f16b16291
gitlab: Make sure the FOSS version isn't identified as EE
2021-06-09 17:50:45 +02:00
Ben Siraphob
f0b2272124
fossil: 2.14 -> 2.15.1
2021-06-09 20:48:54 +07:00
Sandro
29badbe190
Merge pull request #126353 from otavio/topic/updates-2021-06-09
2021-06-09 15:06:54 +02:00
Ryan Mulligan
62c94205ab
Merge pull request #126318 from r-ryantm/auto-update/glab
...
glab: 1.17.0 -> 1.18.0
2021-06-09 06:00:19 -07:00
Martin Weinelt
3da00fa467
Merge branch 'master' into staging-next
2021-06-09 14:18:55 +02:00
Otavio Salvador
963b1f068a
gitRepo: 2.15.3 -> 2.15.4
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-06-09 09:15:52 -03:00
R. RyanTM
e9d48ab799
git-vendor: 1.2.0 -> 1.2.1
2021-06-09 14:15:52 +02:00
R. RyanTM
a362b1e9ee
glab: 1.17.0 -> 1.18.0
2021-06-09 07:03:20 +00: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
R. RyanTM
688a5b4c37
git-filter-repo: 2.29.0 -> 2.32.0
2021-06-08 03:48:25 +00:00
github-actions[bot]
e218376e4a
Merge staging-next into staging
2021-06-07 06:37:31 +00:00
github-actions[bot]
33d7555871
Merge master into staging-next
2021-06-07 06:37:28 +00:00
R. RyanTM
d4963ae435
gitui: 0.16.0 -> 0.16.1
2021-06-07 02:21:26 +00:00
Michael Weiss
752bfa0496
git: 2.31.1 -> 2.32.0
2021-06-06 16:35:32 +02:00