Commit graph

4131 commits

Author SHA1 Message Date
github-actions[bot] c99b6f5343
Merge master into staging-next 2021-04-09 00:16:01 +00:00
talyz 7377a1dfa6
gitlab-shell: 13.15.1 -> 13.17.0
Only the version had been updated previously, not the hashes and
patches.
2021-04-09 00:36:32 +02:00
Maximilian Bosch 6da2f72f69
gitea: 1.13.6 -> 1.13.7
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.13.7
2021-04-09 00:17:29 +02:00
github-actions[bot] bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
Sandro 2471253714
Merge pull request #118739 from rhoriguchi/gitkraken
gitkraken: 7.5.3 -> 7.5.4
2021-04-08 11:29:14 +02:00
Milan Pässler 35aca2bada
gitlab: add back GITLAB_WORKHORSE_VERSION
9b30cda2f6 (r49247855)
2021-04-08 09:56:05 +02:00
github-actions[bot] 8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00
talyz 9b30cda2f6 gitlab: 13.9.4 -> 13.10.2 2021-04-07 23:23:24 +02:00
Ryan Horiguchi a9053b6870
gitkraken: 7.5.3 -> 7.5.4 2021-04-07 18:06:45 +02:00
github-actions[bot] 5e509a83ed
Merge master into staging-next 2021-04-07 00:15:14 +00:00
Aaron Andersen da527a0f1c
Merge pull request #117910 from aanderse/redmine
redmine: 4.1.2 -> 4.2.0
2021-04-06 19:35:06 -04:00
Jan Tojnar c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Stekke fd1173ee6a redmine: Update hg patch for redmine 4.2.0 2021-04-04 16:15:19 -04:00
Aaron Andersen 11cca39ea9 redmine: 4.1.2 -> 4.2.0 2021-04-04 16:14:05 -04:00
Sandro Jäckel 33a395f195
yacc: deprecate alias
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
github-actions[bot] 3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Frederik Rietdijk 5c8e424b84 gitstats: stay with python2 2021-04-03 17:06:07 +02:00
Frederik Rietdijk ea7d049f51 git-crecord: stay with python2 2021-04-03 17:06:07 +02:00
Frederik Rietdijk e5f9db3135 git-bz: stay with python2 2021-04-03 17:06:07 +02:00
github-actions[bot] 74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
zowoq 941cb99cf2 gh: 1.8.0 -> 1.8.1
https://github.com/cli/cli/releases/tag/v1.8.1
2021-04-03 06:10:35 +10:00
github-actions[bot] b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Sandro 5a41d751ae
Merge pull request #104919 from gravndal/git-annex-remote-googledrive 2021-04-02 17:28:35 +02:00
Gaute Ravndal e9f12cd9db git-annex-remote-googledrive: init at 1.3.0 2021-04-01 23:05:45 +02:00
github-actions[bot] 85e9b4acf4
Merge staging-next into staging 2021-04-01 12:06:32 +00:00
R. RyanTM 386b5cd123 bit: 1.0.5 -> 1.0.6 2021-04-01 05:33:55 +00:00
github-actions[bot] b152812791
Merge staging-next into staging 2021-04-01 00:15:44 +00:00
Sandro 0650638605
Merge pull request #118101 from LeSuisse/drop-subversion19
subversion19: drop
2021-03-31 21:23:43 +02:00
Thomas Gerbet 550e69b745 subversion19: drop
Subversion 1.9 is EoL [0] and is affected by CVE-2020-17525.

