Commit Graph

3316 Commits

Author SHA1 Message Date
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
worldofpeace
183e706767
Merge pull request #77082 from misuzu/git-workspace-init
gitAndTools.git-workspace: init at 0.4.1
2020-01-30 04:08:05 -05:00
misuzu
b81d1b1781 gitAndTools.git-workspace: init at 0.4.1 2020-01-30 10:33:51 +02:00
Frederik Rietdijk
dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Silvan Mosberger
80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Patrick Hilhorst
593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
Jon
0f3f0caf37
Merge pull request #78108 from filalex77/thicket-0.1.3
thicket: init at 0.1.3
2020-01-22 00:01:31 -08:00
R. RyanTM
8dbe996860 mercurial: 5.2.1 -> 5.2.2 2020-01-22 03:12:23 +00:00
Will Dietz
35363c3efa
gitAndTools.hub: 2.13.0 -> 2.14.1
https://github.com/github/hub/releases/tag/v2.14.1
https://github.com/github/hub/releases/tag/v2.14.0
2020-01-21 11:05:48 -06:00
Oleksii Filonenko
1e4c3f8dc8 thicket: init at 0.1.3 2020-01-20 15:52:26 +02:00
kolaente
8314e759a8
gitea: 1.10.2 -> 1.10.3 2020-01-18 09:56:41 +01:00
Frederik Rietdijk
bcd8c6b8dc Merge master into staging-next 2020-01-17 17:08:16 +01:00
Łukasz Jan Niemier
3d6c99a153 gitFull: support git send-email on Darwin 2020-01-16 21:36:29 +00:00
Robin Gloster
7b26075b13
Merge pull request #77624 from mayflower/gitlab-ce-assets-building
gitlab: fix asset building for CE
2020-01-16 20:23:26 +01:00
R. RyanTM
b467436ebb gitAndTools.git-subrepo: 0.4.0 -> 0.4.1 2020-01-15 12:57:58 +00:00
Frederik Rietdijk
2a88c3c302 Merge staging-next into staging 2020-01-15 09:23:28 +01:00
Florian Klink
8b44c1fe04
Merge pull request #77645 from flokli/gitlab-12.6.4
gitlab: 12.6.2 -> 12.6.4
2020-01-15 00:59:32 +01:00
Tim Steinbach
a1d7308cf9
git: 2.24.1 -> 2.25.0 2020-01-13 19:22:51 -05:00
Florian Klink
57560cc028 gitlab: 12.6.2 -> 12.6.4 2020-01-13 21:49:34 +01:00
Florian Klink
e1e61f31a3 gitaly: a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83 -> 1.77.1 2020-01-13 21:49:18 +01:00
Robin Gloster
6bf0ed8e02
gitlab: fix asset building for CE
We have to specify if we're building CE or EE otherwise at least some JS
building was broken, resulting in e.g. broken "boards" pages.
2020-01-13 15:57:11 +01:00
ryneeverett
f5e446b30f gitstatus: patch in variable rather than regexing
Patching in the GITSTATUS_DAEMON variable seems like a more stable
solution than doing inline replacements.
2020-01-12 22:21:25 +00:00
ryneeverett
be4efc8010 gitstatus: patch fewer characters
This is a followup to https://github.com/NixOS/nixpkgs/pull/76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See https://github.com/romkatv/gitstatus/pull/92.
2020-01-12 22:02:08 +00:00
Mario Rodas
bc6c029e12
gitAndTools.git-filter-repo: init at 2.25.0 2020-01-09 04:20:00 -05:00
Mario Rodas
f537f4a998
Merge pull request #77020 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.49 -> 1.50
2020-01-08 05:19:47 -05:00
Ryan Mulligan
fdf4002d70
Merge pull request #77098 from r-ryantm/auto-update/git-machete
gitAndTools.git-machete: 2.12.5 -> 2.12.6
2020-01-06 19:00:10 -08:00
Martin Weinelt
68106d9317 git-and-tools.gitstatus: unstable-2019-05-06 -> unstable-2019-12-18
Also bumps the interally used version of libgit2.
2020-01-06 21:49:15 +01:00
Jason Felice
de8700d42d mercurial_4: init at 4.9.1 2020-01-06 19:23:24 +01:00
R. RyanTM
9bc1b6f8b9 gitAndTools.git-machete: 2.12.5 -> 2.12.6 2020-01-06 08:06:10 -08:00
R. RyanTM
46736ce973 gerrit: 3.0.2 -> 3.1.2 2020-01-06 06:04:09 -08:00
R. RyanTM
fa28442ad5 cvs_fast_export: 1.49 -> 1.50 2020-01-06 00:38:27 -08:00
royneary
8cc7acddda
gitAndTools.git-bug: 0.5.0 -> 0.6.0 2020-01-04 14:57:51 +01:00
Maximilian Bosch
bef84a3d83
Merge pull request #76895 from Vskilet/gitea-update
gitea: 1.10.1 -> 1.10.2
2020-01-03 20:36:31 +01:00
Victor SENE
56ad7c630b
gitea: 1.10.1 -> 1.10.2 2020-01-03 19:27:06 +01:00
Florian Klink
cd9cbb1108
Merge pull request #76193 from talyz/gitlab-12.6.0
gitlab: 12.5.5 -> 12.6.2
2020-01-03 18:39:24 +01:00
Florian Klink
d075e33bf5 gitlab: 12.6.1 -> 12.6.2
- CVE-2019-20146
 - CVE-2019-20143
 - CVE-2019-20147
 - CVE-2019-20145
 - CVE-2019-20142
 - CVE-2019-20148
 - CVE-2020-5197
