github-actions[bot]
a9f286f5cf
Merge master into staging-next
2021-06-03 19:52:02 +00:00
Otavio Salvador
8f166b95c9
gitRepo: Add import to ssl module to avoid runtime error ( #125373 )
...
Co-authored-by: Ricardo M. Correia <rcorreia@wizy.org>
2021-06-03 16:24:19 +02:00
github-actions[bot]
1fe3553272
Merge master into staging-next
2021-06-03 02:08:32 +00:00
Milan
2a1c29ef4b
gitlab: 13.12.0 -> 13.12.2 ( #125271 )
...
https://about.gitlab.com/releases/2021/06/01/security-release-gitlab-13-12-2-released/
2021-06-03 00:53:34 +02:00
github-actions[bot]
59de269a92
Merge master into staging-next
2021-05-30 12:49:08 +00:00
github-actions[bot]
c33da551bf
Merge master into staging-next
2021-05-30 07:13:26 +00:00
Antonio Yang
a8daff8b1a
gitui: 0.15.0 -> 0.16.0
2021-05-30 12:41:00 +08:00
Sandro
fa014484b8
Merge pull request #122854 from dguibert/dg/reposurgeon
...
reposurgeon: 3.44 -> 4.26
2021-05-30 04:28:40 +02:00
Otavio Salvador
e00e031ce1
gitRepo: 2.14.5 -> 2.15.3 ( #124904 )
2021-05-30 04:16:10 +02:00
github-actions[bot]
4cfefea5b2
Merge master into staging-next
2021-05-29 01:43:58 +00:00
Mario Rodas
4052d0eceb
gitAndTools.delta: 0.7.1 -> 0.8.0
...
https://github.com/dandavison/delta/releases/tag/0.8.0
2021-05-28 04:20:00 +00:00
github-actions[bot]
a743ebe846
Merge master into staging-next
2021-05-27 18:58:59 +00:00
Sandro
ee74a87392
Merge pull request #124591 from SuperSandro2000/diff-so-fancy
...
diff-so-fancy: 1.4.0 -> 1.4.1
2021-05-27 19:39:19 +02:00
Sandro Jäckel
15eb917faf
diff-so-fancy: 1.4.0 -> 1.4.1
2021-05-27 17:04:19 +02:00
github-actions[bot]
15e595f77d
Merge master into staging-next
2021-05-27 12:40:14 +00:00
Domen Kožar
a48d4bf159
Merge pull request #124569 from thefloweringash/subversion-as
...
subversion: update libtool to fix build on aarch64-darwin
2021-05-27 09:09:13 +02:00
github-actions[bot]
f385b431a7
Merge master into staging-next
2021-05-27 06:45:59 +00:00
Andrew Childs
364e6e634b
subversion: update libtool to fix build on aarch64-darwin
2021-05-27 14:01:54 +09:00
Victor Luft
b32f22110c
sublime-merge: 2047 -> 2056
2021-05-26 21:34:01 -04:00
Victor Luft
f45e3e9075
sublime-merge-dev: 2047 -> 2055
2021-05-26 21:33:50 -04:00
github-actions[bot]
df4ebfc46c
Merge master into staging-next
2021-05-26 12:31:55 +00:00
Profpatsch
005702524a
git-vendor: init at 1.2.0
2021-05-26 11:36:30 +02:00
github-actions[bot]
a673990e6c
Merge master into staging-next
2021-05-25 18:43:22 +00:00
Ryan Mulligan
1ea4f723c7
Merge pull request #124039 from r-ryantm/auto-update/gitkraken
...
gitkraken: 7.6.0 -> 7.6.1
2021-05-25 11:23:15 -07:00
github-actions[bot]
73d840c309
Merge master into staging-next
2021-05-25 12:29:42 +00:00
Florian Klink
901d07152c
Merge pull request #124292 from petabyteboy/feature/gitlab-13-12
...
gitlab: 13.11.2 -> 13.12.0
2021-05-25 11:45:02 +02:00
github-actions[bot]
0615bb674f
Merge master into staging-next
2021-05-25 00:59:01 +00:00
Josh Holland
6ce887b083
stgit: enable tests and install documentation ( #122370 )
2021-05-25 02:01:03 +02:00
David Guibert
374ce1b1af
reposurgeon: 3.44 -> 4.26
2021-05-24 22:37:08 +02:00
Milan Pässler
1ded8ef44e
gitlab: 13.11.2 -> 13.12.0
2021-05-24 21:33:56 +02:00
Milan Pässler
0c8f5b7b44
gitlab: add Gemfile fix to update script
...
Since some GitLab versions, we need to remove the mail-smtp-pool
dependency from the Gemfile, or do other modifications.
Let's add those changes, that will probably be needed in the next
version as well, to the update script.
2021-05-24 21:26:08 +02:00
Jonathan Ringer
b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next
2021-05-22 19:23:14 -07:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
R. RyanTM
f212ed0cf4
gitkraken: 7.6.0 -> 7.6.1
2021-05-22 15:43:27 +00:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau ( #124035 )
2021-05-22 16:47:40 +02:00
github-actions[bot]
d0c1f6a78f
Merge staging-next into staging
2021-05-22 12:27:12 +00:00
github-actions[bot]
563389a7fd
Merge master into staging-next
2021-05-22 12:27:09 +00:00
Sandro
efee454783
Merge pull request #123981 from r-ryantm/auto-update/lab
...
lab: 0.21.0 -> 0.22.0
2021-05-22 09:16:50 +02:00
R. RyanTM
04cb517e7d
lab: 0.21.0 -> 0.22.0
2021-05-22 06:36:22 +00:00
github-actions[bot]
d5714df652
Merge staging-next into staging
2021-05-22 06:21:58 +00:00
github-actions[bot]
cc35c7fc85
Merge master into staging-next
2021-05-22 06:21:55 +00:00
R. RyanTM
4d46cb67ad
gh: 1.10.2 -> 1.10.3
2021-05-22 15:56:25 +10:00
Andrew Brooks
12315866d1
fossil: Remove unneeded TCLLIBPATH export
...
The use of tcl.mkTclDerivation in tcllib ensures that it will
already be present on TCLLIBPATH when tests are run.
2021-05-21 15:18:10 -05:00
Arnout Engelen
17ccfe3f51
Merge pull request #123502 from Atemu/minimalIso-remove-ruby2.7
...
minimalIso: remove ruby2.7
2021-05-21 18:41:02 +02:00
github-actions[bot]
929b12e7b5
Merge master into staging-next
2021-05-21 12:28:43 +00:00
Michael Weiss
d3ad6d42ca
Merge pull request #123713 from Mindavi/git/cross-compilation
...
git: support cross-compilation by disabling perl support
2021-05-21 12:50:47 +02:00
Atemu
88c2c543bf
Revert "git: Use asciidoctor instead of asciidoc for manpages"
...
This reverts commit bbf96d898bhttps://github.com/NixOS/nixpkgs/pull/123502 for more info
2021-05-21 09:50:48 +02:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
R. RyanTM
2bab7f632d
gh: 1.10.1 -> 1.10.2
2021-05-20 18:31:56 +10:00
Rick van Schijndel
7dda632e2b
git: support cross-compilation by disabling perl support
2021-05-19 20:35:30 +02:00
