Commit Graph

4630 Commits

Author SHA1 Message Date
github-actions[bot]
faf5da6aed
Merge staging-next into staging 2021-11-15 12:01:44 +00:00
Vladimír Čunát
64065d76f4
Merge #144730: branch 'staging-next' 2021-11-15 11:52:15 +01:00
figsoda
df304eeb80 glitter: 1.5.4 -> 1.5.5 2021-11-14 17:39:32 -05:00
github-actions[bot]
9f6360b7fb
Merge staging-next into staging 2021-11-14 18:01:49 +00:00
sternenseemann
2f78a2d3a3 Merge remote-tracking branch 'origin/master' into staging-next 2021-11-14 16:26:44 +01:00
Domen Kožar
8d45efbdac
Merge pull request #143065 from arkivm/gitkraken-darwin
gitkraken: add darwin support
2021-11-14 08:50:24 -06:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
Vikram Narayanan
d7575472f5 gitkraken: add darwin support 2021-11-13 23:08:43 -08:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
figsoda
91137787da
Merge pull request #145837 from r-ryantm/auto-update/git-machete
git-machete: 3.4.1 -> 3.5.0
2021-11-13 23:16:32 -05:00
R. Ryantm
04bfd3c8e1 git-machete: 3.4.1 -> 3.5.0 2021-11-14 01:41:34 +00:00
figsoda
25ae74d855 glitter: 1.5.3 -> 1.5.4 2021-11-13 17:05:21 -05:00
github-actions[bot]
914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot]
4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
figsoda
e7200f5810 glitter: 1.5.2 -> 1.5.3 2021-11-13 10:55:13 -05:00
Alyssa Ross
26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
figsoda
8fff522ff9 glitter: 1.5.1 -> 1.5.2 2021-11-12 20:10:36 -05:00
github-actions[bot]
e972a20a60
Merge staging-next into staging 2021-11-13 00:02:24 +00:00
github-actions[bot]
c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
figsoda
3190ece3b2 glitter: 1.5.0 -> 1.5.1 2021-11-12 16:08:58 -05:00
github-actions[bot]
65356b24bf
Merge staging-next into staging 2021-11-12 18:01:48 +00:00
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]
9618986955
Merge staging-next into staging 2021-11-10 12:01:57 +00: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]
9ecd6bf4df
Merge staging-next into staging 2021-11-08 18:02:05 +00: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
github-actions[bot]
aa164b77b8
Merge staging-next into staging 2021-11-08 00:02:29 +00: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
Artturin
e7dbe3bd20 git: fix build with strictDeps 2021-11-05 19:57:03 +02:00
Artturi
219339e02a
Merge pull request #141959 from ck3d/fix-cross-git 2021-11-05 14:01:41 +02:00
github-actions[bot]
cca97be2f0
Merge staging-next into staging 2021-11-04 12:01:39 +00:00
Christian Kögler
7bfd3a8454 gitMinimal: Fix wrong shell for cross compiled package 2021-11-04 00:36:15 +02: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
Felix Buehler
a76d49eaf8 gitstats: switch to fetchFromGitHub 2021-11-02 19:49:30 +01:00
Felix Buehler
e4726e19e7 gitinspector: switch to fetchFromGitHub 2021-11-02 19:49:30 +01:00
Felix Buehler
7dfb853434 svn2git: switch to fetchFromGitHub 2021-11-02 19:49:30 +01: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
github-actions[bot]
783f3c33e5
Merge master into staging-next 2021-10-28 06:01:14 +00:00
Mario Rodas
fe4d3d53ba git-lfs: 3.0.1 -> 3.0.2
https://github.com/git-lfs/git-lfs/releases/tag/v3.0.2
2021-10-28 04:20:00 +00:00
Benoit de Chezelles
631baa9ab9 delta: 0.8.3 -> 0.9.1 2021-10-28 04:53:28 +02:00
figsoda
a07f175971
Merge pull request #143249 from dan4ik605743/gd-up
github-desktop: 2.9.3 -> 2.9.4
2021-10-27 22:42:09 -04:00
github-actions[bot]
22401dcc39
Merge master into staging-next 2021-10-27 18:01:02 +00:00
dan4ik
ca4560cbc0 github-desktop: 2.9.3 -> 2.9.4 2021-10-27 19:35:21 +07:00
figsoda
d7d45aadf2 lucky-commit: use checkNoDefaultFeatures 2021-10-27 08:08:03 -04:00
Mrinal Purohit
12908d7a48 gh: 2.1.0 -> 2.2.0 2021-10-27 15:43:30 +05:30
github-actions[bot]
a16b1b54b3
Merge staging-next into staging 2021-10-25 12:02:08 +00:00
Vladimír Čunát
20ecf57704
Merge #142801: git: disable t5003 on darwin (into staging-next) 2021-10-25 08:14:10 +02:00
github-actions[bot]
71de656d73
Merge staging-next into staging 2021-10-25 06:02:04 +00:00
github-actions[bot]
0386c26190
Merge master into staging-next 2021-10-25 06:01:29 +00:00
Bobby Rong
ccb59f86d8
Merge pull request #142076 from rhoriguchi/gitkraken
gitkraken: 8.0.1 -> 8.1.0
2021-10-25 12:32:06 +08: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
github-actions[bot]
94e4b96dfc
Merge staging-next into staging 2021-10-24 00:02:23 +00:00
github-actions[bot]
6d5b2c70e0
Merge master into staging-next 2021-10-24 00:01:46 +00:00
figsoda
cede4a6d88
Merge pull request #142658 from hmenke/git-branchless
git-branchless: 0.3.6 -> 0.3.7
2021-10-23 17:02:24 -04:00
github-actions[bot]
c3a27b2a6c
Merge staging-next into staging 2021-10-23 18:01:53 +00:00
github-actions[bot]
50a5d0f17c
Merge master into staging-next 2021-10-23 18:01:15 +00:00