Commit graph

4131 commits

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

Removes dependency on ruby 2.7 and isn't much slower.

See https://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
Jonathan Ringer c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
zowoq 3aaa5c80ab gh: 1.10.0 -> 1.10.1
https://github.com/cli/cli/releases/tag/v1.10.1
2021-05-19 22:30:28 +10:00
github-actions[bot] 7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
zowoq 255de2ca30 gh: 1.9.2 -> 1.10.0
https://github.com/cli/cli/releases/tag/v1.10.0
2021-05-19 08:30:29 +10:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
R. RyanTM 50fbc6b6b3 git-secret: 0.3.3 -> 0.4.0 2021-05-17 13:56:55 -07:00
R. RyanTM f7d1b76d33 glab: 1.16.0 -> 1.17.0 2021-05-17 10:55:23 -07:00
Sandro d1dbc93916
Merge pull request #123101 from romildo/upd.smartgithg
smartgithg: 19.1.1 -> 20.2.5
2021-05-17 18:26:02 +02:00
Jonathan Ringer c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Ryan Horiguchi 9541ad60e1 gitkraken: 7.5.5 -> 7.6.0 2021-05-17 16:15:58 +09:00
github-actions[bot] 3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Ben Siraphob c5a669d3f7 treewide: remove unzip where not needed 2021-05-16 19:29:28 -07:00
Sandro 700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
github-actions[bot] 6cdac75d25
Merge staging-next into staging 2021-05-16 18:32:44 +00:00
Anderson Torres cf45c45605
Merge pull request #121588 from eduardosm/sip-rename
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
R. RyanTM fd79304769 lefthook: 0.7.4 -> 0.7.5 2021-05-16 02:49:14 -04:00
github-actions[bot] 9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
Stéphan Kochen f00d022ebf git-workspace: fix darwin build 2021-05-15 16:27:23 -07:00
Stéphan Kochen 3b856174c3 gitoxide: fix darwin build 2021-05-15 21:42:38 +02:00
José Romildo 0c6dd4164a smartgithg: 19.1.1 -> 20.2.5 2021-05-15 09:11:53 -03:00
John Ericson cf02b24813 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-11 22:30:46 +00:00
Maximilian Bosch 3385397ca1
Merge pull request #122328 from Ma27/bump-gitea
gitea: 1.14.1 -> 1.14.2
2021-05-11 14:43:44 +02:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
Sandro f4d7c044db
Merge pull request #122411 from figsoda/gitoxide
gitoxide: 0.6.0 -> 0.7.0
2021-05-11 00:56:00 +02:00
Eduardo Sánchez Muñoz 08a26e4579 pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
2021-05-10 20:41:38 +02:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
figsoda ec990c9c23 gitoxide: 0.6.0 -> 0.7.0 2021-05-09 22:40:00 -04:00
Bruno Bigras e0e62c8804 git-repo: 2.13.1 -> 2.14.5 2021-05-09 17:34:52 +02:00
Maximilian Bosch f13efcf1d8
gitea: 1.14.1 -> 1.14.2
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.2
2021-05-09 13:31:50 +02:00
Michael Raskin 0bb11cb37b
Merge pull request #122251 from 7c6f434c/monotone-update
monotone: 1.1 -> 1.1-unstable-2021-05-01 to move from insecure botan 1
2021-05-09 10:03:37 +00:00
Michael Raskin ca365f6946 monotone: 1.1 -> 1.1-unstable-2021-05-01 to move from insecure botan 1 2021-05-09 11:18:20 +02:00
Léo Gaspard 45d1222d47 git: add link to related nixos test
It'd be better to have a git-only test, but in the meantime this is the
first available test I could find, and it's still better than nothing.
2021-05-08 21:40:56 +02:00
Jan Tojnar dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
Josh Holland 9622f8cad8 gitAndTools.stgit: 1.0 -> 1.1 2021-05-07 18:06:15 +01:00
Jan Tojnar 9468b07326
Merge branch 'gnome-40' 2021-05-07 12:12:40 +02:00
Mario Rodas 0d1d2c6510
Merge pull request #121363 from r-ryantm/auto-update/lefthook
lefthook: 0.7.3 -> 0.7.4
2021-05-05 22:27:56 -05:00
Jan Tojnar 7d535edec5
gnome3: support new versioning scheme in the update script
https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
2021-05-05 22:20:20 +02:00
maralorn 2fa19503b9
Merge pull request #121630 from xwvvvvwx/radicle-upstream-0.2.3
radicle-upstream: 0.1.11 -> 0.2.3
2021-05-05 10:09:38 +02:00
Thomas Bereknyei 77e969952e sourcehut: refactor 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 1b802ce414 sourcehut.coresrht: 0.65.2 -> 0.67.4 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 22c2b7a64d sourcehut.hgsrht: 0.26.19 -> 0.27.4 2021-05-04 20:05:22 -04:00
Thomas Bereknyei c4dda181cf sourcehut.scm: 0.22.4 -> 0.22.9 2021-05-04 20:05:22 -04:00
Thomas Bereknyei eec22cc44c sourcehut.hubsrht: 0.11.5 -> 0.13.1 2021-05-04 20:05:22 -04:00
Thomas Bereknyei a8dec0e5e0 sourcehut.gitsrht: 0.61.10 -> 0.72.8 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 9636d25a6c sourcehut.listssrht: 0.45.15 -> 0.48.19 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 350f4867c7 sourcehut.pastesrht: 0.11.2 -> 0.12.1 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 1dbd9b2476 sourcehut.dispatchsrht: 0.14.9 -> 0.15.8 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 14d65eaa3c sourcehut.metasrht: 0.51.2 -> 0.53.14 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 9b3a109c3e sourcehut.mansrht: 0.15.4 -> 0.15.12 2021-05-04 20:05:22 -04:00
Thomas Bereknyei fc5daae1fa sourcehut.todosrht: 0.62.1 -> 0.64.14 2021-05-04 20:05:22 -04:00
Thomas Bereknyei 1383d5574b sourcehut.buildsrht: 0.63.4 -> 0.66.7 2021-05-04 20:05:22 -04:00
Luke Granger-Brown 66c384e30c
Merge pull request #121611 from lukegb/mercurial
mercurial: 5.6 -> 5.8, oxidize
2021-05-04 14:11:36 +01:00
Luke Granger-Brown 35e57e81ae tortoisehg: fix build
tortoisehg intentionally wants to back-date the Mercurial build,
and some of the features we've added to the Mercurial build won't work
correctly under hg 5.6.
2021-05-04 10:24:00 +00:00
Luke Granger-Brown a715d90fb0 mercurial: add patches for Rust status implementation
These fix https://bz.mercurial-scm.org/show_bug.cgi?id=6514, which
breaks haskellPackages.retrie when run with the Rust status
implementation.
2021-05-04 09:54:16 +00:00