Commit Graph

3269 Commits

Author SHA1 Message Date
Vladimír Čunát
9d77dc28d2
Merge #85263: git: 2.25.1 -> 2.26.1 (into staging-next) 2020-04-16 16:59:53 +02:00
Michael Weiss
7c2fc1ce23
gitRepo: 2.5 -> 2.6 2020-04-16 14:37:22 +02:00
Jan Tojnar
4b706490da
Merge branch 'staging-next' into staging 2020-04-16 10:10:38 +02:00
vasile luta
f57da8ef0a tig: fix tig-completion's dependency on __git_complete
tig recently updated it's bash-completion making it depend on __git-complete from git.
Becase __git-complete is not automatically sourced tig bash completion fails.
Also this PR makes tig completion load on-demand.
2020-04-15 22:14:51 +02:00
James Ottaway
4848eef29d git: Allow the update script to target non-latest versions
This came in handy when I wanted to bump a patch version while avoiding
a new minor version.
2020-04-15 17:05:34 +10:00
James Ottaway
fbd29dcbe7 git: 2.25.1 -> 2.26.1
This version addresses CVE-2020-5260.

See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
2020-04-15 14:23:52 +10:00
Mario Rodas
1ad005458f gitAndTools.git-trim: 0.2.4 -> 0.3.1 2020-04-14 18:42:36 +02:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
Matthieu Coudron
ed234c3708 gitAndTools.gitbatch: init at 2019-12-19
init an unstable version since the tagged release wouldn't work on my
machine (infinite loop).
Practical tool to fetch several repositories at the same time, see their
status etc.

Disabled for darwin because of CI error "SIGILL: illegal instruction".
2020-04-13 16:36:19 +02:00
zowoq
56480fe64c gitAndTools.hub: remove Security
Not needed now that Security is propagated via go 0bba7474b3
2020-04-13 13:08:11 +10:00
Cole Helbling
3d1824896f
gitAndTools.git-ignore: improve robustness 2020-04-12 14:06:08 -07:00
Benjamin Hipple
4d75b35fe4
Merge pull request #85056 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.51 -> 1.53
2020-04-12 14:09:25 -04:00
R. RyanTM
64634fb357 cvs_fast_export: 1.51 -> 1.53 2020-04-12 08:44:01 +00:00
Niklas Hambüchen
fd6ee37def gitAndTools.git-bug: 0.6.0 -> 0.7.0 2020-04-11 18:04:02 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM
96e2dc107f gerrit: 3.1.2 -> 3.1.4 2020-04-10 00:27:13 -07:00
Maximilian Bosch
a3eaf6c88b
gitAndTools.tig: 2.5.0 -> 2.5.1
https://github.com/jonas/tig/releases/tag/tig-2.5.1
2020-04-09 22:25:42 +02:00
Aaron Andersen
8eefb7ce14 redmine: 4.1.0 -> 4.1.1 2020-04-09 14:03:24 -04:00
Samuel Leathers
72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00
Jan Tojnar
b7243c79c8
Merge pull request #84698 from jtojnar/gnome2-cleanups
gnome2 cleanups
2020-04-08 15:58:33 +02:00
Jan Tojnar
db46da2e32
monotoneViz: do not use aliases 2020-04-08 10:32:21 +02:00
worldofpeace
36beb6efa4
Merge pull request #84185 from cpcloud/add-scmpuff
scmpuff: init at 0.3.0
2020-04-07 23:41:22 -04:00
Phillip Cloud
9c2ffc5834 scmpuff: init at 0.3.0
scmpuff is tool to make working with git easier by making it possible
to refer to filenames using numeric shortcuts
2020-04-07 23:41:06 -04:00
Alyssa Ross
fafac02e41 gitAndTools.git-cinnabar: init at 0.5.4
git-cinnabar calls into Mercurial as a library, so we make use the
same version of Python as Mercurial.

Support for Python 3 is an experimental feature in git-cinnabar, but
we unconditionally use it here because:

* Mercurial in Nixpkgs only supports Python 3.
* git-cinnabar touches a network, and for that purpose it's good to
  use a version of Python that is going to get security updates.
