1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 11:32:03 +00:00
Commit graph

2822 commits

Author SHA1 Message Date
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
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
Milan Pässler a43003d633 gitlab: 12.5.2 -> 12.5.3 2019-12-04 11:30:40 +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 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 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
Frederik Rietdijk 51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Jan Tojnar 30fae2883e
Merge branch 'master' into staging-next 2019-12-03 16:51:48 +01:00
Jan Tojnar 55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00
Frederik Rietdijk 9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +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
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