Julien Moutinho
f9b99bed26
sourcehut.pagessrht: init at 0.4.8
2021-12-28 22:18:16 -05:00
Julien Moutinho
b6f26842c2
sourcehut: fix update.sh
2021-12-28 22:18:15 -05:00
Philipp
806797df24
gitty: 0.3.0 -> 0.5.0
2021-12-26 15:31:50 +01:00
Jonathan Ringer
5ed396a912
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
2021-12-23 10:14:19 -08:00
Thiago Kenji Okada
0c05fb5e9c
Merge pull request #151680 from boppyt/sublime-merge
...
sublime-merge: 2063 -> 2068, sublime-merge-dev: 2062 -> 2067
2021-12-23 12:22:39 -03:00
github-actions[bot]
c5a44bdf42
Merge master into staging-next
2021-12-23 06:01:11 +00:00
Bobby Rong
5216ffc17b
Merge pull request #151736 from rhoriguchi/gitkraken
...
gitkraken: 8.2.0 -> 8.2.1
2021-12-23 12:33:43 +08:00
Ryan Horiguchi
e2cc2c7f34
gitkraken: 8.2.0 -> 8.2.1
2021-12-22 14:48:52 +01:00
dan4ik
93c933b9f6
github-desktop: 2.9.4 -> 2.9.6
2021-12-22 19:25:07 +07:00
github-actions[bot]
7efc5ac013
Merge master into staging-next
2021-12-22 06:01:25 +00:00
Zack A
7dd68d1168
sublime-merge: 2063 -> 2068, sublime-merge-dev: 2062 -> 2067
2021-12-22 12:46:48 +09:00
github-actions[bot]
39d035c4cf
Merge master into staging-next
2021-12-22 00:01:35 +00:00
Sebastian Pipping
68bc9dd93b
git-delete-merged-branches: Fix >=6.3.0 dependencies
...
Related change upstream:
440513c21e (diff-60f61ab7a8d1910d86d9fda2261620314edcae5894d5aaa236b821c7256badd7L36)
2021-12-22 00:26:02 +01:00
zowoq
d8d4e0f5c9
gh: 2.3.0 -> 2.4.0
...
https://github.com/cli/cli/releases/tag/v2.4.0
2021-12-22 09:09:37 +10:00
github-actions[bot]
842f26c1de
Merge master into staging-next
2021-12-21 06:01:23 +00:00
Bobby Rong
c478eaf416
Merge pull request #151020 from fracek/radicle-upstream-update
...
radicle-upstream: 0.2.10 -> 0.2.12
2021-12-21 10:18:32 +08:00
Ivan Kovnatsky
acc090df4f
git-credential-1password: init at 1.0.0
2021-12-20 18:57:03 +02:00
github-actions[bot]
647c8d800f
Merge master into staging-next
2021-12-18 12:01:13 +00:00
Bobby Rong
e684ed37a2
Merge pull request #150786 from rhoriguchi/gitkraken
...
gitkraken: 8.1.1 -> 8.2.0
2021-12-18 17:35:08 +08:00
Dmitry Kalinkin
889227a048
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/pdftotext/default.nix
2021-12-16 16:55:25 -05:00
Francesco Ceccon
dd69fef63e
radicle-upstream: 0.2.10 -> 0.2.12
2021-12-16 21:48:49 +00:00
Marek Fajkus
1a3873c93d
Merge pull request #150876 from figsoda/update-glitter
...
glitter: 1.5.10 -> 1.5.11
2021-12-16 15:49:43 +01:00
github-actions[bot]
5394a299c6
Merge master into staging-next
2021-12-16 12:01:30 +00:00
zowoq
421a62671e
delta: 0.11.2 -> 0.11.3
...
https://github.com/dandavison/delta/releases/tag/0.11.3
2021-12-16 10:53:34 +10:00
figsoda
7184cc1027
glitter: 1.5.10 -> 1.5.11
2021-12-15 13:37:41 -05:00
Ryan Horiguchi
311c7dada3
gitkraken: 8.1.1 -> 8.2.0
2021-12-15 01:21:39 +01:00
github-actions[bot]
0242879f3f
Merge master into staging-next
2021-12-14 12:01:17 +00:00
github-actions[bot]
784572e7cf
Merge master into staging-next
2021-12-13 18:01:18 +00:00
Marek Fajkus
cec4971247
sublime*: use curl
instead of curl.out
in libPath
2021-12-13 17:33:42 +01:00
sternenseemann
d94eebe616
gitin: remove at 0.2.3
...
gitin depends on a precise version of git2go. Not even the latest
gitin/git2go version is compatible with an up to date libgit2. As the
upstream project hasn't seen activity in some time and doesn't respond
to the related issue (https://github.com/isacikgoz/gitin/issues/71 ),
drop this package.
2021-12-13 15:32:17 +01:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next
2021-12-13 12:20:07 +01:00
Mifom
77f65a82fe
gitui: 0.18.0 -> 0.19.0
2021-12-12 00:04:57 +03:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/celery/default.nix
pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Jörg Thalheim
708547ac0f
Merge pull request #150203 from r-ryantm/auto-update/cvs-fast-export
...
cvs-fast-export: 1.58 -> 1.59
2021-12-11 13:04:12 +00:00
R. Ryantm
877bb5b768
cvs-fast-export: 1.58 -> 1.59
2021-12-11 07:49:26 +00:00
github-actions[bot]
b2a2a5759e
Merge master into staging-next
2021-12-10 06:01:17 +00:00
Tim Zook
545a0831fa
sublime-merge: update 2033 → 2063 and add libcurl to application library path ( #146934 )
2021-12-10 01:39:27 +01:00
github-actions[bot]
92aabc6576
Merge master into staging-next
2021-12-10 00:01:53 +00:00
Finn Behrens
3f8e12cc87
gitaly: fix x86_64-darwin build
2021-12-09 19:57:32 +01:00
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master. Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
Ryan Mulligan
d5d95a836b
Merge pull request #149550 from r-ryantm/auto-update/gitRepo
...
gitRepo: 2.18 -> 2.19
2021-12-08 06:43:24 -08:00
Mario Rodas
dfa5404289
Merge pull request #149070 from r-ryantm/auto-update/subgit
...
subgit: 3.3.11 -> 3.3.12
2021-12-08 09:07:53 -05:00
github-actions[bot]
ac0d4017c5
Merge master into staging-next
2021-12-08 12:01:20 +00:00
R. Ryantm
ce7e5f3632
gitRepo: 2.18 -> 2.19
2021-12-08 07:33:42 +00:00
zowoq
d7f8016963
delta: 0.11.1 -> 0.11.2
...
https://github.com/dandavison/delta/releases/tag/0.11.2
2021-12-08 13:58:09 +10:00
github-actions[bot]
dc2fcd9f02
Merge master into staging-next
2021-12-07 12:01:31 +00:00
Lara
d52722bd8c
gitlab: 14.5.1 -> 14.5.2 ( #149305 )
...
https://about.gitlab.com/releases/2021/12/06/security-release-gitlab-14-5-2-released/
2021-12-07 10:49:42 +01:00
Jonathan Ringer
9dd8bffe92
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/aiocron/default.nix
2021-12-07 00:11:07 -08:00
figsoda
ce55f68016
Merge pull request #149170 from r-ryantm/auto-update/git-cliff
...
git-cliff: 0.4.0 -> 0.4.2
2021-12-06 20:37:58 -05:00
R. Ryantm
bf2d01d5f1
git-cliff: 0.4.0 -> 0.4.2
2021-12-07 00:09:17 +00:00
github-actions[bot]
255d79d651
Merge master into staging-next
2021-12-07 00:01:37 +00:00
zowoq
1dfc147773
delta: 0.11.0 -> 0.11.1
...
https://github.com/dandavison/delta/releases/tag/0.11.1
2021-12-07 07:00:42 +10:00
github-actions[bot]
ffbac7335b
Merge master into staging-next
2021-12-06 18:01:23 +00:00
R. Ryantm
6274245368
subgit: 3.3.11 -> 3.3.12
2021-12-06 17:00:56 +00:00
Ryan Mulligan
903d86eb3f
Merge pull request #148854 from r-ryantm/auto-update/gitRepo
...
gitRepo: 2.17.3 -> 2.18
2021-12-06 06:37:19 -08:00
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
pkgs/top-level/all-packages.nix
2021-12-05 22:02:00 -08:00
R. Ryantm
4da06aaede
gitRepo: 2.17.3 -> 2.18
2021-12-06 04:26:51 +00:00
zowoq
0e3a33279a
delta: 0.10.3 -> 0.11.0
...
https://github.com/dandavison/delta/releases/tag/0.11.0
2021-12-06 11:35:03 +10:00
Jörg Thalheim
423aff986c
Merge remote-tracking branch 'upstream/master' into HEAD
2021-12-05 19:41:20 +01:00
Henri Menke
64fbdc2099
git-branchless: 0.3.7 -> 0.3.8
2021-12-05 14:08:35 +01:00
github-actions[bot]
3995cabfbe
Merge master into staging-next
2021-12-05 06:01:04 +00:00
Sandro
6386edf284
Merge pull request #148576 from Ma27/bump-gitea
2021-12-05 06:25:35 +01:00
figsoda
d09271ab35
glitter: 1.5.9 -> 1.5.10
2021-12-04 14:08:35 -05:00
github-actions[bot]
d4c54e7f61
Merge master into staging-next
2021-12-04 18:01:05 +00:00
Mario Rodas
6bd1daaf0f
Merge pull request #148526 from qowoz/delta
...
delta: 0.10.2 -> 0.10.3
2021-12-04 09:23:59 -05:00
Maximilian Bosch
da4ca766df
gitea: 1.15.6 -> 1.15.7
...
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.15.7
2021-12-04 13:56:12 +01:00
github-actions[bot]
a3ef129c42
Merge master into staging-next
2021-12-04 12:01:10 +00:00
Guillaume Girol
c1641865d8
Merge pull request #148317 from figsoda/update-glitter
...
glitter: 1.5.7 -> 1.5.9
2021-12-04 09:21:40 +00:00
github-actions[bot]
67691cf506
Merge master into staging-next
2021-12-04 00:01:30 +00:00
Dmitry Bogatov
1938cc6e55
gitflow: embed path to coreutils into the wrapper
...
gitflow is shell script and does not work without common tools (e.g readlink)
in PATH or with busybox instead of coreutils.
Busybox version of readlink does not support "-e" option. Probably it can be
replaced with "-f", but I didn't check.
2021-12-03 23:56:56 +01:00
zowoq
25d6118dbd
delta: 0.10.2 -> 0.10.3
...
https://github.com/dandavison/delta/releases/tag/0.10.3
2021-12-04 08:41:16 +10:00
github-actions[bot]
904ed45698
Merge master into staging-next
2021-12-03 18:01:12 +00:00
Kim Lindberger
58f87c20e1
Merge pull request #148302 from talyz/gitlab-14.5.1
...
gitlab: 14.5.0 -> 14.5.1
2021-12-03 15:39:51 +01:00
Jonathan Ringer
2e6fadac4e
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/django-rq/default.nix
2021-12-02 16:07:50 -08:00
github-actions[bot]
987163192b
Merge master into staging-next
2021-12-03 00:01:31 +00:00
figsoda
ee36beaf08
glitter: 1.5.8 -> 1.5.9
2021-12-02 17:42:38 -05:00
Mrinal Purohit
b0819012c4
gh: 2.2.0 -> 2.3.0
2021-12-03 07:30:07 +10:00
figsoda
8da44bcdd1
glitter: 1.5.7 -> 1.5.8
2021-12-02 13:58:42 -05:00
github-actions[bot]
61ce96a63a
Merge staging-next into staging
2021-12-02 18:01:48 +00:00
github-actions[bot]
bcc4d12e17
Merge master into staging-next
2021-12-02 18:01:11 +00:00
talyz
19494f7eda
gitlab: 14.5.0 -> 14.5.1
2021-12-02 17:56:57 +01:00
Kim Lindberger
5ef642624c
Merge pull request #147848 from yayayayaka/gitlab-14.5.0
...
gitlab: 14.4.2 -> 14.5.0
2021-12-02 17:29:12 +01:00
Alyssa Ross
f404068903
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/servers/search/groonga/default.nix
2021-12-02 14:52:44 +00:00
Bobby Rong
7d2ebe6fab
Merge pull request #145938 from rhoriguchi/gitkraken
...
gitkraken: 8.1.0 -> 8.1.1
2021-12-02 21:29:02 +08:00
github-actions[bot]
f6f101cca5
Merge master into staging-next
2021-12-01 12:01:26 +00:00
Mario Rodas
1e317031b6
Merge pull request #148090 from msfjarvis/hs/2021-12-01/git-quickfix-0.0.5
...
git-quickfix: 0.0.4 -> 0.0.5
2021-12-01 01:11:06 -05:00
github-actions[bot]
3bebe2a3f2
Merge master into staging-next
2021-12-01 06:01:17 +00:00
Mario Rodas
193388b14d
Merge pull request #147655 from marsam/update-git-filter-repo
...
git-filter-repo: remove duplicated expression
2021-12-01 00:25:08 -05:00
Harsh Shandilya
e6096f4e1e
git-quickfix: 0.0.4 -> 0.0.5
2021-12-01 08:34:00 +05:30
github-actions[bot]
b58b9075cd
Merge staging-next into staging
2021-12-01 00:02:28 +00:00
github-actions[bot]
80fce0f4a7
Merge master into staging-next
2021-12-01 00:01:49 +00:00
Sandro
deb0056743
Merge pull request #147810 from wahjava/update-got
2021-11-30 20:38:50 +01:00
Jonathan Ringer
3bbe9a9459
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2021-11-29 10:15:20 -08:00
Yureka
f146c92955
gitaly: use custom libgit2 commit
2021-11-29 18:37:36 +01:00
Lara
e2668f6a7b
gitlab: 14.4.2 -> 14.5.0
2021-11-29 13:11:02 +00:00
Ashish SHUKLA
43f1a2e59f
got: 0.60 -> 0.64
2021-11-29 13:07:54 +05:30
github-actions[bot]
be67219326
Merge master into staging-next
2021-11-29 06:01:16 +00:00
Bobby Rong
d48b298cd0
Merge pull request #147755 from figsoda/update-glitter
...
glitter: 1.5.6 -> 1.5.7
2021-11-29 10:23:28 +08:00
figsoda
8153160acf
glitter: 1.5.6 -> 1.5.7
2021-11-28 14:24:16 -05:00
github-actions[bot]
017d32f216
Merge master into staging-next
2021-11-28 18:00:57 +00:00
Fabián Heredia Montiel
b9f6ee2e2f
pijul: 1.0.0-alpha.55 → 1.0.0-alpha.56
2021-11-28 11:15:22 -06:00
Maximilian Bosch
122321a5cd
Merge pull request #147564 from kira-bruneau/git-review
...
git-review: 2.1.0 → 2.2.0
2021-11-28 14:48:36 +01:00
github-actions[bot]
cfa04cbd2d
Merge staging-next into staging
2021-11-28 06:01:44 +00:00
github-actions[bot]
2534e1384b
Merge master into staging-next
2021-11-28 06:01:05 +00:00
zowoq
909df3fa25
delta: 0.10.1 -> 0.10.2
...
https://github.com/dandavison/delta/releases/tag/0.10.2
2021-11-28 08:08:14 +10:00
Mario Rodas
3b35310cdc
git-filter-repo: remove duplicated expression
2021-11-27 04:20:00 +00:00
Kira Bruneau
32f21eefab
git-review: 2.1.0 → 2.2.0
2021-11-26 22:39:40 -05:00
github-actions[bot]
e9e3023425
Merge staging-next into staging
2021-11-26 06:01:36 +00:00
github-actions[bot]
618b03f562
Merge master into staging-next
2021-11-26 06:01:01 +00:00
github-actions[bot]
defe3d1bbd
Merge staging-next into staging
2021-11-26 00:02:13 +00:00
github-actions[bot]
c39cd5f314
Merge master into staging-next
2021-11-26 00:01:38 +00:00
zowoq
4ea35c4c20
delta: 0.10.0 -> 0.10.1
...
https://github.com/dandavison/delta/releases/tag/0.10.1
2021-11-26 09:28:31 +10:00
Michael Weiss
70183927c3
Merge pull request #147293 from primeos/git
...
git: 2.34.0 -> 2.34.1
2021-11-25 23:39:01 +01:00
Kerstin Humm
86b2661837
guitone: remove package
...
Guitone isn't used in Nixpkgs anywhere. It hasn't seen a release in 11 years
(6a09974e0f
) and is unmaintained in
Nixpkgs. Also it's the sole remaining user of graphviz_2_32, which
should be removed as well.
2021-11-25 20:10:34 +01:00
github-actions[bot]
fa1a61b8a2
Merge master into staging-next
2021-11-25 06:01:06 +00:00
Bobby Rong
f5f9557cb4
Merge pull request #147313 from SuperSandro2000/delta
...
delta: add SuperSandro2000 as maintainer
2021-11-25 09:51:22 +08:00
github-actions[bot]
b244d0edca
Merge master into staging-next
2021-11-25 00:01:54 +00:00
Sandro
31b46dd7f9
delta: add SuperSandro2000 as maintainer
2021-11-25 00:28:48 +01:00
Sandro Jäckel
122b0e0602
delta: 0.9.2 -> 0.10.0
2021-11-24 23:45:17 +01:00
Michael Weiss
2d05c5dcf2
git: 2.34.0 -> 2.34.1
2021-11-24 21:03:54 +01:00
pacien
ff98d0e50e
mercurial: enable check phase
2021-11-23 15:06:32 +01:00
pacien
f50b6821dc
mercurial: patch shebangs in all scripts
2021-11-23 15:06:32 +01:00
pacien
7a5371683c
mercurial: 5.9.3 -> 6.0
2021-11-23 15:06:32 +01:00
Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
...
Conflicts:
nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
github-actions[bot]
9e1911e222
Merge master into staging-next
2021-11-22 12:01:27 +00:00
figsoda
b0221e0651
glitter: 1.5.5 -> 1.5.6
2021-11-21 19:35:21 -05:00
Ryan Horiguchi
4c053bd1f8
gitkraken: 8.1.0 -> 8.1.1
2021-11-20 13:51:31 +01:00
github-actions[bot]
580f371380
Merge staging-next into staging
2021-11-20 00:01:57 +00:00
github-actions[bot]
7495684853
Merge master into staging-next
2021-11-20 00:01:21 +00:00
arkivm
18e1ae0d99
bcompare: add darwin support ( #141413 )
...
Co-authored-by: Paweł Kruszewski <kruszewsky@gmail.com>
2021-11-19 23:50:53 +01:00
github-actions[bot]
e9cc89e77e
Merge staging-next into staging
2021-11-19 18:01:56 +00:00
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Sandro
b95292072f
Merge pull request #144241 from Stunkymonkey/applications-github-1
2021-11-19 17:09:37 +01:00
github-actions[bot]
209ab42b96
Merge staging-next into staging
2021-11-17 06:02:04 +00:00
github-actions[bot]
f8cf67790e
Merge master into staging-next
2021-11-17 06:01:28 +00:00
figsoda
6ad04bcb7d
Merge pull request #146243 from figsoda/treewide-rust-feature
...
treewide: use buildFeatures and checkFeatures for rust packages
2021-11-16 21:00:48 -05:00
github-actions[bot]
cb0f62dda2
Merge staging-next into staging
2021-11-17 00:02:26 +00:00
github-actions[bot]
90829d83e5
Merge master into staging-next
2021-11-17 00:01:49 +00:00
Michael Weiss
61127682ff
Merge pull request #146188 from primeos/git
...
git: 2.33.1 -> 2.34.0
2021-11-16 22:11:34 +01:00
Martin Weinelt
2cc5606c84
Merge pull request #142319 from mweinelt/node2nix
2021-11-16 19:46:17 +01:00
Martin Weinelt
6c2f6a21ed
commitizen: 4.2.1 -> 4.2.4
2021-11-16 16:08:23 +01:00
Martin Weinelt
37fa1e7c1d
treewide: pass and inherit writeShellScript in node2nix packages
2021-11-16 16:08:23 +01:00
figsoda
94e7e21452
lucky-commit: use buildNoDefaultFeatures
2021-11-16 08:34:11 -05:00
figsoda
eb97241d7c
pijul: use buildFeatures
2021-11-16 08:11:45 -05:00
github-actions[bot]
617d1d1f17
Merge staging-next into staging
2021-11-16 12:02:01 +00:00
Sandro
84c4d0ce87
Merge pull request #142010 from wahjava/fossil-update
2021-11-16 12:48:46 +01:00
Michael Weiss
6e78c9331e
git: 2.33.1 -> 2.34.0
2021-11-15 23:00:11 +01:00
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
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