Commit Graph

1186 Commits

Author SHA1 Message Date
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
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
Mario Rodas
1d9531fa6c
gitAndTools.git-gone: 0.2.0 -> 0.3.0 2019-12-22 00:00:00 -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
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
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
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
Jan Tojnar
55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01: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
R. RyanTM
90604ee2da
gitAndTools.tig: 2.4.1 -> 2.5.0 2019-11-29 11:15:30 -08: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
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
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
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
Mario Rodas
ebde7664eb gitAndTools.git-subtrac: init at 0.01 2019-11-25 18:05:03 -08: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
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
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Renaud
9d0c1c1e84
Merge pull request #70210 from cko/git-extras
gitAndTools.git-extras: 4.7.0 -> 5.0.0
2019-11-12 20:30:44 +01:00
Christine Koppelt
6d9280ea0f gitAndTools.git-extras: 4.7.0 -> 5.0.0
For a list of changes and additions see: https://github.com/tj/git-extras/releases/tag/5.0.0
2019-11-12 19:14:34 +01:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Mario Rodas
58975005b2
gitAndTools.hub: 2.12.8 -> 2.13.0
Changelog: https://github.com/github/hub/releases/tag/v2.13.0
2019-11-06 16:20:00 -05:00
Tim Steinbach
0a9e548b2f
git: 2.23.0 -> 2.24.0 2019-11-04 09:35:15 -05:00
Alyssa Ross
4b63c915af
git: drop extraneous sysconfdir trailing slash
I noticed while strace-ing that Git was trying to open
/etc//gitconfig.  Not a big deal, but it is definitely more correct
without the trailing slash.
2019-11-03 21:26:56 +00:00
R. RyanTM
99f221538b gitAndTools.stgit: 0.20 -> 0.21 2019-11-03 10:04:16 +01:00
Mario Rodas
04cbe1b85b gitAndTools.delta: 0.0.12 -> 0.0.14 2019-10-24 10:14:39 +02:00
R. RyanTM
2202b9f774 git-secret: 0.3.1 -> 0.3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-secret/versions
2019-10-21 19:19:07 -07:00
Frank Doepper
bf12dc1ce7 git-annex-utils: init at 0.04-3-g531bb33 2019-10-15 14:41:24 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00