[0] https://subversion.apache.org/roadmap.html#release-planning
2021-03-31 08:38:03 +02:00
github-actions[bot] cb1554f24c
Merge staging-next into staging 2021-03-31 00:12:32 +00:00
github-actions[bot] 4ba71fb819
Merge master into staging-next 2021-03-31 00:12:29 +00:00
zowoq 7248f89da2 gh: 1.7.0 -> 1.8.0
https://github.com/cli/cli/releases/tag/v1.8.0
2021-03-31 06:04:56 +10:00
github-actions[bot] 2d211c7a3a
Merge staging-next into staging 2021-03-30 06:05:44 +00:00
github-actions[bot] ce7cdafed9
Merge master into staging-next 2021-03-30 06:05:42 +00:00
Mario Rodas 27a17ac2e4 gitAndTools.delta: 0.6.0 -> 0.7.1
https://github.com/dandavison/delta/releases/tag/0.7.1
2021-03-29 04:20:00 +00:00
github-actions[bot] f311dede4c
Merge staging-next into staging 2021-03-29 00:15:53 +00:00
github-actions[bot] d495e7527f
Merge master into staging-next 2021-03-29 00:15:48 +00:00
Thomas Gerbet 45cea67242 gitAndTools.git-bug: 0.7.1 -> 0.7.2
Fixes CVE-2021-28955.
2021-03-28 20:42:36 +02:00
github-actions[bot] cbd2c726fb
Merge staging-next into staging 2021-03-28 12:06:24 +00:00
github-actions[bot] 25268aeaf7
Merge master into staging-next 2021-03-28 12:06:21 +00:00
Fabian Affolter 158da5a4fa
Merge pull request #117773 from r-ryantm/auto-update/git-extras
git-extras: 6.1.0 -> 6.2.0
2021-03-28 11:31:44 +02:00
github-actions[bot] ea21c98571
Merge staging-next into staging 2021-03-28 06:05:34 +00:00
github-actions[bot] 3f2a4a9dea
Merge master into staging-next 2021-03-28 06:05:31 +00:00
Mario Rodas 2619c030ae
Merge pull request #117775 from r-ryantm/auto-update/git-lfs
git-lfs: 2.13.2 -> 2.13.3
2021-03-27 22:46:50 -05:00
github-actions[bot] 2ed7687b19
Merge staging-next into staging 2021-03-28 00:15:43 +00:00
github-actions[bot] 732dc6ef8f
Merge master into staging-next 2021-03-28 00:15:41 +00:00
Ryan Horiguchi 11b13209f3
gitkraken: 7.5.2 -> 7.5.3 2021-03-27 19:59:22 +01:00
Michael Weiss 1372aa414c
git: 2.31.0 -> 2.31.1 2021-03-27 13:44:34 +01:00
R. RyanTM b177e5ed99 git-lfs: 2.13.2 -> 2.13.3 2021-03-27 11:15:05 +00:00
R. RyanTM 415788b8d3 git-extras: 6.1.0 -> 6.2.0 2021-03-27 11:09:44 +00:00
github-actions[bot] 8cebf1dc19
Merge master into staging-next 2021-03-25 06:05:58 +00:00
kfollesdal 2dbe099c0d bumpver: 2020.1108 -> 2021.1110 2021-03-24 20:02:22 +01:00
github-actions[bot] 8e2d0e45c0
Merge master into staging-next 2021-03-24 18:10:39 +00:00
Sandro 58b1c47c77
Merge pull request #117423 from fabaff/bit 2021-03-24 18:47:53 +01:00
Git Machete Release Bot e485ab8ce5 gitAndTools.git-machete: 3.0.0 -> 3.1.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-24 14:50:19 +00:00
github-actions[bot] 380cb1e995
Merge master into staging-next 2021-03-24 12:11:57 +00:00
Fabian Affolter 0432eccae8 bit: init at 1.05 2021-03-24 01:05:55 +01:00
Trolli Schmittlauch b43933666f gitea: normalise derivation format using nixpkgs-fmt 2021-03-23 23:07:39 +01:00
Trolli Schmittlauch 6459ab51c8 gitea: 1.13.5 -> 1.13.6
- minor bugfix release including security fixes, see https://github.com/go-gitea/gitea/releases/tag/v1.13.6
2021-03-23 23:06:29 +01:00
github-actions[bot] 963842fb19
Merge master into staging-next 2021-03-23 12:27:46 +00:00
Maximilian Bosch ceed556f0b
Merge pull request #117150 from aanderse/gitea
gitea: 1.13.4 -> 1.13.5
2021-03-23 10:05:41 +01:00
github-actions[bot] 11ee0bf5d7
Merge master into staging-next 2021-03-23 00:40:24 +00:00
Sandro 0ee851c4be
Merge pull request #117149 from aanderse/redmine
redmine: 4.1.1 -> 4.1.2
2021-03-22 20:46:30 +01:00
Aaron Andersen b85e071b16 redmine: 4.1.1 -> 4.1.2 2021-03-21 18:41:49 -04:00
Aaron Andersen 2351157382 gitea: 1.13.4 -> 1.13.5 2021-03-21 18:39:02 -04:00
github-actions[bot] 933682b533
Merge master into staging-next 2021-03-20 18:19:30 +00:00
Ben Gamari 3df0d950d8
gitlab: 13.8.6 -> 13.9.4 (#116798) 2021-03-20 15:04:54 +01:00
github-actions[bot] 8c03075f07
Merge staging-next into staging 2021-03-19 00:41:08 +00:00
github-actions[bot] d73a492e83
Merge master into staging-next 2021-03-19 00:41:01 +00:00
Milan 324f46b31b
gitlab: 13.8.5 -> 13.8.6 (#116740)
https://about.gitlab.com/releases/2021/03/17/security-release-gitlab-13-9-4-released/
2021-03-19 00:56:29 +01:00
Jan Tojnar 2445e9a681
Merge branch 'master' into staging-next 2021-03-18 19:24:39 +01:00
Sandro 779428586c
Merge pull request #116535 from SuperSandro2000/fix-collection27 2021-03-18 13:43:53 +01:00
Jan Tojnar 0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Sandro Jäckel 03f8d64911
monotone-viz: remove old assert 2021-03-17 22:55:11 +01:00
R. RyanTM b5e9c378d4 lab: 0.20.0 -> 0.21.0 2021-03-17 14:10:13 +00:00
Michael Weiss 571ddf1ba5
git: 2.30.2 -> 2.31.0 (#116471) 2021-03-15 22:45:09 +01:00
github-actions[bot] 611019db38
Merge staging-next into staging 2021-03-15 18:16:53 +00:00
github-actions[bot] 4915d2cb4c
Merge master into staging-next 2021-03-15 18:16:46 +00:00
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
zowoq 8adc564f28 treewide: editorconfig fixes
- add final newline
- use spaces for indentation
2021-01-21 09:30:52 +10:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Sandro 7aef69e156
Merge pull request #109835 from r-ryantm/auto-update/glab
glab: 1.11.1 -> 1.13.1
2021-01-18 23:56:24 +01:00
Sandro 3c1286c49b
Merge pull request #109834 from r-ryantm/auto-update/gitflow
gitflow: 1.12.2 -> 1.12.3
2021-01-18 23:23:21 +01:00
Sandro ae73cf38c3
Merge pull request #109833 from r-ryantm/auto-update/git-workspace
git-workspace: 0.7.0 -> 0.8.0
2021-01-18 23:23:04 +01:00
R. RyanTM 750a287640 glab: 1.11.1 -> 1.13.1 2021-01-18 22:00:55 +00:00
R. RyanTM c43ab02c67 gitflow: 1.12.2 -> 1.12.3 2021-01-18 21:56:44 +00:00
R. RyanTM 90344c1b40 git-workspace: 0.7.0 -> 0.8.0 2021-01-18 21:37:14 +00:00
R. RyanTM 4e58963af8 git-ignore: 1.0.0 -> 1.1.1 2021-01-18 21:24:20 +00:00
Sandro 4ae325df93
Merge pull request #109569 from hartwork/update-git-big-picture
git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028)
2021-01-18 00:28:32 +01:00
Sebastian Pipping b706315dfc git-big-picture: 0.10.1 -> 1.0.0 (fixes CVE-2021-3028)
Also propagates move of repository from https://github.com/esc/git-big-picture
to https://github.com/git-big-picture/git-big-picture .

Upstream change log at
https://github.com/git-big-picture/git-big-picture#changelog
2021-01-17 23:58:42 +01:00
Albin Otterhäll 5b809848b4 pijul: 1.0.0-alpha.31 -> 1.0.0-alpha.35 2021-01-17 01:32:51 +01:00
Anderson Torres f0e757d98a
Merge pull request #108513 from languitar/patch-1
pass-git-helper: 1.1.0 -> 1.1.1
2021-01-16 16:27:01 -03:00
Ben Siraphob badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Johannes Wienke 15bbb7deec pass-git-helper: 1.1.0 -> 1.1.1
Bump package and add new test requirements.
2021-01-15 12:15:27 +01:00
Alyssa Ross 3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Mario Rodas 88710b0751 git-lfs: 2.13.1 -> 2.13.2
https://github.com/git-lfs/git-lfs/releases/tag/v2.13.2
2021-01-13 21:00:00 -05:00
Sandro 0238b200e7
Merge pull request #109130 from yoctocell/gita-0.11.9 2021-01-13 08:44:12 +01:00
Florian Klink c0a6ee2511 gerrit: 3.2.3 -> 3.3.1
Fixes https://github.com/NixOS/nixpkgs/issues/109167
Addresses CVE-2020-8919
Addresses CVE-2020-8920
2021-01-12 23:08:43 -08:00
yoctocell 0714396196
gitAndTools.gita: 0.10.10 -> 0.11.9 2021-01-12 19:59:55 +01:00
zeripath 0e0900cba5
gitea: add sqlite_unlock_notify build tag
Fix #109004

When building Gitea with sqlite support the sqlite_unlock_notify tag must also be added otherwise there will be frequent error reports of database is locked.
2021-01-11 18:09:14 +00:00
Profpatsch 4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00