2020-04-07 09:07:12 +00:00
Matthew Bauer
d0dbdfea4f git: fix cross compilation 2020-04-06 16:36:14 -04:00
Michael Fellinger
f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Frederik Rietdijk
92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Jonathan Ringer
5c171862b6 git-lfs: 2.8.0 -> 2.10.0 2020-04-02 16:11:45 +00:00
zowoq
26a6d89cab gitAndTools.gh: 0.6.3 -> 0.6.4
https://github.com/cli/cli/releases/tag/v0.6.4
2020-04-01 16:55:03 -07:00
Maximilian Bosch
38f4e7c6ea
gitea: 1.11.3 -> 1.11.4
https://github.com/go-gitea/gitea/releases/tag/v1.11.4
2020-04-01 23:22:50 +02:00
zowoq
68a50aaaa5 gitAndTools.gh: 0.6.2 -> 0.6.3
https://github.com/cli/cli/releases/tag/v0.6.3
2020-04-01 08:37:03 +10:00
Jan Tojnar
3e0f4e202f
Merge branch 'master' into staging-next 2020-03-31 21:32:15 +02:00
Timo Kaufmann
24ead6996c
Merge pull request #75129 from ryneeverett/legit-init
legit: init at 1.2.0
2020-03-31 14:22:31 +00:00
R. RyanTM
6248fb23d2 gitAndTools.gita: 0.9.9 -> 0.10.5 2020-03-31 04:20:27 +00:00
zowoq
2ae5cf317f Revert "gitAndTools.gh: fix build on darwin"
This reverts commit a51275f3b5.

