Commit graph

3953 commits

Author SHA1 Message Date
Antonio Yang 674c39c08f gitui: 0.12.0 -> 0.13.0 2021-03-15 23:24:24 +08:00
github-actions[bot] 6f1d8a6a11
Merge staging-next into staging 2021-03-15 12:25:49 +00:00
github-actions[bot] dec95bae4a
Merge master into staging-next 2021-03-15 12:25:41 +00:00
R. RyanTM 5a3feadb55 ghorg: 1.5.0 -> 1.5.1 2021-03-15 03:24:32 -04:00
github-actions[bot] 2c7bf48e77
Merge staging-next into staging 2021-03-14 06:17:35 +00:00
github-actions[bot] 3b97019142
Merge master into staging-next 2021-03-14 06:17:28 +00:00
R. RyanTM d8a96e2f8f glab: 1.15.0 -> 1.16.0 2021-03-14 00:39:34 -05:00
Sandro 54395344a8
git: disable flaky test (#115847)
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
2021-03-11 10:22:05 +01:00
github-actions[bot] ba1fa5847e
Merge staging-next into staging 2021-03-10 12:21:31 +00:00
github-actions[bot] aea4725648
Merge master into staging-next 2021-03-10 12:21:24 +00:00
Milan 86ee8dd8ff
gitlab: 13.8.4 -> 13.8.5 (#115393)
https://about.gitlab.com/releases/2021/03/04/security-release-gitlab-13-9-2-released/
2021-03-10 12:42:58 +01:00
github-actions[bot] ae64aaa5c0
Merge staging-next into staging 2021-03-10 00:39:15 +00:00
github-actions[bot] 149a81c88d
Merge master into staging-next 2021-03-10 00:39:07 +00:00
Michael Weiss 4990d3c5f8
git: 2.30.1 -> 2.30.2 (CVE-2021-21300)
Links for the security issue:
- https://lore.kernel.org/git/xmqqim6019yd.fsf@gitster.c.googlers.com/
- https://github.com/git/git/security/advisories/GHSA-8prw-h3cq-mghm
- https://github.blog/2021-03-09-git-clone-vulnerability-announced/

For some reason meta.changelog was using ${version} instead of
v${version} for the tag name. This is fixed now.
2021-03-09 20:16:18 +01:00
R. RyanTM 8833988d2c subgit: 3.3.10 -> 3.3.11 2021-03-09 18:52:10 +00:00
Frederik Rietdijk 277d488026 Merge staging into staging-next 2021-03-08 19:20:18 +01:00
Maximilian Bosch 49777a7430
gitea: 1.13.3 -> 1.13.4
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.4
2021-03-07 19:15:32 +01:00
Maximilian Bosch 155a946c37
gitAndTools.tig: 2.5.2 -> 2.5.3
ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.3
2021-03-07 19:15:32 +01:00
Sandro 8f2d0508b8
Merge pull request #114923 from rhoriguchi/gitkraken
gitkraken: 7.5.1 -> 7.5.2
2021-03-07 18:29:49 +01:00
Jan Tojnar 1465e8e397
Merge branch 'staging-next' into staging 2021-03-06 19:56:45 +01:00
Git Machete Release Bot 5396fa3fcb gitAndTools.git-machete: 2.16.1 -> 3.0.0
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2021-03-06 14:23:51 +00:00
github-actions[bot] 4af94cf9a3
Merge staging-next into staging 2021-03-05 12:20:56 +00:00
Antonio Yang 6244b0c175 gitui: 0.11.0 -> 0.12.0 2021-03-05 12:55:47 +01:00
Jan Tojnar 6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
zowoq 677af53363 gh: 1.6.2 -> 1.7.0
https://github.com/cli/cli/releases/tag/v1.7.0
2021-03-05 06:04:46 +10:00
Maximilian Bosch 9a02192dc5
gitea: 1.13.2 -> 1.13.3
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.3
2021-03-04 18:54:38 +01:00
Sandro f40698351e
Merge pull request #114959 from dywedir/pijul
pijul: 1.0.0-alpha.38 -> 1.0.0-alpha.46
2021-03-03 14:56:06 +01:00
Michael Weiss d774b4234a
[needs new maintainer] gitRepo: Remove myself as maintainer (#114835)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-03 13:44:26 +01:00
Vladyslav M e2f5dca46a
pijul: 1.0.0-alpha.38 -> 1.0.0-alpha.46 2021-03-03 09:59:06 +02:00
Ryan Horiguchi e42c19ff38
gitkraken: 7.5.1 -> 7.5.2 2021-03-03 00:58:58 +01:00
github-actions[bot] e668a36492
Merge staging-next into staging 2021-03-02 12:17:32 +00:00
Michael Weiss a676907ae3
gitRepo: 2.12.2 -> 2.13.1 2021-03-02 13:04:06 +01:00
Jan Tojnar 913394a1d9
Merge branch 'staging-next' into staging 2021-03-01 19:30:56 +01:00
Kim Lindberger e72375464b
Merge pull request #113635 from talyz/gitlab-improvements
nixos/gitlab: Clean config dir, switch to puma, split PreStart script and more
2021-03-01 13:37:53 +01:00
Fabian Affolter 7c2369f9d0
Merge pull request #114656 from r-ryantm/auto-update/ghq
ghq: 1.1.6 -> 1.1.7
2021-02-28 19:50:44 +01:00
David Terry 9378695d38
radicle-upstream: 0.1.6 -> 0.1.11 2021-02-28 18:44:49 +01:00
R. RyanTM 2d8ef6c514 ghq: 1.1.6 -> 1.1.7 2021-02-28 12:54:28 +00:00
github-actions[bot] cb8e6774de
Merge staging-next into staging 2021-02-28 06:18:00 +00:00
R. RyanTM 60031a1e95 gitkraken: 7.5.0 -> 7.5.1 2021-02-27 20:53:41 -05:00
github-actions[bot] e8162c62e3
Merge staging-next into staging 2021-02-27 00:37:54 +00:00
Sandro a171d0b765
Merge pull request #114379 from victorluft/submergeupg 2021-02-26 20:35:37 +01:00
Robert Schütz 54757b35c1 Merge branch 'staging-next' into staging 2021-02-26 10:56:17 +01:00
Frederik Rietdijk c456a2512f Merge master into staging-next 2021-02-26 10:25:13 +01:00
Fabian Affolter 182d39612b
Merge pull request #114337 from r-ryantm/auto-update/ghq
ghq: 1.1.5 -> 1.1.6
2021-02-25 20:43:54 +01:00
Victor Luft 298113eaf7 sublime-merge: 2039 -> 2047 2021-02-25 12:36:39 -05:00
Victor Luft 407a992fd6 sublime-merge-dev: 2037 -> 2046 2021-02-25 12:36:38 -05:00
Jan Tojnar f02fc10d0d
meld: fix icon loader 2021-02-25 11:49:47 +01:00
R. RyanTM d39556b88d ghq: 1.1.5 -> 1.1.6 2021-02-25 10:07:02 +00:00
talyz f8ab43ef7b
nixos/gitlab: Switch from unicorn to puma
Puma is the new upstream default server since GitLab 13.
2021-02-24 18:31:30 +01:00
Sandro 0e1eb8650f
Merge pull request #114139 from SuperSandro2000/lab
lab: 0.19.0 -> 0.20.0, add SuperSandro2000 as maintainer
2021-02-23 22:47:29 +01:00
Sandro Jäckel 3c1787c2cb
lab: 0.19.0 -> 0.20.0, add SuperSandro2000 as maintainer 2021-02-23 17:16:18 +01:00
zowoq ddfcdc5d49 gh: 1.6.1 -> 1.6.2
https://github.com/cli/cli/releases/tag/v1.6.2
2021-02-23 21:20:30 +10:00
github-actions[bot] 54795a5689
Merge staging-next into staging 2021-02-21 12:19:46 +00:00
github-actions[bot] cf22d5fee7
Merge master into staging-next 2021-02-21 12:19:43 +00:00
R. RyanTM 2f8425c867 git-cola: 3.8 -> 3.9 2021-02-20 21:40:00 +00:00
Ben Siraphob 127733211e
treewide: unzip buildInputs to nativeBuildInputs (#112302) 2021-02-20 16:01:53 -05:00
github-actions[bot] daab056dd9
Merge staging-next into staging 2021-02-19 18:16:58 +00:00
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
R. RyanTM 4f88373ed5
gerrit: 3.3.1 -> 3.3.2 (#113671) 2021-02-19 17:10:59 +01:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Sandro 4b694d5e3d
Merge pull request #113674 from SuperSandro2000/fix-collection16 2021-02-19 13:27:03 +01:00
zowoq 3dab057264 Merge staging-next into staging 2021-02-19 10:47:46 +10:00
Sandro Jäckel 3de228aefd
git: remove unused input 2021-02-18 22:25:20 +01:00
zowoq a5948fe664 gh: 1.6.0 -> 1.6.1
https://github.com/cli/cli/releases/tag/v1.6.1
2021-02-19 07:19:00 +10:00
github-actions[bot] 683536ab2a
Merge master into staging-next 2021-02-18 00:40:58 +00:00
zowoq a7251011a6 gh: 1.5.0 -> 1.6.0
https://github.com/cli/cli/releases/tag/v1.6.0
2021-02-18 08:05:06 +10:00
Milan bd4b22a87a
gitlab: 13.7.4 -> 13.8.4 (#112836) 2021-02-17 22:55:14 +01:00
github-actions[bot] cd9df16806
Merge staging-next into staging 2021-02-17 06:14:55 +00:00
github-actions[bot] 3ed237717a
Merge master into staging-next 2021-02-17 06:14:47 +00:00
Sandro 0d44c7989c
Merge pull request #113265 from SuperSandro2000/fix-collection13 2021-02-17 03:14:49 +01:00
github-actions[bot] 063e642108
Merge staging-next into staging 2021-02-16 12:20:07 +00:00
github-actions[bot] b31a0f36f8
Merge master into staging-next 2021-02-16 12:20:04 +00:00
R. RyanTM 8419085032
glab: 1.14.0 -> 1.15.0 (#113267) 2021-02-15 23:17:44 -08:00
Sandro Jäckel b33fe92b81
sourcehut: remove unused inputs 2021-02-16 03:59:55 +01:00
github-actions[bot] 018f748b81
Merge staging-next into staging 2021-02-15 00:37:07 +00:00
github-actions[bot] 0630986bf7
Merge master into staging-next 2021-02-15 00:37:03 +00:00
Ryan Burns 910e396d82 git-hub: 1.1.0 -> 2.1.0
Package is python3-only as of v2.0.0
2021-02-14 14:09:44 -08:00
Andreas Schmid b5a137b2a0
git: add osxkeychainSupport option (#112503)
in order to be able to disable osxkeychain credential helper if no
wanted / necessary. Keep it `true` by default such that current logic is
not affected.

Signed-off-by: Andreas Schmid <service@aaschmid.de>
2021-02-13 14:02:17 +01:00
github-actions[bot] c4d734932d
Merge staging-next into staging 2021-02-13 00:36:15 +00:00
github-actions[bot] 1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Maximilian Bosch 6964689aff
gitAndTools.tig: 2.5.1 -> 2.5.2
ChangeLog: https://github.com/jonas/tig/releases/tag/tig-2.5.2
2021-02-12 22:23:44 +01:00
Sandro ecf06378f7
Merge pull request #112855 from SuperSandro2000/fix-collection10 2021-02-12 21:16:00 +01:00
Sandro Jäckel ac6988b577
git-extras: use fetchFromGitHub 2021-02-12 20:35:38 +01:00
Sandro Jäckel d32b77bacc
git-delete-merged-branches: update license 2021-02-12 20:35:38 +01:00
Sandro Jäckel f787a71451
tig: cleanup 2021-02-12 20:35:37 +01:00
github-actions[bot] 53c1035b44
Merge staging-next into staging 2021-02-12 12:20:24 +00:00
github-actions[bot] 15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
Michael Weiss b4f2376434
gitRepo: 2.12.1 -> 2.12.2 2021-02-12 12:38:33 +01:00
github-actions[bot] ae07bf1352
Merge staging-next into staging 2021-02-12 00:36:23 +00:00
github-actions[bot] 344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
Maximilian Bosch a6d8a4c65a
Merge pull request #112784 from r-ryantm/auto-update/diff-so-fancy
diff-so-fancy: 1.3.0 -> 1.4.0
2021-02-11 20:29:06 +01:00
Michael Weiss c9858b6d88
gitRepo: 2.12 -> 2.12.1 2021-02-11 19:27:32 +01:00
R. RyanTM 67ff7413eb diff-so-fancy: 1.3.0 -> 1.4.0 2021-02-11 15:00:28 +00:00
github-actions[bot] 8df773cc54
Merge staging-next into staging 2021-02-11 00:36:13 +00:00
github-actions[bot] 5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Guillaume Girol 26f6af373e
Merge pull request #112329 from alyssais/git-cinnabar
git-cinnabar: 0.5.4 -> 0.5.6
2021-02-10 20:15:44 +00:00
Michael Weiss 8132d63bc5
git: 2.30.0 -> 2.30.1 (#112581) 2021-02-10 11:39:09 +01:00
github-actions[bot] 30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Alyssa Ross 6c4d3aa6f7
git-cinnabar: 0.5.4 -> 0.5.6
Also add missing installPhase hooks, and clarify license.
I'm assuming GPL-2.0-only, because it doesn't seem to be specified, and
the helper links with git, which is -only.
2021-02-07 21:35:46 +00:00
R. RyanTM 2d12b884ef thicket: 0.1.3 -> 0.1.4 2021-02-06 21:59:42 +00:00
github-actions[bot] 77db03ceac
Merge master into staging-next 2021-02-06 12:19:10 +00:00
R. RyanTM c8e7fd0fb3 delta: 0.5.1 -> 0.6.0 2021-02-06 10:08:19 +00:00
github-actions[bot] fadee272e0
Merge staging-next into staging 2021-02-06 00:35:48 +00:00
Sandro Jäckel ba18acfe78
git-interactive-rebase-tool: Add SuperSandro2000 as maintainer 2021-02-05 21:21:06 +01:00
github-actions[bot] bd1a0c9702
Merge staging-next into staging 2021-02-05 12:19:39 +00:00
Sandro a618b4847d
Merge pull request #111647 from NixOS/girt-2.0.0
gitAndTools.git-interactive-rebase-tool: 1.2.1 -> 2.0.0
2021-02-05 11:57:14 +01:00
Sandro Jäckel c4f417b6c2
gitAndTools.git-interactive-rebase-tool: 1.2.1 -> 2.0.0 2021-02-05 11:42:11 +01:00
Jan Tojnar 75153ede17
Merge branch 'staging-next' into staging 2021-02-02 19:46:31 +01:00
Sandro Jäckel e08919c891
legit: Disable tests 2021-02-02 14:46:08 +01:00
github-actions[bot] 1d1ce08e2b
Merge staging-next into staging 2021-02-02 12:24:27 +00:00
Maximilian Bosch 0eac65888f
gitea: 1.13.1 -> 1.13.2
https://github.com/go-gitea/gitea/releases/tag/v1.13.2
2021-02-02 09:40:42 +01:00
github-actions[bot] 4c1eae9176
Merge staging-next into staging 2021-02-02 00:42:42 +00:00
github-actions[bot] 7044cd0c9d
Merge staging-next into staging 2021-02-01 18:31:04 +00:00
Albin Otterhäll a10fade7e4 pijul: 1.0.0-alpha.37 -> 1.0.0-alpha.38 2021-02-01 18:01:54 +01:00
Jan Tojnar 54f4529aec
Merge pull request #111519 from siraben/xdg-utils-naming 2021-02-01 17:18:57 +01:00
Markus Kowalewski 147bc60225
qgit: fix license 2021-02-01 13:30:17 +01:00
Ben Siraphob a6ac3eedbd treewide: xdg_utils -> xdg-utils 2021-02-01 15:05:09 +07:00
github-actions[bot] f92395cf3c
Merge staging-next into staging 2021-01-31 06:19:43 +00:00
github-actions[bot] 81337921f5
Merge staging-next into staging 2021-01-31 00:46:33 +00:00
Sebastian Pipping 201b24adc5 git-big-picture: 1.0.0 -> 1.1.1
- Migrate from fetchFromGitHub to fetchPypi to ease SHA256 handling
- Drop tests (while not included with PyPI releases)
- Install a man page (as shipped by upstream)
- Move buildInputs to runtime only

Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
2021-01-31 00:14:30 +01:00
Mario Rodas 5be9ec41a3
Merge pull request #111192 from r-ryantm/auto-update/git-remote-gcrypt
git-remote-gcrypt: 1.3 -> 1.4
2021-01-30 15:36:45 -05:00
Mario Rodas f72a44d6f5
Merge pull request #111210 from r-ryantm/auto-update/fossil
fossil: 2.13 -> 2.14
2021-01-30 15:35:44 -05:00
github-actions[bot] e788d512e8
Merge staging-next into staging 2021-01-30 00:44:04 +00:00
R. RyanTM ebe677c84f fossil: 2.13 -> 2.14 2021-01-29 22:04:15 +00:00
Jeff Slight e2c0897eba
gitlab: 13.7.1 -> 13.7.4 (#108720) 2021-01-29 21:13:59 +01:00
R. RyanTM 347820365f git-remote-gcrypt: 1.3 -> 1.4 2021-01-29 19:02:06 +00:00
github-actions[bot] 4c82d7eb24
Merge staging-next into staging 2021-01-29 06:19:21 +00:00
R. RyanTM 1b2cd14dd7 glab: 1.13.1 -> 1.14.0 2021-01-29 03:02:05 +00:00
github-actions[bot] 798f7b136c
Merge staging-next into staging 2021-01-28 18:30:08 +00:00
Travis CI a49a608632 gitAndTools.git-machete: 2.15.9 -> 2.16.1
###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @blitz @Ma27 @tfc @worldofpeace
2021-01-28 15:03:41 +00:00
github-actions[bot] 06efb52369
Merge staging-next into staging 2021-01-27 18:28:34 +00:00
Ben Siraphob 82454e9df8 treewide: remove implicit use of stdenv.lib 2021-01-27 20:04:57 +07:00
Thomas Tuegel 0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Thomas Tuegel 5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
zowoq a7dda29d8a Revert "gh: enable tests"
This reverts commit c7deb49058.

Fails with sandboxing.
2021-01-26 07:26:59 +10:00
Pavol Rusnak a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Sandro 3cd31450a1
Revert "nodePackages: regenerate with node2nix 1.9.0" 2021-01-25 11:31:27 +01:00
Sander van der Burg 40f27ff2be
Merge pull request #110545 from svanderburg/node2nix-update
nodePackages: regenerate with node2nix 1.9.0
2021-01-25 09:13:59 +01:00
dadada dc8231950c gitea: add passthru.tests
Reference nixos tests to execute on package upgrades.
2021-01-24 08:50:59 +01:00
Mario Rodas f90209acd1 gitAndTools.lab: 0.18.0 -> 0.19.0
https://github.com/zaquestion/lab/releases/tag/v0.19.0
2021-01-24 04:20:00 +00:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ryan Horiguchi 95f8678091
gitkraken: 7.4.1 -> 7.5.0 (#110561) 2021-01-24 01:11:22 +01:00
Sander van der Burg 3e385dc285 nodePackages: regenerate with node2nix 1.9.0 2021-01-22 22:42:58 +01:00
Drew Risinger c7deb49058 gh: enable tests 2021-01-23 00:48:39 +10:00
Michael Weiss 62b5e51019
gitRepo: 2.11.1 -> 2.12 2021-01-22 12:34:36 +01:00
Sandro d8d2ec148b
Merge pull request #110411 from a12l/update-pijul
pijul: 1.0.0-alpha.35 -> 1.0.0-alpha.37
2021-01-22 09:35:49 +01:00
Albin Otterhäll 62015c03b6 pijul: 1.0.0-alpha.35 -> 1.0.0-alpha.37 2021-01-22 00:25:49 +01:00
zowoq 59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
zowoq c06d37b803 gh: 1.4.0 -> 1.5.0
https://github.com/cli/cli/releases/tag/v1.5.0
2021-01-22 06:06:25 +10:00
R. RyanTM 8540ac06e9
ghorg: 1.4.0 -> 1.5.0 (#109824) 2021-01-21 10:07:01 -08:00