2020-01-02 23:09:53 +01:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Silvan Mosberger
59207c04b2
Merge pull request #76744 from bdesham/fix-gitstatus-patch
gitstatus: patch fewer lines
2020-01-01 03:06:57 +01:00
Benjamin Esham
054214057a gitstatus: patch fewer lines
The sed invocation was changing all lines matching "local daemon.*".
This changed the line it was supposed to, but two other lines that also
matched that pattern were being modified, which meant that the
"daemon_pid_var" and "daemon_pid" variables were not defined when they
should have been.
2019-12-31 10:29:08 -05:00
Peter Hoeg
a15efd8f73 git: upstream no longer ships .el files for emacs 2019-12-31 12:54:25 +08:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Jonathan Ringer
fca4359376 nbstripout: fix build 2019-12-30 16:46:55 +01:00
Frederik Rietdijk
bfa5af85b7 Merge staging-next into staging 2019-12-30 16:25:56 +01:00
Edmund Wu
90cc8993aa
srht: 0.54.4 -> 0.57.2 2019-12-30 10:20:19 -05:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Jonathan Ringer
4c28daa093 gitless: use python3 2019-12-30 09:45:37 +01:00
Edmund Wu
5ff450e83f
todosrht: fix build 2019-12-29 20:06:24 -05:00
Edmund Wu
d0c08d8d9b
scmsrht: fix build 2019-12-29 20:06:24 -05:00
Edmund Wu
e313963c05
listssrht: drop unidiff 2019-12-29 20:06:23 -05:00
Edmund Wu
889e5ca654
gitsrht: fix build 2019-12-29 20:06:23 -05:00
Edmund Wu
1360a0303d
srht: drop flask_login 2019-12-29 20:06:23 -05:00
Edmund Wu
9401dcc360
buildsrht: fix build 2019-12-29 20:06:22 -05:00
Edmund Wu
7845e28125
scmsrht: 0.16.0 -> 0.18.1 2019-12-29 20:06:22 -05:00
Edmund Wu
0282a909f7
todosrht: 0.51.13 -> 0.55.3 2019-12-29 20:06:21 -05:00
Edmund Wu
9ec305a493
pastesrht: 0.7.3 -> 0.9.2 2019-12-29 20:06:21 -05:00
Edmund Wu
8ded6650a7
metasrht: 0.37.0 -> 0.41.10 2019-12-29 20:06:21 -05:00
Edmund Wu
cce0d7ee57
mansrht: 0.13.5 -> 0.14.1 2019-12-29 20:06:20 -05:00
Edmund Wu
ef17a5092c
listssrht: 0.38.3 -> 0.40.3 2019-12-29 20:06:20 -05:00
Edmund Wu
85ff8f9f94
hgsrht: 0.16.2 -> 0.21.1 2019-12-29 20:06:20 -05:00
Edmund Wu
0b6cb53f5f
gitsrht: 0.35.6 -> 0.43.3 2019-12-29 20:06:19 -05:00
Edmund Wu
72fb1992ef
dispatchsrht: 0.12.3 -> 0.13.3 2019-12-29 20:06:19 -05:00
Edmund Wu
0ba8b3b67b
buildsrht: 0.48.0 -> 0.52.5 2019-12-29 20:06:18 -05:00
talyz
0825e382c0 gitlab: 12.6.0 -> 12.6.1 2019-12-28 14:00:04 +01:00
Maximilian Bosch
9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
markuskowa
09fcb16542
Merge pull request #76472 from r-ryantm/auto-update/yadm
yadm: 2.0.1 -> 2.3.0
2019-12-25 16:18:09 +01:00
Jörg Thalheim
d5a81030ec
mercurial: 4.9.1 -> 5.2.1 + python3 🚀 (#76126)
mercurial: 4.9.1 -> 5.2.1 + python3  🚀
2019-12-25 09:37:44 +00:00
R. RyanTM
111046404a yadm: 2.0.1 -> 2.3.0 2019-12-24 15:57:36 -08:00
Mario Rodas
4cd7c0f7d8
Merge pull request #76271 from r-ryantm/auto-update/git-machete
gitAndTools.git-machete: 2.12.2 -> 2.12.5
2019-12-23 10:58:15 -05:00
Jörg Thalheim
75760562dd gitAndTools.git-hub: 1.0.3 -> 1.1.0 2019-12-23 15:13:04 +00:00
R. RyanTM
e7ea379eb2 gitAndTools.git-machete: 2.12.2 -> 2.12.5 2019-12-23 06:48:48 -08:00
Mario Rodas
c382675f3a
Merge pull request #76251 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 5.0.0 -> 5.1.0
2019-12-23 08:36:00 -05:00
R. RyanTM
05bf7427b3 gitAndTools.git-extras: 5.0.0 -> 5.1.0 2019-12-23 03:54:27 -08:00
Jörg Thalheim
3e44c3461f
cvs_fast_export: 1.48 -> 1.49 (#76234)
cvs_fast_export: 1.48 -> 1.49
2019-12-23 09:44:26 +00:00
R. RyanTM
79115362fd cvs_fast_export: 1.48 -> 1.49 2019-12-23 00:44:31 -08:00
talyz
ff28cfa6d3 gitlab: 12.5.5 -> 12.6.0 2019-12-23 00:39:33 +01:00
talyz
a3c72e66a6 gitlab: update.py: Get go deps for gitlab-shell from the root dir
GitLab Shell now has the go.mod and go.sum files in the root of the
repo; the go subdirectory has been removed and all the code in it has
been moved up to the root.
2019-12-23 00:26:28 +01:00
talyz
445bc1494c gitaly: 1.72.1 -> a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83
For some reason this untagged commit is the one referred to in the
main repository; this might be a mistake, but we'll have to package it
for now to follow upstream.
2019-12-23 00:18:39 +01:00
talyz
2f614714ed gitlab-workhorse: 8.14.1 -> 8.18.0 2019-12-22 23:49:29 +01:00
talyz
6972aec884 gitlab-shell: 10.2.0 -> 10.3.0 2019-12-22 23:48:18 +01:00
Jörg Thalheim
7063f6f29a
tortoisehg: 5.0.2 -> 5.2.1
This version is not yet released. However given that python2 will soon
go end-of-life (without security updates), this seems like a good move.
The package was also lacking proper qt wrapping and unusable before.
2019-12-22 10:04:31 +00:00
Mario Rodas
1d9531fa6c
gitAndTools.git-gone: 0.2.0 -> 0.3.0 2019-12-22 00:00:00 -05:00
Aaron Andersen
5d9c7cda16 redmine: 4.0.5 -> 4.1.0 2019-12-21 10:21:54 -05:00
Jörg Thalheim
88a473fc12
mercurial: 4.9.1 -> 5.2.1
also switch to python3
2019-12-21 07:32:58 +00:00
Maximilian Bosch
85d4bfc94b
Merge pull request #76042 from evanjs/gitkraken-6.4.0
gitkraken: 6.3.1 -> 6.4.1
2019-12-20 23:17:42 +01:00
Evan Stoll
847fd1711d gitkraken: 6.4.0 -> 6.4.1 2019-12-20 07:10:26 -05:00
Florian Klink
1c15955340
Merge pull request #75834 from talyz/gitlab-12.5.5
gitlab: 12.5.4 -> 12.5.5
2019-12-19 21:15:23 +01:00
Evan Stoll
80d6b17035 gitkraken: 6.3.1 -> 6.4.0 2019-12-19 10:56:53 -05:00
Mario Rodas
cc99d54c5f
gitAndTools.lab: 0.17.1 -> 0.17.2
Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.2
2019-12-18 13:36:00 -05:00
talyz
7d602d3d36 gitlab: 12.5.4 -> 12.5.5 2019-12-17 22:18:10 +01:00
Mario Rodas
6b3720b395
Merge pull request #75675 from marsam/update-git-gone
gitAndTools.git-gone: 0.1.2 -> 0.2.0
2019-12-15 15:21:19 -05:00
Mario Rodas
fb112af09e
gitAndTools.git-gone: 0.1.2 -> 0.2.0 2019-12-14 20:20:20 -05:00
Jan Tojnar
429561978b
Merge branch 'master' into staging-next 2019-12-14 23:09:06 +01:00
Frederik Rietdijk
dfdf1597a7 Merge master into staging-next 2019-12-13 11:43:39 +01:00
Mario Rodas
76c69056bd
gitAndTools.lab: 0.17.0 -> 0.17.1 2019-12-13 00:00:00 -05:00
Mario Rodas
bc412904f1
gitAndTools.lab: 0.16.0 -> 0.17.0
Changelog: https://github.com/zaquestion/lab/releases/tag/v0.17.0
2019-12-11 18:18:18 -05:00
Florian Klink
c1541a6028
Merge pull request #75508 from flokli/gitlab-12.5.4
gitlab: 12.5.3 -> 12.5.4
2019-12-11 19:06:42 +01:00
Florian Klink
5bf07d665f gitlab: 12.5.3 -> 12.5.4
https://about.gitlab.com/blog/2019/12/10/critical-security-release-gitlab-12-5-4-released/

Insufficient parameter sanitization for Maven package registry could lead to privilege escalation and remote code execution vulnerabilities under certain conditions. The issue is now mitigated in the latest release and is assigned CVE-2019-19628.

When transferring a public project to a private group, private code would be disclosed via the Group Search API provided by Elasticsearch integration. The issue is now mitigated in the latest release and is assigned CVE-2019-19629.

The Git dependency has been upgraded to 2.22.2 in order to apply security fixes detailed here.

CVE-2019-19604 was identified by the GitLab Security Research team. For more information on that issue, please visit the GitLab Security Research Advisory

closes #75506.
2019-12-11 15:16:36 +01:00
Wout Mertens
697b44b631
Merge pull request #75406 from andersk/gitk-completion
git: Install bash-completion symlink for gitk
2019-12-11 15:00:36 +01:00
worldofpeace
69d5fd868d diffuse: remove 2019-12-10 22:39:04 -05:00
edef
8fe0c8c351 git: 2.24.0 -> 2.24.1
CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387,
CVE-2019-19604

Link: https://lore.kernel.org/git/xmqqr21cqcn9.fsf@gitster-ct.c.googlers.com/
2019-12-11 00:01:06 +00:00
Frederik Rietdijk
f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Tim Steinbach
68708349f1
git: Add git to update script
Otherwise the system's git will be used, which may not exist
or, as is the case with Ubuntu, not have the --sort flag for ls-remote.
2019-12-10 08:30:00 -05:00
Anders Kaseorg
a16dbef1c1 git: Install bash-completion symlink for gitk
Since bash-completion rules are loaded dynamically, the completion
rules for `gitk <Tab>` waere not being loaded until the user first
typed `git <Tab>`.  Fix this by adding a symlink named `gitk`.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-12-09 16:09:56 -08:00
Peter Simons
fa9159b0de
Merge pull request #73861 from xfix/git-enable-some-of-broken-tests
git: enable some of broken tests
2019-12-06 20:21:49 +01:00
Frederik Rietdijk
51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Milan Pässler
a43003d633 gitlab: 12.5.2 -> 12.5.3 2019-12-04 11:30:40 +01:00
Jan Tojnar
30fae2883e
Merge branch 'master' into staging-next 2019-12-03 16:51:48 +01:00
Ryan Mulligan
e81af522ad
Merge pull request #74695 from r-ryantm/auto-update/yadm
yadm: 1.12.0 -> 2.0.1
2019-12-02 07:55:15 -08:00
Jan Tojnar
55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00
Jan Tojnar
a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
Jonathan Ringer
05521bc61b sourcehut.listssrht: add pygit2 2019-11-30 09:31:58 -08:00
R. RyanTM
1e822c37f8 gitAndTools.subgit: 3.3.8 -> 3.3.9 (#74653) 2019-11-30 15:00:10 +01:00
Frederik Rietdijk
9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
R. RyanTM
7bc842b204 yadm: 1.12.0 -> 2.0.1 2019-11-29 14:09:49 -08:00
R. RyanTM
90604ee2da
gitAndTools.tig: 2.4.1 -> 2.5.0 2019-11-29 11:15:30 -08:00
Bruno Bigras
9314dc43b3 gitolite: wrap gitolite-shell
git wasn't found when used with services.fcgiwrap
for http auth
2019-12-08 12:26:02 +01:00
kolaente
c2682a0d28
gitea: 1.10.0 -> 1.10.1 2019-12-05 22:39:19 +01:00
Mario Rodas
691bebf68b gitAndTools.delta: 0.0.14 -> 0.0.15
Changelog: https://github.com/dandavison/delta/releases/tag/0.0.15
2019-12-05 14:24:16 +01:00
ilikeavocadoes
6c6abf444b yadm: add missing dependencies
* yadm: add missing dependencies (#73615)

* yadm: replace buildCommand with installPhase
This let the fixup phase compress man pages and patch shebangs
2019-11-29 14:12:32 +01:00
Konrad Borowski
6e6b6a7fd5 git: enable some of previously broken tests 2019-11-29 11:28:53 +01:00
Wout Mertens
acfa5d8324
Merge pull request #74213 from ruuda/fix-git-perl-support
git: fix the "perlSupport = false" configuration
2019-11-28 21:13:05 +01:00
Florian Klink
b5cbd81954 Revert "gitlab: fix updater shebang"
This reverts commit be6f3f69bf.

In fact, `yarn2nix-moretea.yarn2nix` should be available via `yarn2nix`
in nixpkgs master.
2019-11-28 16:15:07 +01:00
Jörg Thalheim
8c145dc0fb
git: build with python3
git-p4 seems to be python3 ready:

https://github.com/git/git/blob/master/git-p4.py#L32
2019-11-28 11:29:19 +00:00
Jörg Thalheim
7973b3cd5e
pythonPackages.bugseverywhere: removing, abandoned (#74441)
pythonPackages.bugseverywhere: removing, abandoned
2019-11-28 09:53:21 +00:00
Dima
611493595a pythonPackages.bugseverywhere: removing, abandoned
This package has been abandoned by upstream, with the last version
being from 2012. This is being removed due to python 3 incompatibility.
2019-11-28 08:47:52 +01:00
Jonathan Ringer
0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
Florian Klink
f1c7891c8d
Merge pull request #74278 from talyz/gitlab-12.5.0
gitlab: 12.4.3 -> 12.5.0
2019-11-28 00:52:31 +01:00
Florian Klink
deb0049ca0 gitlab-workhorse: 8.14.0 -> 8.14.1 2019-11-28 00:18:03 +01:00
Florian Klink
02eae2c3aa gitaly: 1.72.0 -> 1.72.1 2019-11-28 00:17:50 +01:00
Florian Klink
00f4760cdc gitlab: 12.5.0 -> 12.5.2 2019-11-28 00:17:30 +01:00
Florian Klink
be6f3f69bf gitlab: fix updater shebang 2019-11-28 00:17:17 +01:00
Ruud van Asseldonk
2163fc7f0a git: fix the "perlSupport = false" configuration
When perlSupport = false, we will set NO_PERL=1, and build Git without
Perl support. This is a build option that Git supports. However, Git's
test suite still requires a Perl to be available to run the tests, and
we did not provide one. The tests respect PERL_PATH, and if it is not
set, they default to /usr/bin/perl.

Before this commit, if we set "perlSupport = false", then no Perl would
be available to the package, and so the tests would default to
/usr/bin/perl. When building without a sandbox, that could still work,
even though there is no "perl" on the path, because the tests defaulted
to an absolute path.

You can reproduce this issue as follows:

    nix-build -E 'let pkgs = (import ./default.nix) {}; in pkgs.git.override { perlSupport = false; }'

I just ran into this when trying to build pkgs.git from an old version
of Nixpkgs that I was able to build just fine in the past, and today it
would not build any more, complaining when running the tests:

    make -C t/ all
    make[1]: Entering directory '/build/git-2.18.0/t'
    rm -f -r 'test-results'
    /nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash: /usr/bin/perl: No such file or directory

In the past the sandbox was not enabled by default, so then it worked
for me. But now that it is enabled, my host's (not NixOS) /usr/bin/perl
is no longer accessible, and the build fails.

The solution is to explicitly set PERL_PATH when running the tests. This
*almost* works, except that there appears to be a bug in the test for
"git request-pull". That command is a Bash script that calls Perl at
some point, so it requires Perl, and therefore it cannot be supported
when NO_PERL=1. But that particular test does not check whether Git was
compiled with Perl support (other tests do include that check), and that
makes the test fail:

    t5150-request-pull.sh ..............................
    not ok 4 - pull request after push
    not ok 5 - request asks HEAD to be pulled
    not ok 6 - pull request format
    not ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison
    not ok 9 - pull request with mismatched object
    not ok 10 - pull request with stale object
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 6/10 subtests

This output makes sense if you look at t5150-request-pull.sh. Test 1 and
2 are setup steps. Test 3 does call request-pull, but it expects the
command to fail, and it cannot distinguish between the command exiting
with a nonzero exit code, or failing to start it at all. So test 3
passes for the wrong reasons. Test 4 through 10 all call request-pull,
so they fail.

The quick workaround here is to disable the test. I will look into
upstreaming a patch that makes the test skip itself when Perl is
disabled.
2019-11-27 19:23:56 +01:00
Julian Stecklina
00ad233d3c gitAndTools.git-machete: 2.12.1 -> 2.12.2 2019-11-27 18:54:25 +02:00
talyz
ce2aa10765 gitlab: 12.4.3 -> 12.5.0 2019-11-26 17:32:01 +01:00
R. RyanTM
c74aee8d32 gource: 0.49 -> 0.51 2019-11-26 00:13:50 -08:00
Mario Rodas
ebde7664eb gitAndTools.git-subtrac: init at 0.01 2019-11-25 18:05:03 -08:00
Frederik Rietdijk
06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
Florian Klink
e0734891f8
Merge pull request #73857 from petabyteboy/feature/gitlab-12-4-3
gitlab: 12.4.2 -> 12.4.3
2019-11-25 20:41:26 +01:00
Mario Rodas
8fa885e8d4
Merge pull request #74049 from anderslundstedt/master
git-subrepo: enable on Darwin
2019-11-24 14:26:32 -05:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Anders Lundstedt
fb0699d6bd git-subrepo: enable on Darwin 2019-11-24 16:42:34 +01:00
worldofpeace
27421fc6f0
Merge pull request #73907 from blitz/git-machete
git-machete: init at 2.12.1
2019-11-24 13:22:25 +00:00
Julian Stecklina
54a15bb2ec git-machete: init at 2.12.1 2019-11-24 15:08:55 +02:00
Frederik Rietdijk
1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
Milan Pässler
7e0127e1ca tree-wide: inherit yarn2nix from yarn2nix-moretea 2019-11-24 01:04:26 +01:00
Daiderd Jordan
7da9844fde
Merge pull request #73826 from LnL7/darwin-git
git: disable failing test on darwin
2019-11-22 21:27:49 +01:00
Daiderd Jordan
185e30c664
git: disable failing test on darwin
The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18,
it's possible utf-8 normalisation is causing different behaviour here.

    not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a
    not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a
    not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
    not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 4/145 subtests
            (less 48 skipped subtests: 93 okay)
2019-11-22 21:02:21 +01:00
Mario Rodas
31a9f6a341 pijul: fix build 2019-11-21 19:08:06 -08:00
Milan Pässler
f53fe02ff0 gitlab: 12.4.2 -> 12.4.3 2019-11-21 09:35:56 +00:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00