Commit graph

4249 commits

Author SHA1 Message Date
Sandro bc947a686c
Merge pull request #130052 from DeeUnderscore/git-cola-no-double-wrap 2021-07-13 23:44:44 +02:00
Sandro Jäckel b3f974ee08
delta: 0.8.2 -> 0.8.3 2021-07-13 22:38:27 +02:00
Fabián Heredia Montiel 4a30039b27 pijul: 1.0.0-alpha.50 → 1.0.0-alpha.52 2021-07-13 11:14:54 -05:00
R. RyanTM 9e18ae4302 git-vendor: 1.2.1 -> 1.2.2 2021-07-13 12:00:56 +02:00
Florian Klink 66f419c4b1
Merge pull request #129734 from yu-re-ka/feature/gitlab-14-0-5
gitlab: 14.0.2 -> 14.0.5
2021-07-13 01:04:54 +02:00
D Anzorge e3e3baf498 git-cola: avoid double wrapping 2021-07-12 23:10:48 +02:00
Yureka 6510a13611 gitlab: 14.0.2 -> 14.0.5
https://about.gitlab.com/releases/2021/07/06/gitlab-14-0-3-released/
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/
https://about.gitlab.com/releases/2021/07/08/gitlab-14-0-5-released/
2021-07-12 14:18:15 +02:00
R. RyanTM ad28b7f106 git-cola: 3.9 -> 3.10.1 2021-07-12 03:48:36 +00:00
R. RyanTM da1dde42fb gitui: 0.16.1 -> 0.16.2 2021-07-10 22:26:39 +00:00
Artturin d8a87e89e7 switch mercurial_4 and tortoisehg to pname 2021-07-07 23:46:31 +03:00
Maximilian Bosch 6dfc26e6f6 gitea: 1.14.3 -> 1.14.4
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.4
2021-07-07 12:18:01 +09:00
Yuka 3f18b72c1e
gitlab: 14.0.1 -> 14.0.2 (#128963)
https://about.gitlab.com/releases/2021/07/01/security-release-gitlab-14-0-2-released/
2021-07-06 08:16:33 +02:00
Sandro dc75e35ef4
Merge pull request #129371 from fabaff/bump-bit-git
bit: 1.1.1 -> 1.1.2
2021-07-06 02:39:11 +02:00
Fabian Affolter 193c06f5f2 bit: 1.1.1 -> 1.1.2 2021-07-05 22:59:53 +02:00
Fabián Heredia Montiel bb6bdc62ec pijul: 1.0.0-alpha.48 → 1.0.0-alpha.50 2021-07-05 10:36:58 -05:00
Luke Granger-Brown 65a67517c9 tortoisehg: 5.6 -> 5.8 2021-07-03 18:12:34 +00:00
Luke Granger-Brown cdcb439bad mercurial: add withExtensions
This allows an easy way of getting a copy of the "hg" executable which
provides a specific set of extensions.
2021-07-03 18:11:52 +00:00
Luke Granger-Brown dcf3dec494 mercurialFull: add highlight in-tree extension support
This also moves the individual flag flips from the mercurialFull
definition in all-packages into the mercurial module itself.
2021-07-03 10:56:29 +00:00
Luke Granger-Brown 67444f8a39 mercurial: fix patch links again
The conclusion is that Phabricator does not, in fact, generate stable
patch links. In any case, these have landed, so we can just use the
patches from Mercurial's hgweb instance instead, which should be more
stable.
2021-07-03 10:41:13 +00:00
Luke Granger-Brown c83a5bce66 mercurialFull: add support for experimental in-tree git extension
The git extension is bundled in-tree, similarly to the hg gui, but also
requires pygit2. Enable it for mercurialFull, but don't bother with it
for the stock mercurial install.

Alas, it doesn't (yet?) work on nixpkgs because it doesn't support
octopus merges:

mercurial.error.ProgrammingError: git support can't handle octopus
merges, found a commit with 16 parents :(

I'm sure that commit is loved equally by all 16 parents.
2021-07-03 10:36:01 +00:00
zowoq c7e7f90108 gh: 1.12.0 -> 1.12.1
https://github.com/cli/cli/releases/tag/v1.12.1
2021-07-01 12:53:09 +10:00
Otavio Salvador a7d13844a1 gitRepo: 2.15.4 -> 2.16
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-06-29 21:25:35 -03:00
Sandro 3adb7f66d2
Merge pull request #128660 from zowoq/delta
delta: 0.8.1 -> 0.8.2
2021-06-30 01:11:43 +02:00
zowoq 5edaead2dc delta: 0.8.1 -> 0.8.2
https://github.com/dandavison/delta/releases/tag/0.8.2
2021-06-30 06:12:32 +10:00
zowoq d7ea598b27 gh: 1.11.0 -> 1.12.0
https://github.com/cli/cli/releases/tag/v1.12.0
2021-06-30 06:09:55 +10:00
Robert Schütz d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
zowoq cd50708ec8 delta: 0.8.0 -> 0.8.1
https://github.com/dandavison/delta/releases/tag/0.8.1
2021-06-25 21:45:25 +09:00
github-actions[bot] bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Florian Klink 131c884a4d
Merge pull request #127913 from r-ryantm/auto-update/gerrit
gerrit: 3.3.2 -> 3.4.0
2021-06-25 12:15:45 +02:00
Sandro 959014ce29
Merge pull request #127816 from VirtusLab/git-machete-3.2.1
gitAndTools.git-machete: 3.2.0 -> 3.2.1
2021-06-25 11:12:10 +02:00
Robert Schütz c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
V 56f5cd3343 git: add shellPath passthru
git features a restricted login shell for allowing Git-only SSH access.
2021-06-25 03:26:19 +02:00
Yureka facd0c68cc gitlab: 13.12.4 -> 14.0.1
https://about.gitlab.com/releases/2021/06/22/gitlab-14-0-released/
https://about.gitlab.com/releases/2021/06/24/gitlab-14-0-1-released/
2021-06-25 01:21:19 +02:00
Niklas Hambüchen d22a561225 git-branchless: init at 0.3.2 2021-06-24 13:27:19 +02:00
R. RyanTM 5814c4b86a gerrit: 3.3.2 -> 3.4.0 2021-06-23 14:29:49 +00:00
Martin Weinelt b607aadaac
Merge branch 'master' into staging-next 2021-06-22 23:55:21 +02:00
Git Machete Release Bot 9c9f7cc27b gitAndTools.git-machete: 3.2.0 -> 3.2.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).
2021-06-22 17:29:34 +00:00
Stanisław Barzowski 1fcd4e74c4
Add JSON package to gitolite environment. (#127683)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Lassulus <github@lassul.us>
2021-06-22 15:11:35 +02:00
github-actions[bot] c7bb5a79c8
Merge master into staging-next 2021-06-22 12:05:00 +00:00
Yuka 1bbdca36d2
maintainers: add yuka (#127773)
If this seems strange to you, or you are a maintainer of one of these
packages, please contact me on Matrix: @yuka:yuka.dev
2021-06-22 11:17:00 +02:00
github-actions[bot] 6f3d57cba9
Merge master into staging-next 2021-06-22 06:04:24 +00:00
Martin Weinelt eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Artturin f845709e9e mercurial: use working patch links 2021-06-21 15:59:09 +03:00
Sandro 0c72a4ffaf
Merge pull request #127545 from liff/antlr/v4-is-default
antlr: make 4.8 default
2021-06-20 23:22:35 +02:00
Maximilian Bosch 8e25802249
Merge pull request #127301 from r-ryantm/auto-update/gitstatus
gitstatus: 1.5.1 -> 1.5.2
2021-06-20 19:37:59 +02:00
Olli Helenius b2bf2c6102
antlr: make 4.8 default 2021-06-20 14:06:47 +03:00
github-actions[bot] d0cc21f4bd
Merge master into staging-next 2021-06-19 00:08:37 +00:00
Maximilian Bosch e914a9aeb2
Merge pull request #127380 from Ma27/bump-gitea
gitea: 1.14.2 -> 1.14.3
2021-06-18 22:37:02 +02:00
github-actions[bot] 4ea74538ce
Merge master into staging-next 2021-06-18 18:04:25 +00:00
Maximilian Bosch d5edee8113
gitea: 1.14.2 -> 1.14.3
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.3
2021-06-18 19:11:31 +02:00
Sandro 13fcfce0af
Merge pull request #127228 from r-ryantm/auto-update/ghr
ghr: 0.13.0 -> 0.14.0
2021-06-18 17:10:42 +02:00
R. RyanTM 08aaf68511 gitstatus: 1.5.1 -> 1.5.2 2021-06-18 05:43:45 +00:00
R. RyanTM 3ac01fa851 ghr: 0.13.0 -> 0.14.0 2021-06-17 15:04:40 +00:00
github-actions[bot] b859981601
Merge master into staging-next 2021-06-17 12:05:01 +00:00
Sandro 7b229db9e4
Merge pull request #127119 from VirtusLab/git-machete-3.2.0 2021-06-17 13:38:31 +02:00
github-actions[bot] 538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot] 51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Sandro eaef571d76
Merge pull request #125476 from LeSuisse/git-fix-pkgsStatic
git: fix pkgsStatic build
2021-06-17 01:10:00 +02:00
Ben Siraphob 8bae808a21
rcs: 5.9.4 -> 5.10.0 (#112014) 2021-06-17 01:00:33 +02:00
github-actions[bot] 8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot] 2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Git Machete Release Bot 8aebc1b904 gitAndTools.git-machete: 3.1.1 -> 3.2.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).
2021-06-16 17:56:47 +00:00
Thomas Gerbet fc1c4bab77 git: fix pkgsStatic build 2021-06-16 18:46:39 +02:00
Sandro 4d5f3b8d93
Merge pull request #127022 from r-ryantm/auto-update/glab
glab: 1.18.0 -> 1.18.1
2021-06-16 18:25:26 +02:00
github-actions[bot] f060a3768b
Merge master into staging-next 2021-06-16 06:04:41 +00:00
R. RyanTM 76ceead4ec lefthook: 0.7.5 -> 0.7.6 2021-06-15 20:01:41 -07:00
Jonathan Ringer d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
R. RyanTM 29cf0172e0 glab: 1.18.0 -> 1.18.1 2021-06-16 01:39:44 +00:00
Maximilian Bosch 9db4b84cfb
Merge pull request #126887 from Ma27/bump-diff-so-fancy
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
2021-06-15 22:04:09 +02:00
Jan Tojnar 91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Milan Pässler 5c04139da2
gitlab: 13.12.3 -> 13.12.4
https://about.gitlab.com/releases/2021/06/14/gitlab-13-12-4-released/
2021-06-15 00:03:56 +02:00
Maximilian Bosch d387353590
gitAndTools.diff-so-fancy: 1.4.1 -> 1.4.2
ChangeLog: https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.4.2
2021-06-14 22:36:43 +02:00
Sandro dfc55d71ec
Merge pull request #126530 from mweinelt/zsh-p10k 2021-06-14 19:26:34 +02:00
github-actions[bot] dbed958bf2
Merge staging-next into staging 2021-06-14 12:04:44 +00:00
github-actions[bot] f2ba460019
Merge master into staging-next 2021-06-14 12:04:41 +00:00
Milan Pässler d62aac819b gitlab: 13.12.2 -> 13.12.3 2021-06-14 08:04:31 +02:00
github-actions[bot] 9309a23dd3
Merge staging-next into staging 2021-06-12 18:04:58 +00:00
github-actions[bot] 65a7d168af
Merge master into staging-next 2021-06-12 18:04:56 +00:00
Sandro 6241f618f2
Merge pull request #126232 from siraben/fossil-update
fossil: 2.14 -> 2.15.1
2021-06-12 19:11:56 +02:00
Martin Weinelt 38b5368b7e
gitAndTools.gitstatus: 1.4.4 -> 1.5.1 2021-06-10 21:35:57 +02:00
github-actions[bot] f023076314
Merge staging-next into staging 2021-06-10 18:14:20 +00:00
github-actions[bot] 870106ba69
Merge master into staging-next 2021-06-10 18:14:17 +00:00
Alyssa Ross cf1f499e7e
cvs-fast-export: 1.56 -> 1.57 2021-06-10 14:08:28 +00:00
Alyssa Ross db733deeed
cvs-fast-export: clean up; fix cross
Style was unidiomatic for modern Nixpkgs, there was no
nativeBuildInputs/buildInputs separation, and some dependencies were
unused.

I've removed doCheck here, because the default Nixpkgs checkPhase
wasn't actually running the tests (need to cd into tests first), and
when I did write a checkPhase to run the tests, they didn't work and I
couldn't make them work.

A note on RCS:  There is code in cvsconvert that calls RCS, but I
analyzed it quite carefully, and came to the conclusion that all such
code is unreachable, so I removed the RCS dependency.
2021-06-10 14:04:46 +00:00
Jan Tojnar ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
github-actions[bot] 51dce04dde
Merge master into staging-next 2021-06-10 12:05:05 +00:00
Mario Rodas 1027d970df
Merge pull request #126152 from r-ryantm/auto-update/git-filter-repo
git-filter-repo: 2.29.0 -> 2.32.0
2021-06-10 05:38:19 -05:00
github-actions[bot] da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
github-actions[bot] cf8441dd85
Merge staging-next into staging 2021-06-09 18:14:53 +00:00
github-actions[bot] f242b07bc2
Merge master into staging-next 2021-06-09 18:14:51 +00:00
talyz 8f16b16291
gitlab: Make sure the FOSS version isn't identified as EE 2021-06-09 17:50:45 +02:00
Ben Siraphob f0b2272124 fossil: 2.14 -> 2.15.1 2021-06-09 20:48:54 +07:00
Sandro 29badbe190
Merge pull request #126353 from otavio/topic/updates-2021-06-09 2021-06-09 15:06:54 +02:00
Ryan Mulligan 62c94205ab
Merge pull request #126318 from r-ryantm/auto-update/glab
glab: 1.17.0 -> 1.18.0
2021-06-09 06:00:19 -07:00
Martin Weinelt 3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
Otavio Salvador 963b1f068a gitRepo: 2.15.3 -> 2.15.4
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-06-09 09:15:52 -03:00
R. RyanTM e9d48ab799 git-vendor: 1.2.0 -> 1.2.1 2021-06-09 14:15:52 +02:00
R. RyanTM a362b1e9ee glab: 1.17.0 -> 1.18.0 2021-06-09 07:03:20 +00:00