Commit graph

3087 commits

Author SHA1 Message Date
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
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