Not needed now that Security is propagated via go in 0bba7474b3
2020-03-29 09:43:11 +10:00
Frederik Rietdijk
a36be028f5 Merge staging-next into staging 2020-03-28 21:15:15 +01:00
Jörg Thalheim
f909e50287
gitAndTools.grv: fix build by using vendored libgit 2020-03-28 11:42:07 +00:00
Jörg Thalheim
d13c14b5e3
gitAndTools.grv: 0.3.1 -> 0.3.2 2020-03-28 11:42:07 +00:00
Daiderd Jordan
c4ecf64b3a
Merge pull request #81521 from thefloweringash/git-gui-darwin
git: use tcl/tk from nixpkgs on darwin
2020-03-28 11:51:05 +01:00
Jörg Thalheim
774ddebd87
Merge pull request #83472 from Mic92/propragate-darwin-go
Propragate darwin go
2020-03-28 06:57:59 +00:00
Florian Klink
8ab04fd87b gitlab: 12.8.7 -> 12.8.8 2020-03-27 10:08:59 +01:00
Jörg Thalheim
066db11215
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
2020-03-27 07:33:21 +00:00
zimbatm
d8f0c5407e
Merge pull request #82929 from zimbatm/nixos-gerrit
nixos gerrit module
2020-03-26 12:47:15 +01:00
zimbatm
d37a0dca13
nixos: add gerrit module
Co-authored-by: edef <edef@edef.eu>
Co-authored-by: Florian Klink <flokli@flokli.de>
2020-03-26 09:28:42 +01:00
Michael Weiss
e571880c55
gitRepo: 2.4.1 -> 2.5 2020-03-25 19:07:36 +01:00
Kim Lindberger
3a173c1d75
gitlab: 12.8.6 -> 12.8.7 (#82838)
https://about.gitlab.com/releases/2020/03/16/gitlab-12-8-7-released/
2020-03-24 18:45:39 +01:00
R. RyanTM
ab049eef08 gitAndTools.git-filter-repo: 2.25.0 -> 2.26.0 2020-03-24 09:12:58 +00:00
Jörg Thalheim
b4c2511eb8
gitea: fix strict deps build 2020-03-23 08:16:40 +00:00
Jörg Thalheim
be283a97e5
gogs: fix build with strict deps 2020-03-23 08:15:04 +00:00
Travis CI
9280064b8b gitAndTools.git-machete: 2.13.5 -> 2.13.6
###### 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 @worldofpeace @tfc @jtraue
2020-03-22 17:54:44 +01:00
Mario Rodas
b149f2ee80 gitAndTools.ghq: fix build on darwin 2020-03-21 05:25:00 -05:00
Mario Rodas
02d54a88b6 gitAndTools.git-bug: fix build on darwin 2020-03-21 05:24:00 -05:00
Mario Rodas
3e92406ab0 gitAndTools.git-subtrac: fix build on darwin 2020-03-21 05:23:00 -05:00
Mario Rodas
b30c0c8d5f gitAndTools.lab: fix build on darwin 2020-03-21 05:22:00 -05:00
Mario Rodas
b24059bc2f gitAndTools.lefthook: fix build on darwin 2020-03-21 05:21:00 -05:00
Maximilian Bosch
cbceee8e97
gitea: 1.10.3 -> 1.11.3
Updates `gitea` to the latest version available[1]. Also ensured that
upgrading from `gitea-1.9` (used on NixOS 19.09) to `1.11.3` works
seamlessly.

The derivation required a few more changes this time since `gitea` uses
`npm` now to build the frontend[2]. When using the default tarball from
GitHub, we'd have to build the frontend manually. By fetching a custom
tarball published on every release, we get a prebuilt frontend
(as it was the case on previous versions) and build the backend only from
source.

Co-authored-by: kolaente <k@knt.li>
Closes #80175

[1] https://github.com/go-gitea/gitea/releases/tag/v1.11.3
[2] https://github.com/go-gitea/gitea/issues/10253
2020-03-20 22:58:19 +01:00
Mario Rodas
a51275f3b5
gitAndTools.gh: fix build on darwin 2020-03-18 21:21:21 -05:00
zowoq
20f197d0b9 gitAndTools.gh: 0.6.1 -> 0.6.2
https://github.com/cli/cli/releases/tag/v0.6.2
2020-03-19 08:03:58 +10:00
Martin Weinelt
b1e788c028
gitstatus: unstable-2020-03-06 → unstable-2020-03-15 2020-03-16 13:12:09 +01:00
Evan Stoll
2643e4163b gitkraken: 6.5.3 -> 6.5.4 2020-03-14 22:49:06 +01:00
R. RyanTM
93144e0f4a gitAndTools.stgit: 0.21 -> 0.22 2020-03-14 14:33:20 +01:00
R. RyanTM
96bfae7c5d gitAndTools.lefthook: 0.6.3 -> 0.7.1 2020-03-14 07:29:00 +00:00
Mario Rodas
8e29a0ad79
Merge pull request #82466 from r-ryantm/auto-update/git-standup
gitAndTools.git-standup: 2.3.1 -> 2.3.2
2020-03-13 05:42:38 -05:00
R. RyanTM
913f4d312a gitAndTools.git-standup: 2.3.1 -> 2.3.2 2020-03-13 04:51:35 +00:00
Mario Rodas
6881eb96a9 gitAndTools.hub: 2.14.1 -> 2.14.2
Changelog: https://github.com/github/hub/releases/tag/v2.14.2
2020-03-12 17:29:01 +01:00
Florian Klink
1ab2e9ef3f
Merge pull request #82373 from mweinelt/pr/gitstatus/libgit2-cmakeflags
gitstatus: Fix build of the internally used libgit2 fork
2020-03-12 06:38:48 -07:00
Florian Klink
281bd03242 gitaly: 12.8.5 -> 12.8.6 2020-03-12 12:49:23 +01:00
Martin Weinelt
d8e27096f2
gitstatus: Fix build of the internally used libgit2 fork
In 6733ece `-DUSE_HTTP_PARSER=system` was introduced, which does not seem
to work with this fork. So instead fallback to the `builtin`.

Also sync with upstream cmake flags.
2020-03-12 11:23:36 +01:00
Florian Klink
ab3b836350 gitlab: 12.8.5 -> 12.8.6
https://about.gitlab.com/releases/2020/03/11/critical-security-release-gitlab-12-dot-8-dot-6-released/
2020-03-12 02:57:39 +01:00
Florian Klink
d2061f024c gitlab: update script: unset GOROOT
or vgo2nix might not be able to resolve some dependencies.
2020-03-12 02:56:48 +01:00
Florian Klink
5ffc683fde
Merge pull request #81934 from mweinelt/pr/zsh-powerlevel10k/v1.3
zsh-powerlevel10k: v1.2.0 → v1.3.0
2020-03-11 17:17:38 -07:00
Benjamin Hipple
68a64b2afe gitAndTools.git-dit: mark as broken
See inline comment; this does not build on Hydra and either requires custom
patching or a new release from upstream before it will build.

Note that we can still recompute the `cargoSha256` for #79975; the package
is broken in the identical way.
2020-03-12 01:16:56 +01:00
Mario Rodas
ca9b9ef51e
gitAndTools.git-trim: init at 0.2.4 2020-03-07 04:20:00 -05:00
Mario Rodas
8cc3a22dd4
Merge pull request #82164 from jluttine/nbstripout-0.3.7
nbstripout: 0.3.6 -> 0.3.7
2020-03-10 08:08:37 -05:00
Milan
f391999026
gitlab: 12.8.2 -> 12.8.5 (#82142)
https://about.gitlab.com/releases/2020/03/09/gitlab-12-8-5-released/
2020-03-09 17:23:51 +01:00
Jaakko Luttinen
8074942aed
nbstripout: 0.3.6 -> 0.3.7 2020-03-09 16:47:57 +02:00
Mario Rodas
306d5074a5
Merge pull request #82018 from bhipple/broken/sit
sit: mark as broken
2020-03-08 20:36:54 -05:00
Mario Rodas
73914125eb
Merge pull request #82012 from clkamp/cvsq-1.11
cvsq: 1.10 -> 1.11
2020-03-08 20:14:11 -05:00
Mario Rodas
77c58e6944
Merge pull request #81966 from edef1c/git-codereview
git-codereview: init at 2020-01-15
2020-03-08 20:07:50 -05:00
royneary
1cd54c9f36
gitAndTools.git-bug: 0.6.0 -> 0.7.0
Update to version 0.7.0. Includes switch to buildGoModule because Gopkg.toml
has been removed upstream.
2020-03-08 13:31:07 +01:00
Benjamin Hipple
a2514c22a8 sit: mark as broken
Dependencies in the Cargo.lock fail to build due to mutable self borrows.
2020-03-07 15:28:56 -05:00
Christian Lütke-Stetzkamp
877348836c cvsq: 1.10 -> 1.11 2020-03-07 20:32:01 +01:00
edef
609650a3e8 git-codereview: init at 2020-01-15 2020-03-07 10:23:37 +00:00
Martin Weinelt
4307ef63ed
gitstatusd: unstable-2020-02-26 → unstable-2020-03-06 2020-03-07 01:02:29 +01:00
Milan
c25756f91c
gitlab: 12.8.1 -> 12.8.2 (#81803)
Includes multiple security fixes mentioned in
https://about.gitlab.com/releases/2020/03/04/gitlab-12-dot-8-dot-2-released/
(unfortunately, no CVE numbers as of yet)

 - Directory Traversal to Arbitrary File Read
 - Account Takeover Through Expired Link
 - Server Side Request Forgery Through Deprecated Service
 - Group Two-Factor Authentication Requirement Bypass
 - Stored XSS in Merge Request Pages
 - Stored XSS in Merge Request Submission Form
 - Stored XSS in File View
 - Stored XSS in Grafana Integration
 - Contribution Analytics Exposed to Non-members
 - Incorrect Access Control in Docker Registry via Deploy Tokens
 - Denial of Service via Permission Checks
 - Denial of Service in Design For Public Issue
 - GitHub Tokens Displayed in Plaintext on Integrations Page
 - Incorrect Access Control via LFS Import
 - Unescaped HTML in Header
 - Private Merge Request Titles Leaked via Widget
 - Project Namespace Exposed via Vulnerability Feedback Endpoint
 - Denial of Service Through Recursive Requests
 - Project Authorization Not Being Updated
 - Incorrect Permission Level For Group Invites
 - Disclosure of Private Group Epic Information
 - User IP Address Exposed via Badge images
 - Update postgresql (GitLab Omnibus)
2020-03-05 16:37:21 +01:00
zowoq
4656fba5ab gitAndTools.gh 0.6.0 -> 0.6.1
https://github.com/cli/cli/releases/tag/v0.6.1
2020-03-05 07:49:38 +10:00
David Wood
a54908f15e
delta: 0.0.16 -> 0.0.17 2020-03-04 13:47:27 +00:00
zowoq
85a8d13017 gitAndTools.gh: 0.5.7 -> 0.6.0
https://github.com/cli/cli/releases/tag/v0.6.0
2020-03-04 08:16:42 +10:00
talyz
74769b6799 gitaly: Copy gem files into bundler env instead of symlinking
This fixes issue #79374, where gitaly prints warning messages on the
client side when running push or fetch.
2020-03-03 21:19:01 +01:00
talyz
17721d3b33 gitaly: Add myself to maintainers 2020-03-03 21:19:01 +01:00
talyz
a3b2828de3 gitlab-shell: Change name from gitlab-shell-go to gitlab-shell
This is left over from when gitlab-shell had a ruby part and a go
part. The ruby part is now gone, so let's call the go part
gitlab-shell.
2020-03-03 21:19:01 +01:00
talyz
f2bb5238aa gitlab-workhorse: 8.20.0 -> 8.21.0 2020-03-03 21:19:01 +01:00
talyz
facef28665 gitaly: 1.83.0 -> 12.8.1
In order to build gitaly, this locally overrides the version of
libgit2, since gitaly is not compatible with the latest version.
2020-03-03 21:19:01 +01:00
talyz
7d8a2004cf gitlab: 12.7.6 -> 12.8.1
https://about.gitlab.com/releases/2020/02/22/gitlab-12-8-released/
https://about.gitlab.com/releases/2020/02/24/gitlab-12-8-1-released/
2020-03-03 21:19:01 +01:00
Andrew Childs
bc4264a95f git: use tcl/tk from nixpkgs on darwin 2020-03-02 22:29:47 +09:00
Andrew Childs
880ce71f67 Revert "git: Fix git-gui to work on Catalina"
This reverts commit 1b6ef1268f.
2020-03-02 22:29:47 +09:00
Travis CI
166836eadc gitAndTools.git-machete: 2.13.1 -> 2.13.5
###### 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 @worldofpeace @tfc @jtraue
2020-03-02 11:54:21 +00:00
Frederik Rietdijk
33133b2667
Merge pull request #81167 from NixOS/staging-next
Staging next
2020-03-01 13:45:30 +01:00
Anderson Torres
9a4d723e43
Merge pull request #81182 from r-ryantm/auto-update/src
src: 1.27 -> 1.28
2020-02-29 19:14:01 -03:00
Benjamin Hipple
64b1993b81 git-backup: upgrade cargo fetcher and cargoSha256 2020-02-29 11:20:47 -05:00
Frederik Rietdijk
79217339d2 Merge master into staging-next 2020-02-29 15:29:11 +01:00
worldofpeace
180e5f41b0
Merge pull request #81083 from evanjs/gitkraken/6.5.3
gitkraken: 6.5.1 -> 6.5.3
2020-02-29 00:20:59 +00:00
Jan Tojnar
bb701376cf
Merge branch 'master' into staging-next 2020-02-28 11:30:44 +01:00
R. RyanTM
af1341142b src: 1.27 -> 1.28 2020-02-27 13:43:09 +00:00
Georges Dubus
d25ac92fe5
Merge pull request #80887 from cohei/update-ghq
ghq: 0.12.6 -> 1.1.0
2020-02-27 13:46:40 +01:00
Mario Rodas
afa6c6a7c1
Merge pull request #81089 from bhipple/u/rust-cargo-gitAndTools.git-interactive-rebase-tool
gitAndTools.git-interactive-rebase-tool: upgrade cargo fetcher and cargoSha256
2020-02-27 07:32:18 -05:00
Frederik Rietdijk
ef156f7a8b Merge staging-next into staging 2020-02-27 10:15:34 +01:00
Martin Weinelt
7fa4d90d7b
gitstatusd: unstable-2020-01-28 → unstable-2020-02-26
Also updates the internally used libgit2 fork.
2020-02-26 22:24:32 +01:00
ryneeverett
e964450670 legit: init at 1.2.0 2020-02-26 20:11:31 +00:00
Georges Dubus
186cd76007
Merge pull request #79737 from clkamp/add-cvsq
cvsq: init at 1.10
2020-02-26 17:22:06 +01:00
worldofpeace
0babf18003
Merge pull request #71378 from bb010g/git-my
git-my: init at 1.1.2
2020-02-26 15:54:16 +00:00
Mario Rodas
55beed9922
Merge pull request #81093 from bhipple/u/rust-cargo-gitAndTools.git-ignore
gitAndTools.git-ignore: upgrade cargo fetcher and cargoSha256
2020-02-26 03:53:16 -05:00
Mario Rodas
fdc118806b
Merge pull request #81092 from bhipple/u/rust-cargo-gitAndTools.git-codeowners
gitAndTools.git-codeowners: upgrade cargo fetcher and cargoSha256
2020-02-26 03:48:19 -05:00
Mario Rodas
d4cba71766
Merge pull request #81088 from bhipple/u/rust-cargo-gitAndTools.git-absorb
gitAndTools.git-absorb: upgrade cargo fetcher and cargoSha256
2020-02-26 03:43:18 -05:00
Mario Rodas
e3a556ca56
Merge pull request #81090 from bhipple/u/rust-cargo-gitAndTools.git-gone
gitAndTools.git-gone: upgrade cargo fetcher and cargoSha256
2020-02-26 03:43:06 -05:00
bb010g
ddb272bf1d git-my: init at 1.1.2 2020-02-25 23:04:20 -08:00
bb010g
846097b7af git-and-tools: strongly alphabetize 2020-02-25 23:04:20 -08:00
bb010g
a7cb757af4 git-and-tools: canonicalize hyphenated names
Old intercaps names are aliased.

darcs-to-git: rename from darcsToGit
git-fast-export: rename from gitFastExport
git-remote-gcrypt: rename from gitRemoteGcrypt
hub-unstable: rename from hubUnstable
top-git: rename from topGit
2020-02-25 23:04:20 -08:00
bb010g
925404027a hub-unstable: remove
This has been here for 2 years; we can remove it.

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2020-02-25 23:04:20 -08:00
Benjamin Hipple
c3f7554a34 gitAndTools.delta: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:24:48 -05:00
Benjamin Hipple
f2b14397d4 gitAndTools.git-ignore: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:20:29 -05:00
Benjamin Hipple
a717457135 gitAndTools.git-codeowners: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:15:04 -05:00
Benjamin Hipple
69ac30f87d gitAndTools.git-gone: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:12:45 -05:00
Benjamin Hipple
71137f9182 gitAndTools.git-interactive-rebase-tool: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:05:14 -05:00
Benjamin Hipple
42850aabd1 gitAndTools.git-absorb: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-25 23:03:55 -05:00
Evan Stoll
675dcd3618 gitkraken: 6.5.1 -> 6.5.3 2020-02-25 21:25:38 -05:00
Ryan Mulligan
1db1a99275
Merge pull request #77077 from r-ryantm/auto-update/gerrit
gerrit: 3.0.2 -> 3.1.2
2020-02-25 09:34:35 -08:00
Michael Weiss
cc2ade3d7f
gitRepo: 2.3 -> 2.4.1 2020-02-25 10:06:29 +01:00
Peter Hoeg
2ddfc45235
Merge pull request #77071 from peterhoeg/git_emacs_files
git: upstream no longer ships .el files for emacs
2020-02-23 21:16:55 +08:00
TANIGUCHI Kohei
b974f0595f ghq: 0.12.6 -> 1.1.0 2020-02-23 21:24:48 +09:00
Jörg Thalheim
bec89d1893
Merge pull request #80370 from gnidorah/rambox
rambox: don't build from sources
2020-02-21 15:59:50 +00:00
zowoq
3338225cd2 gitAndTools.gh: 0.5.6 -> 0.5.7
https://github.com/cli/cli/releases/tag/v0.5.7
2020-02-21 08:19:47 +10:00
zowoq
185aabefb0 gitAndTools.gh: 0.5.5 -> 0.5.6
https://github.com/cli/cli/releases/tag/v0.5.6
2020-02-20 09:36:08 -08:00
Tim Steinbach
b2a903a3e7
git: 2.25.0 -> 2.25.1 2020-02-20 08:22:22 -05:00
worldofpeace
e893358693
Merge pull request #80334 from hedning/gnome-3.34.4
Gnome 3.34.4
2020-02-19 20:57:49 -05:00
Mario Rodas
8cf9a89a34
Merge pull request #79768 from r-ryantm/auto-update/yadm
yadm: 2.3.0 -> 2.4.0
2020-02-19 19:22:36 -05:00
Mario Rodas
0123ad0f13
Merge pull request #80557 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.50 -> 1.51
2020-02-19 19:13:39 -05:00
Daiderd Jordan
af1fffab5b
Merge pull request #79769 from virusdave/dnicponski/scratch/make_git_gui_work_on_modern_mac
git: Fix git-gui to work on Catalina
2020-02-19 20:25:41 +01:00
R. RyanTM
170f42098d cvs_fast_export: 1.50 -> 1.51 2020-02-19 19:05:34 +00:00
worldofpeace
9f00427bdd meld: 3.20.1 -> 3.20.2 2020-02-18 07:14:40 -05:00
gnidorah
1462612de1 sourcehut: don't refer to rambox 2020-02-17 21:35:35 +03:00
Frederik Rietdijk
ec1184f461 Merge master into staging-next 2020-02-17 15:12:28 +01:00
Mario Rodas
a05d11a95a
Merge pull request #77418 from marsam/init-gitAndTools.git-filter-repo
gitAndTools.git-filter-repo: init at 2.24.0
2020-02-16 18:26:46 -05:00
Benjamin Hipple
201d464f12 pijul: fix build by migrating off legacy fetchCargo
Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux
2020-02-16 09:36:17 -08:00
Frederik Rietdijk
0c7143462b Merge master into staging 2020-02-16 08:50:59 +01:00
Benjamin Hipple
131a32a5af rust: update docs on legacyCargoFetcher; remove unnecessary defaults
As mentioned in #79975, the default on `legacyCargoFetcher` if left unspecified
is now `false`.
2020-02-15 22:07:47 -08:00
Jonathan Ringer
bbb4a1be3d gitAndTools.ydiff: add python3.pkgs.ydiff tool 2020-02-15 08:54:42 -08:00
Dmitry Kalinkin
018fac1dc7
Merge pull request #76677 from eadwu/sourcehut/update-4
sourcehut/update-4
2020-02-15 06:07:26 -05:00
Jeff Labonte
ebf01d5614 gitAndTools.bump2version: init at 1.0.0 2020-02-14 16:46:15 -08:00
Mario Rodas
dafde55bf4
Merge pull request #80094 from r-ryantm/auto-update/svn-all-fast-export
gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17
2020-02-14 08:28:52 -05:00
R. RyanTM
334e013a0a gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17 2020-02-14 07:09:30 +00:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
2020-02-13 22:41:37 -08:00
Mario Rodas
0565f10b24
Merge pull request #80073 from zowoq/gh
gitAndTools.gh: 0.5.4 -> 0.5.5
2020-02-13 21:48:54 -05:00
Michael Weiss
c1741fc12a
gitRepo: 2.1.1 -> 2.3 2020-02-14 01:06:36 +01:00
zowoq
66f50128dc gitAndTools.gh: 0.5.4 -> 0.5.5
https://github.com/cli/cli/releases/tag/v0.5.5
2020-02-14 09:46:21 +10:00
Florian Klink
0a87568b03 gitlab: 12.7.5 -> 12.7.6 2020-02-13 22:18:27 +01:00
Lancelot SIX
d6e780fd46
Merge pull request #79956 from r-ryantm/auto-update/mercurial
mercurial: 5.2.2 -> 5.3
2020-02-13 10:47:58 +01:00
R. RyanTM
523ea83cec mercurial: 5.2.2 -> 5.3 2020-02-13 00:01:08 +00:00
R. RyanTM
7b61246b95 gitAndTools.gh: 0.5.3 -> 0.5.4 2020-02-12 09:40:46 -08:00
Mario Rodas
72ce1ffa9d
Merge pull request #79912 from r-ryantm/auto-update/git-remote-gcrypt
gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3
2020-02-12 06:18:19 -05:00
R. RyanTM
de6b81a89b gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3 2020-02-12 09:45:36 +00:00
Frederik Rietdijk
424697d512 Merge master into staging-next 2020-02-12 09:55:31 +01:00
Michael Weiss
8ffa642baa
gitRepo: 2.0 -> 2.1.1 2020-02-11 18:32:29 +01:00
Frederik Rietdijk
1a6c3cb06b Merge staging into staging-next 2020-02-11 07:59:53 +01:00
Dave Nicponski
1b6ef1268f git: Fix git-gui to work on Catalina
The existing post-install was not successfully patching the git-gui script,
and thus was invoking the packaged osx app which uses the system tk,
which is too old to work (and is no longer supported by Apple anyway).
2020-02-10 17:19:26 -05:00
R. RyanTM
9a4eb10862 yadm: 2.3.0 -> 2.4.0 2020-02-10 21:57:25 +00:00
Christian Lütke-Stetzkamp
df7ee19182 cvsq: init at 1.10 2020-02-10 20:58:06 +01:00
Frederik Rietdijk
079622ef2d
Merge pull request #79628 from NixOS/staging-next
Staging next
2020-02-10 17:53:25 +01:00
Michael Weiss
c213993880
gitRepo: 1.13.9.4 -> 2.0 2020-02-10 17:08:26 +01:00
Benjamin Hipple
2115a2037c fetchcargo: use flat tar.gz file for vendored src instead of recursive hash dir
This has several advantages:

1. It takes up less space on disk in-between builds in the nix store.
2. It uses less space in the binary cache for vendor derivation packages.
3. It uses less network traffic downloading from the binary cache.
4. It plays nicely with hashed mirrors like tarballs.nixos.org, which only
   substitute --flat hashes on single files (not recursive directory hashes).
5. It's consistent with how simple `fetchurl` src derivations work.
6. It provides a stronger abstraction between input src-package and output
   package, e.g., it's harder to accidentally depend on the src derivation at
   runtime by referencing something like `${src}/etc/index.html`. Likewise, in
   the store it's harder to get confused with something that is just there as a
   build-time dependency vs. a runtime dependency, since the build-time
   src dependencies are tarred up.

Disadvantages are:
1. It takes slightly longer to untar at the start of a build.

As currently implemented, this attaches the compacted vendor.tar.gz feature as a
rider on `verifyCargoDeps`, since both of them are relatively newly implemented
behavior that change the `cargoSha256`.

If this PR is accepted, I will push forward the remaining rust packages with a
series of treewide PRs to update the `cargoSha256`s.
2020-02-10 10:17:29 -05:00
Frederik Rietdijk
ec3edaf7b5 Merge master into staging-next 2020-02-10 12:55:47 +01:00
worldofpeace
9c22a82d2b
Merge pull request #78420 from evanjs/gitkraken-6.5.0
gitkraken: 6.4.1 -> 6.5.1
2020-02-09 21:30:09 -05:00
Michael Weiss
828e383f84
gitRepo: 1.13.9.3 -> 1.13.9.4 2020-02-09 19:13:13 +01:00
Benjamin Esham
35b403bf12 git: enable zsh completion
Git ships with a zsh completion script, but this script was previously
only available at $out/share/git/contrib/completion/git-completion.zsh,
which is not a path (or a filename) that would be discovered by a
typical zsh installation. This commit symlinks that file to
$out/share/zsh/site-functions/_git, which is a more standard location.

That zsh completion script is mostly a wrapper around the Bash
completion script, so this commit also patches the former so that it can
"find" the latter.
2020-02-09 09:22:20 +01:00
R. RyanTM
b2b755ece5 gitAndTools.git-machete: 2.12.6 -> 2.13.1 2020-02-08 09:20:18 +00:00
Mario Rodas
2fda7c1224
gitAndTools.delta: 0.0.15 -> 0.0.16
Changelog: https://github.com/dandavison/delta/releases/tag/0.0.16
2020-02-06 21:21:21 -05:00
Michael Weiss
5a0e91e78f
gitRepo: 1.13.9.2 -> 1.13.9.3 2020-02-06 21:49:21 +01:00
André-Patrick Bubel
3cd72fbd76
gogs: 0.11.86 -> 0.11.91, fixes CVE-2019-14544 2020-02-06 07:49:01 +01:00
Michael Weiss
14e53a0508
gitRepo: Rewrite the "urllib.request.urlopen" patch for Python 3
The old variant is still working but setting "cafile" is deprecated
since version 3.6 [0] and generates a warning:
DeprecationWarning: cafile, capath and cadefault are deprecated, use a custom context instead.

But without this patch "fetchRepoProject" still fails with
"error no host given" (see 337380ea1d).

[0]: https://docs.python.org/3.7/library/urllib.request.html#urllib.request.urlopen
2020-02-05 21:34:49 +01:00
Michael Weiss
7c558f7ac7
gitRepo: 1.13.9.1 -> 1.13.9.2 2020-02-05 21:01:38 +01:00
Michael Weiss
a95cfefa55
Merge pull request #79223 from primeos/pijul-fix
pijul: Fix the build (broke due to a more recent Rust version)
2020-02-04 14:52:58 +01:00
Michael Weiss
eacc771f72
gitRepo: Switch to Python 3 2020-02-04 14:45:57 +01:00
Michael Weiss
7d4b5a2154
gitRepo: 1.13.8 -> 1.13.9.1 2020-02-04 14:45:57 +01:00
Michael Weiss
434ff94e73
pijul: Fix the build (broke due to a more recent Rust version)
This uses an upstream patch [0] to fix a compatibility error with a new
version of Rust. Fix #79150.

Unfortunately patching Rust dependencies in Nixpkgs turned out to be way
more hacky than I expected (maybe there is a nicer way?), but it should
be fine for now.

A new release might follow soonish [1] so that we can drop the patches.

References:
- https://nest.pijul.com/pijul_org/pijul/discussions/401
- https://nest.pijul.com/pijul_org/thrussh/discussions/31

[0]: https://nest.pijul.com/pijul_org/thrussh:master/patches/AsyuWkJg4jAwNaG3H1yv1kbECx5E3GQAtjzXWBDB8yEGMswyfKbxKvYmAGWCohTVaTipdvF8mHh63yU5PTr5F9py
[1]: https://discourse.pijul.org/t/is-this-project-still-active-yes-it-is/451
2020-02-04 14:05:02 +01:00
zowoq
eb957383b7 gitAndTools.gh: init at 0.5.3 2020-02-04 13:53:56 +10:00
Mario Rodas
378be0a542
gitAndTools.git-interactive-rebase-tool: enable on darwin 2020-02-02 21:15:10 -05:00
Asad Saeeduddin
e3968c67f0
gitAndTools.git-interactive-rebase-tool: remove patch
Removes patch to disable tests, instead runs them in single threaded
mode.

See discussion in MitMaro/git-interactive-rebase-tool#172
2020-02-02 21:14:41 -05:00
Martin Weinelt
47b14f340a
gitstatus: unstable-2019-12-18 -> unstable-2020-01-28
Also add myself as maintainer.
2020-02-02 21:38:40 +01:00
Maximilian Bosch
9f61b23c01
Merge pull request #79096 from misuzu/git-workspace-update
gitAndTools.git-workspace: 0.4.1 -> 0.5.0
2020-02-02 19:32:59 +01:00
misuzu
cf4657092a gitAndTools.git-workspace: 0.4.1 -> 0.5.0 2020-02-02 18:45:53 +02:00
Maximilian Bosch
5de5d753ba
Merge pull request #79078 from masaeedu/git-interactive-rebase-tool
gitAndTools.git-interactive-rebase-tool: init
2020-02-02 10:23:50 +01:00
Asad Saeeduddin
4d67e30713
gitAndTools.git-interactive-rebase-tool: init 2020-02-02 10:09:28 +01:00
Maximilian Bosch
e7131d6b86
Merge pull request #79019 from flokli/gitlab-12.7.5
gitlab: 12.7.4 -> 12.7.5
2020-02-02 09:17:01 +01:00
Linus Heckemann
5da9abd9c3
Merge pull request #78231 from r-ryantm/auto-update/mercurial
mercurial: 5.2.1 -> 5.2.2
2020-02-01 21:15:51 +01:00
Florian Klink
0142bd49cc gitlab: 12.7.4 -> 12.7.5
https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/
2020-02-01 17:07:55 +01:00
Evan Stoll
7c9bd98e86 gitkraken: 6.4.1 -> 6.5.1
- use fetchzip to retrieve the tarball for GitKraken, as the deb now tries to change permissions and etc which nix will not like
- add at-spi2-core dependency
- remove dpkg dependency
- refactor expression to properly handle the GitKraken tarball (compared to the deb archive)
2020-01-31 14:25:57 -05:00
Florian Klink
cb02372211 gitlab: 12.6.4 -> 12.7.4
- CVE-2020-7966
 - CVE-2020-8114
 - CVE-2020-7973
 - CVE-2020-6833
 - CVE-2020-7971
 - CVE-2020-7967
 - CVE-2020-7972
 - CVE-2020-7968
 - CVE-2020-7979
 - CVE-2020-7969
 - CVE-2020-7978
 - CVE-2020-7974
 - CVE-2020-7977
 - CVE-2020-7976
 - CVE-2019-16779
 - CVE-2019-18978
 - CVE-2019-16892
2020-01-31 12:34:57 +01:00
Florian Klink
968f7c2890 gitaly: 1.77.1 -> 1.83.0 2020-01-31 12:25:55 +01:00
Florian Klink
d2e149584f gitlab-workhorse: 8.18.0 -> 8.20.0 2020-01-31 12:25:24 +01:00
Florian Klink
3f4d3dbc5f gitlab-shell: 10.3.0 -> 11.0.0 2020-01-31 12:25:11 +01:00