4721 Commits

Author	SHA1	Message	Date
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