Commit graph

4548 commits

Author SHA1 Message Date
github-actions[bot] 699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
Kim Lindberger 8d85dc628f
Merge pull request #145088 from yayayayaka/gitlab-14.4.2
gitlab: 14.4.1 -> 14.4.2
2021-11-12 14:22:11 +01:00
figsoda 3e81f958f8
Merge pull request #145620 from sikmir/git-big-picture
git-big-picture: enable on darwin
2021-11-12 08:14:24 -05:00
Nikolay Korotkiy f8f1015885
git-big-picture: enable on darwin 2021-11-12 14:41:53 +03:00
figsoda 433739b9b3 glitter: 1.4.10 -> 1.5.0 2021-11-11 19:05:57 -05:00
github-actions[bot] 84d856a651
Merge master into staging-next 2021-11-10 12:01:22 +00:00
xaverdh 03a257e5a3
treewide: quote urls according to rfc 0045 (#145260)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-10 11:37:56 +01:00
github-actions[bot] f14d7cb2f6
Merge master into staging-next 2021-11-08 18:01:24 +00:00
Lara 86cfedf3e8 gitlab: add yayayayaka to the list of maintainers 2021-11-08 16:51:31 +00:00
Lara 1d4cd29e2c gitlab: 14.4.1 -> 14.4.2 2021-11-08 16:43:33 +00:00
Sandro 28f9677cec
Merge pull request #144851 from c0deaddict/zhf/gitaly 2021-11-08 13:39:38 +01:00
Jos van Bakel dfe107b23c
gitaly: fix libgit2 dependency 2021-11-08 13:17:57 +01:00
John Ericson 4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
Felix Buehler b52ab3b712 pkgs/applications: rename name to pname&version part 2 2021-11-07 14:53:06 +01:00
github-actions[bot] cca97be2f0
Merge staging-next into staging 2021-11-04 12:01:39 +00:00
Sandro Jäckel 8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
github-actions[bot] bf39715fe0
Merge staging-next into staging 2021-11-03 12:01:58 +00:00
Luke Granger-Brown 8cafc54845
Merge pull request #144315 from pacien/mercurial-5.9.3
mercurial: 5.9.1 -> 5.9.3
2021-11-03 03:05:33 -07:00
Bobby Rong 2f83900c54
Merge pull request #143474 from r-ryantm/auto-update/stgit
stgit: 1.3 -> 1.4
2021-11-03 17:17:07 +08:00
Alyssa Ross 703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
tomberek 839750c207
Merge pull request #144252 from 0x4A6F/master-gst
gst: 5.0.4 -> 5.0.5
2021-11-02 14:33:30 -04:00
0x4A6F 257d8365cf
gst: 5.0.4 -> 5.0.5 2021-11-02 15:49:37 +01:00
pacien c1ef30de63 mercurial: 5.9.1 -> 5.9.3 2021-11-02 12:24:31 +01:00
github-actions[bot] bef900528f
Merge staging-next into staging 2021-11-01 00:02:05 +00:00
github-actions[bot] 7eaf56d92e
Merge master into staging-next 2021-11-01 00:01:32 +00:00
Amanda Cameron eb7d94e6e3 sublime{4,-merge}: Update packages. 2021-10-31 16:09:08 -04:00
Sandro f4d3f35d32
Merge pull request #143928 from r-ryantm/auto-update/gitRepo 2021-10-31 20:58:23 +01:00
R. Ryantm 91bab1510b gitRepo: 2.17.2 -> 2.17.3 2021-10-31 02:12:20 +00:00
github-actions[bot] fdcee2eb3b
Merge staging-next into staging 2021-10-31 00:02:05 +00:00
github-actions[bot] 81d84138b5
Merge master into staging-next 2021-10-31 00:01:33 +00:00
figsoda ccdaa135c6
Merge pull request #143871 from r-ryantm/auto-update/delta
delta: 0.9.1 -> 0.9.2
2021-10-30 16:57:40 -04:00
R. Ryantm 5acdca8beb delta: 0.9.1 -> 0.9.2 2021-10-30 17:32:30 +00:00
figsoda 3b02a12f2a lucky-commit: fix darwin build 2021-10-30 12:48:45 -04:00
github-actions[bot] 9a002bac35
Merge staging-next into staging 2021-10-29 18:01:38 +00:00
github-actions[bot] 6317a19147
Merge master into staging-next 2021-10-29 18:01:00 +00:00
Kim Lindberger 5195af24da
Merge pull request #143399 from talyz/gitlab-14.4.1
gitlab: 14.4.0 -> 14.4.1
2021-10-29 15:09:47 +02:00
talyz e06991e7bb
gitlab: 14.4.0 -> 14.4.1 2021-10-29 13:50:29 +02:00
github-actions[bot] d9aba51052
Merge staging-next into staging 2021-10-29 06:01:42 +00:00
github-actions[bot] e7fbce41fc
Merge master into staging-next 2021-10-29 06:01:10 +00:00
Mario Rodas 20f4c99c65
Merge pull request #143547 from marsam/update-git-lfs
git-lfs: 3.0.1 -> 3.0.2
2021-10-28 23:56:43 -05:00
Bobby Rong cd41f1c2d5
Merge pull request #143326 from r-ryantm/auto-update/vcsh
vcsh: 2.0.2 -> 2.0.4
2021-10-29 11:31:56 +08:00
R. Ryantm 63c8c1c8c3 stgit: 1.3 -> 1.4 2021-10-28 21:02:06 +00:00
github-actions[bot] 37b1afa489
Merge staging-next into staging 2021-10-28 18:02:03 +00:00
Martin Weinelt da1f248229 Merge remote-tracking branch 'origin/master' into staging-next 2021-10-28 19:51:45 +02:00
Alyssa Ross 3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-10-28 16:07:38 +00:00
Kim Lindberger 598dac5b15
Merge pull request #142833 from yayayayaka/gitlab-14.4.0
gitlab: 14.3.3 -> 14.4.0
2021-10-28 15:07:26 +02:00
github-actions[bot] ea4da560ff
Merge master into staging-next 2021-10-28 12:01:32 +00:00
Lara 978b3e19e4 gitlab: 14.3.3 -> 14.4.0 2021-10-28 11:03:32 +00:00
Maximilian Bosch cb788cef50
gitea: 1.15.5 -> 1.15.6
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.6
2021-10-28 11:35:58 +02:00
R. Ryantm 26e48252fe vcsh: 2.0.2 -> 2.0.4 2021-10-28 08:05:01 +00:00