3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4718 commits

Author SHA1 Message Date
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
Henri Menke daf3ce27e3
git-branchless: 0.3.6 -> 0.3.7 2021-10-23 15:17:04 +02:00
Mario Rodas db287c380d git-lfs: 2.13.3 -> 3.0.1 2021-10-22 22:16:50 -05:00
github-actions[bot] cd69ba563d
Merge staging-next into staging 2021-10-23 00:02:27 +00:00
github-actions[bot] 421a9e648e
Merge master into staging-next 2021-10-23 00:01:46 +00:00
figsoda fe88e0110c
Merge pull request #142575 from figsoda/update-gitoxide
gitoxide: 0.8.4 -> 0.10.0
2021-10-22 15:58:10 -04:00
github-actions[bot] f9ab4de694
Merge staging-next into staging 2021-10-22 18:01:54 +00:00
github-actions[bot] c93daf97af
Merge master into staging-next 2021-10-22 18:01:15 +00:00
Jonathan Ringer fc25d94010
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
2021-10-22 09:33:07 -07:00
figsoda 7f1866e127 lucky-commit: init at 2.1.0 2021-10-22 12:06:15 -04:00
figsoda 4c121d1630 gitoxide: 0.8.4 -> 0.10.0 2021-10-22 10:51:22 -04:00
Leo 38c6ea34aa
gitea: 1.15.4 -> 1.15.5 (#142537) 2021-10-22 09:47:48 +02:00
github-actions[bot] 79a336f4e0
Merge staging-next into staging 2021-10-21 06:01:58 +00:00
github-actions[bot] 54a42ab846
Merge master into staging-next 2021-10-21 06:01:21 +00:00
Vladyslav M b946e1b666 pijul: 1.0.0-alpha.54 -> 1.0.0-alpha.55 2021-10-21 11:02:31 +09:00
github-actions[bot] 2d89e161b7
Merge staging-next into staging 2021-10-20 18:01:55 +00:00
github-actions[bot] ba32b28e59
Merge master into staging-next 2021-10-20 18:01:18 +00:00
figsoda 1b179bef03
Merge pull request #142331 from r-ryantm/auto-update/git-cola
git-cola: 3.10.1 -> 3.11.0
2021-10-20 08:16:09 -04:00
github-actions[bot] eebbebca41
Merge staging-next into staging 2021-10-20 12:02:09 +00:00
github-actions[bot] cdc8393c04
Merge master into staging-next 2021-10-20 12:01:31 +00:00
R. RyanTM 531f2bfd7d git-cola: 3.10.1 -> 3.11.0 2021-10-20 10:45:48 +00:00
Yureka 2d1057f19e gitlab: use fetchYarnDeps 2021-10-20 11:39:16 +02:00
github-actions[bot] 2564b3d967
Merge staging-next into staging 2021-10-19 18:01:48 +00:00
Vladimír Čunát 01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
Henri Menke 39b8cfebed
git-branchless: 0.3.2 -> 0.3.6 2021-10-19 16:10:09 +02:00
figsoda 22ccc96532 glitter: 1.4.4 -> 1.4.10 2021-10-18 20:54:37 -04:00
github-actions[bot] 6f91c2a673
Merge staging-next into staging 2021-10-18 18:01:48 +00:00
github-actions[bot] b0a41194a1
Merge master into staging-next 2021-10-18 18:01:14 +00:00
Fabián Heredia Montiel f824d27f66 mercurial_4: remove 2021-10-18 12:56:44 -05:00
figsoda ecd018bb00
Merge pull request #142046 from LibreCybernetics/update-git-fast-export
git-fast-export: 200213 → 210917
2021-10-18 13:42:14 -04:00
Ryan Horiguchi 67c1c4f110
gitkraken: 8.0.1 -> 8.1.0 2021-10-18 13:09:04 +02:00
Fabián Heredia Montiel 48c041f234 git-fast-export: 200213 → 210917 2021-10-17 19:48:10 -05:00
Ashish SHUKLA a28064c96c
fossil: 2.16 -> 2.17
Add option to prefer internal/bundled sqlite3 which is what fossil seems to
prefer
2021-10-17 21:37:03 +05:30
Martin Weinelt ab1945331e
Merge pull request #141829 from risicle/ris-curl-7.79.1 2021-10-17 02:24:12 +02:00
Ryan Burns 3220fbe696 Merge branch 'master' into staging-next 2021-10-16 16:07:38 -07:00
Fabián Heredia Montiel 6312c80e06 pijul: 1.0.0-alpha.53 → 1.0.0-alpha.54 2021-10-16 13:58:15 -05:00
R. RyanTM 3faf54932c gitRepo: 2.17.1 -> 2.17.2 2021-10-16 15:58:19 +00:00
Martin Weinelt f651d617a6 curl: use --with/without-openssl instead of --with/without-ssl
This also migrates sslSupport to opensslSupport, which affects packages
overriding the curl package in that regard.
2021-10-16 11:35:18 +01:00
Martin Weinelt a415d5dd2e Merge remote-tracking branch 'origin/master' into staging-next 2021-10-15 23:10:08 +02:00
Jan Tojnar 690d9ab908
Merge pull request #141693 from jtojnar/gnome-stragglers
GNOME: more updates
2021-10-15 20:28:40 +02:00
Mifom 7effa9bcb1 gitui: 0.17.1 -> 0.18.0 2021-10-15 14:21:05 +03:00
Martin Weinelt adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
Jan Tojnar ad182ff274 meld.updateScript: remove version policy
Stable version was buggy so we are tracking unstable ones.
2021-10-15 00:51:47 +02:00
figsoda 2a6b94d940
Merge pull request #141661 from figsoda/update-verco
verco: 6.6.0 -> 6.7.0
2021-10-14 18:20:48 -04:00
Artturi 09ab6a7f0b
Merge pull request #141663 from LibreCybernetics/update-thicket 2021-10-15 01:15:34 +03:00
zowoq e1951b3fb2 gh: 2.0.0 -> 2.1.0
https://github.com/cli/cli/releases/tag/v2.1.0
2021-10-15 06:44:28 +10:00
Fabián Heredia Montiel b367ab9ad1 thicket: crystal_1_0 → crystal 2021-10-14 14:26:49 -05:00
figsoda 70dda29693 verco: 6.6.0 -> 6.7.0 2021-10-14 15:08:18 -04:00
Anderson Torres f2545a5da6
Merge pull request #141438 from aanderse/redmine
redmine: 4.2.2 -> 4.2.3
2021-10-14 14:43:08 -03:00
figsoda 1a9c6b5ca7
Merge pull request #141307 from r-ryantm/auto-update/git-machete
git-machete: 3.3.0 -> 3.4.1
2021-10-14 08:05:02 -04:00
Kim Lindberger 348c229ffa
Merge pull request #141619 from yayayayaka/gitlab-14.3.3
gitlab: 14.3.2 -> 14.3.3
2021-10-14 13:59:34 +02:00
Lara e7331d2e85 gitlab: 14.3.2 -> 14.3.3 2021-10-14 11:55:43 +00:00
Peter Simons 476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
figsoda 78d51d318c verco: 6.5.5 -> 6.6.0 2021-10-13 17:30:51 -04:00
Michael Adler 1c2c055883 git: 2.33.0 -> 2.33.1 2021-10-13 19:39:36 +02:00
Ryan Horiguchi e2b72ec679
gitkraken: 7.8.1 -> 8.0.1 2021-10-13 14:59:57 +02:00
figsoda 4c7bf71d8e
git-machete: fix version checks 2021-10-12 22:33:23 -04:00
Aaron Andersen a67f960cfc redmine: 4.2.2 -> 4.2.3 2021-10-12 21:46:41 -04:00
R. RyanTM f123659906 gitRepo: 2.17 -> 2.17.1 2021-10-12 01:19:44 +00:00
R. RyanTM 302d33f4d1 git-machete: 3.3.0 -> 3.4.1 2021-10-12 00:47:44 +00:00
happysalada 903dc5bf92 git: darwin: disable flaky tests 2021-10-09 20:27:25 +09:00
Maximilian Bosch 5a2ecde0da
gitea: 1.15.3 -> 1.15.4
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.4
2021-10-08 22:39:38 +02:00
Norbert Melzer 9b0a3cf13c lefthook: 0.7.6 -> 0.7.7 2021-10-07 09:20:14 +02:00
Ben Siraphob 2084a6cf0c
Merge pull request #140563 from siraben/git-cliff-update
git-cliff: 0.3.0 -> 0.4.0
2021-10-05 06:10:47 +00:00
Ben Siraphob 0afbd8c8a8 git-cliff: 0.3.0 -> 0.4.0 2021-10-05 00:44:38 -05:00
Lara ffab7bf0f5 gitlab: 14.3.1 -> 14.3.2 2021-10-04 10:23:28 +02:00
figsoda df7da6d18d
Merge pull request #140423 from SuperSandro2000/git-extras
git-extras: 6.2.0 -> 6.3.0
2021-10-03 22:17:08 -04:00
figsoda 0d6d1e8cc0
Merge pull request #139453 from wahjava/init-got
got: init at 0.60
2021-10-03 21:37:00 -04:00
Sandro Jäckel 3f025a3bff
git-extras: 6.2.0 -> 6.3.0 2021-10-03 23:30:07 +02:00
Lara c80fae5bbe gitlab: 14.2.4 -> 14.3.1 2021-10-03 23:19:32 +02:00
Ashish SHUKLA 4acc1749db
got: init at 0.60 2021-10-02 15:55:16 +05:30
Finn Behrens c29f8005d0 gerrit: 3.4.0 -> 3.4.1 2021-10-01 17:15:38 +02:00
Bobby Rong ed88757b2b
Merge pull request #140104 from r-ryantm/auto-update/gitRepo
gitRepo: 2.16.8 -> 2.17
2021-10-01 13:38:50 +08:00
Bobby Rong 2630a4a54c
Merge pull request #140062 from drewrisinger/dr-pr-update-glab
glab: 1.20.0 -> 1.21.1
2021-10-01 11:16:15 +08:00
R. RyanTM ea41520b71 gitRepo: 2.16.8 -> 2.17 2021-10-01 01:28:14 +00:00
Drew Risinger 52babc1baa glab: 1.20.0 -> 1.21.1 2021-09-30 14:15:04 -04:00
Sandro dec57cb241
Merge pull request #139688 from terinjokes/patches/stgit-1.3
stgit: 1.1 -> 1.3
2021-09-30 14:13:13 +02:00
Mario Rodas 094ce6598b lab: 0.22.0 -> 0.23.0
https://github.com/zaquestion/lab/releases/tag/v0.23.0
2021-09-30 04:20:00 +00:00
Harsh Shandilya 0b612ad35a
git-quickfix: init at 0.0.4 2021-09-30 01:17:26 +05:30
Sandro 53de55d793
Merge pull request #139523 from dan4ik605743/github-desktop 2021-09-29 16:23:59 +02:00
Terin Stock 180f709901 stgit: 1.1 -> 1.3 2021-09-28 09:22:44 -07:00
Sandro Jäckel d433cd1ff9 git-extras: move bash completion under share, patch less files 2021-09-28 17:58:06 +02:00
Alyssa Ross 31efca77d1
git-remote-hg: unstable-2020-06-12 -> 1.0.2.1 2021-09-28 08:34:15 +00:00
figsoda e0f52be565
Merge pull request #139346 from hmenke/pass-git-helper
pass-git-helper: 1.1.1 -> 1.1.2
2021-09-27 22:16:49 -04:00
Artturin 946154fdb7 thicket: 0.1.4 -> 0.1.5 2021-09-27 00:15:10 +03:00
dan4ik ef29ed4062 github-desktop: 2.9.0 -> 2.9.3 2021-09-26 16:44:14 +07:00
Henri Menke 65605178bf
pass-git-helper: 1.1.1 -> 1.1.2 2021-09-24 21:12:08 +02:00
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