Commit graph

1309 commits

Author SHA1 Message Date
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
Gürkan Gür e810171ef6 gitAndTools.gita: 0.9.2 -> 0.9.9 2019-10-12 14:47:43 +02:00
Jan Tojnar 6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
Marek Mahut ccc06a7e01
Merge pull request #70798 from r-ryantm/auto-update/subgit
gitAndTools.subgit: 3.3.7 -> 3.3.8
2019-10-11 22:08:47 +02:00
Mario Rodas 79ec4bb3d3
Merge pull request #70791 from r-ryantm/auto-update/stgit
gitAndTools.stgit: 0.19 -> 0.20
2019-10-09 21:37:09 -05:00
R. RyanTM 17ceba2174 gitAndTools.subgit: 3.3.7 -> 3.3.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subgit/versions
2019-10-08 15:07:19 -07:00
R. RyanTM ff81cf1186 gitAndTools.stgit: 0.19 -> 0.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/stgit/versions
2019-10-08 14:26:42 -07:00
Frederik Rietdijk a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
R. RyanTM e18f8b6909 gitAndTools.git-remote-hg: 1.0.0 -> 1.0.1
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-remote-hg/versions
2019-10-07 10:47:53 -07:00
Mario Rodas 7f1d646b80
gitAndTools.hub: 2.12.7 -> 2.12.8
Changelog: https://github.com/github/hub/releases/tag/v2.12.8
2019-10-06 04:20:00 -05:00
Mario Rodas 011c984b45
gitAndTools.delta: init at 0.0.12 2019-10-04 04:20:00 -05:00
Frederik Rietdijk 503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
Mario Rodas be7bc49504
gitAndTools.hub: 2.12.4 -> 2.12.7 2019-09-28 04:20:00 -05:00
Maximilian Bosch b7dbf33f5d
Merge pull request #69578 from r-ryantm/auto-update/git-secret
git-secret: 0.2.6 -> 0.3.1
2019-09-26 23:42:55 +02:00
R. RyanTM db7433dd77 git-secret: 0.2.6 -> 0.3.1
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-09-26 12:34:59 -07:00
Maximilian Bosch 460e603852
git-cola: build application with python3 by default 2019-09-26 20:37:03 +02:00
Maximilian Bosch 7c54149a25
Merge pull request #69564 from r-ryantm/auto-update/git-cola
git-cola: 3.4 -> 3.5
2019-09-26 20:32:06 +02:00
R. RyanTM 305d811a2d git-cola: 3.4 -> 3.5
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-cola/versions
2019-09-26 11:03:21 -07:00
R. RyanTM ea356329ca gitAndTools.diff-so-fancy: 1.2.6 -> 1.2.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-09-26 06:59:00 -07:00
Vladimír Čunát 192fb9d11b
Merge branch 'staging-next' into staging 2019-09-24 08:15:01 +02:00
Eric Ren 696b36f928 lefthook: init at 0.6.3 (#69233)
lefthook: init at 0.6.3
2019-09-22 16:18:08 -05:00
Matthew Bauer 0c1cef2f11
Merge pull request #68366 from sorbits/git-bash-completion
Install git’s bash completion so that it is loaded on demand
2019-09-18 09:40:52 -04:00
Roman Volosatovs ddbf8bd82e
ghq: Migrate to buildGoModule, ensure go 1.13 compatibility 2019-09-09 20:32:38 +02:00
Allan Odgaard dc45fc4ca2 Install git’s bash completion so that it is loaded on demand
Putting the file in $out/share/bash-completion/completions means that it will be loaded on demand by nixpkgs.bash-completion.

With the old location, the user would either have to explicitly source the file during bash startup, or set BASH_COMPLETION_COMPAT_DIR before sourcing bash_completion.sh, which will eagerly load everything in that directory.
2019-09-09 19:16:29 +02:00
Frederik Rietdijk 0107ee8c32
Merge pull request #68339 from NixOS/staging-next
Staging next with systemd 243
2019-09-09 10:02:20 +02:00
Frederik Rietdijk a96ef6cca5 git-cola: fix wrapping 2019-09-09 09:45:24 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Doron Behar 1ce20f23e7 gitAndTools.hub: 2.12.3 -> 2.12.4 2019-09-07 18:37:29 +00:00
Vladimír Čunát 4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
worldofpeace 59e68d3b74 treewide: don't use single quotes with placeholder 2019-09-03 13:01:42 -04:00
Vladimír Čunát f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
Yann Hodique a93a14e31c ghq: 0.10.2 -> 0.12.6 2019-08-31 17:59:29 -07:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Markus Kowalewski 388d6de5bd
gitAndTools.qgit: 2.8 -> 2.9
* switch name -> pname
* qtApps compatibility: use Qt's mkDerivation
* cmake: remove enableParallelBuilding
2019-08-26 13:17:05 +02:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Ryan Trinkle 3bc52453a4 git-subrepo: init at 0.4.0 (#67217)
* git-subrepo: init at 0.4.0

* Apply suggestions from code review

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2019-08-24 16:13:00 +02:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Peter Simons 59d3b6ee82
Merge pull request #66773 from Izorkin/git
git: 2.22.0 -> 2.23.0
2019-08-21 09:15:30 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Izorkin 6da7a17ffb git: 2.22.1 -> 2.23.0 2019-08-18 09:19:42 +03:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Jonathan Ringer 2b2d8919e8 pythonPackage.pre-commit: move to python-modules
Add pkgs.gitAndTools.pre-commit alias
  Add pkgs.pre-commit alias
2019-08-17 12:29:39 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Tim Steinbach ce1b77231a
git: 2.22.0 -> 2.22.1 2019-08-13 13:58:37 -04:00
Jonathan Ringer 4e19dfcb70 gitAndTools.topgit: 0.9 -> 0.19.12 2019-08-13 05:28:03 -07:00
zimbatm a0a0106f59
pre-commit: 1.17.0 -> 1.18.1 2019-08-12 09:34:23 +02:00
Wout Mertens f24e74d159
Merge pull request #53494 from kirelagin/git-instaweb
git, gitweb: Fix git-instaweb
2019-08-04 23:40:16 +02:00
Robin Gloster 30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
Robin Gloster cfa7177419
git-crypt: remove openssl 1.0.2 pinning 2019-07-30 13:51:17 +02:00
Frederik Rietdijk 92cb811455 git-cola: use qt5.wrapQtAppsHook 2019-07-30 13:16:18 +02:00
Andreas Rammhold 43ab7e184d
gitAndTools.git-dit: use openssl 1.0.2
There hasn't been a release in almost two years. Some (pinned)
dependency doesn't work with a newer openssl yet :/
2019-07-29 21:25:13 +02:00
Robin Gloster a22429bf05
pin some packages to openssl 1.0.2 for now 2019-07-29 21:25:10 +02:00
Frederik Rietdijk db6c38a075 Merge master into staging-next 2019-07-22 14:15:32 +02:00
Nick Novitski 7136e0d0a6 bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
Mario Rodas f06e19a594
gitAndTools.hub: 2.12.2 -> 2.12.3 2019-07-19 21:01:55 -05:00
Demin Dmitriy ea688c051d git: remove runtime dependency on gcc
Reduces gitMinimal closure size from 329.6M to 174.8M.

Fixes the issue https://github.com/NixOS/nixpkgs/issues/64350.

In git 2.22.0 git-stash is no longer a shell script and now it is just a symlink to git.
`postInstall` assumed that it was a shell script, tried to patch it and
ended up corrupting the file and made `strip` refuse stripping it.
2019-07-17 10:33:13 +02:00
Mario Rodas 3b1b51520d
Merge pull request #64973 from marsam/update-git-absorb
gitAndTools.git-absorb: 0.4.0 -> 0.5.0
2019-07-17 02:18:59 -05:00
Mario Rodas 81e1151d0f
Merge pull request #64963 from r-ryantm/auto-update/subgit
gitAndTools.subgit: 3.3.6 -> 3.3.7
2019-07-17 01:08:11 -05:00
Mario Rodas 620ee144d9
gitAndTools.git-absorb: 0.4.0 -> 0.5.0 2019-07-17 00:00:00 -05:00
worldofpeace 6394fa54df
Merge pull request #64936 from nicknovitski/man-git-crypt
git-crypt: include man pages in output
2019-07-16 22:00:47 -04:00
Nick Novitski 1e9373cb59 git-crypt: pname 2019-07-16 18:58:19 -07:00
Nick Novitski de99f28611 git-crypt: include man pages in output 2019-07-16 18:56:31 -07:00
R. RyanTM 908807bb53 gitAndTools.subgit: 3.3.6 -> 3.3.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subgit/versions
2019-07-16 18:42:52 -07:00
Mario Rodas e07ac44a35
gitAndTools.git-absorb: 0.3.0 -> 0.4.0 2019-07-14 19:00:00 -05:00
xrelkd 7a40b2fe8c gitAndTools.hub: 2.12.1 -> 2.12.2 2019-07-12 14:38:14 +08:00
Mario Rodas 9719889377
gitAndTools.git-gone: init at 0.1.2 2019-07-07 23:39:45 -05:00
Robert Scott 49283ed802 cgit: add patch fixing remote DoS
issue assigned MGASA-2019-0203 by mageia
https://www.openwall.com/lists/oss-security/2019/05/19/3
2019-07-07 21:01:50 +02:00
Rok Garbas 65781e204d
Remove me (garbas) as maintainer since I don't have much time to maintain anything 2019-07-03 11:27:39 +02:00
R. RyanTM e8ee15f56e gitAndTools.diff-so-fancy: 1.2.5 -> 1.2.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-07-03 09:30:31 +02:00
R. RyanTM 40a5daf5cb git-cola: 3.3 -> 3.4
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-cola/versions
2019-07-03 09:13:52 +02:00
Wael Nasreddine dc8740574c
pre-commit: 1.16.1 -> 1.17.0 (#64091) 2019-07-01 20:32:16 -07:00
Mario Rodas 76a9a0c246
gitAndTools.hub: 2.12.0 -> 2.12.1 2019-06-30 11:04:09 -05:00
José Luis Lafuente e295fd8137 git-recent: 1.1.0 -> 1.1.1 2019-06-30 13:37:58 +02:00
Frederik Rietdijk 72d647f3d8 Merge master into staging-next 2019-06-21 08:20:26 +02:00
Mario Rodas 233e75fc7b
Merge pull request #63254 from r-ryantm/auto-update/git-secret
git-secret: 0.2.5 -> 0.2.6
2019-06-20 06:03:32 -05:00
Franz Pletz 10812379fa libgit2: remove 0.26, default to 0.27 2019-06-18 11:16:48 +02:00
Mario Rodas 2870bf6ccd
gitAndTools.hub: 2.11.2 -> 2.12.0 2019-06-17 22:00:00 -05:00
R. RyanTM 591b08825b git-secret: 0.2.5 -> 0.2.6
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-06-16 17:03:00 -07:00
Peter Simons eeffb474bd
Merge pull request #56069 from delroth/git-diff-highlight
git: build diff-highlight if Perl support is enabled
2019-06-14 17:27:02 +02:00
Peter Simons fcc8e700a2
Merge pull request #62848 from dtzWill/update/git-2.22.0
git: 2.21.0 -> 2.22.0
2019-06-14 17:25:26 +02:00
pacien 4965343da0 cgit: patch and wrap filters 2019-06-11 15:27:56 +02:00
Will Dietz eeb9e6c762
git: 2.21.0 -> 2.22.0
https://github.com/git/git/blob/master/Documentation/RelNotes/2.22.0.txt
2019-06-07 20:55:34 -05:00
Mario Rodas 7419e47311
Merge pull request #62514 from r-ryantm/auto-update/python3.7-aspy.yaml
python37Packages.aspy-yaml: 1.1.2 -> 1.3.0
2019-06-02 13:24:07 -05:00
Mario Rodas da057da983
gitAndTools.pre-commit: 1.15.2 -> 1.16.1 2019-06-02 13:20:27 -05:00
Alyssa Ross 062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Maximilian Bosch bf93cdca0d
Merge pull request #62303 from marsam/init-gitAndTools.git-standup
gitAndTools.git-standup: init at 2.3.1
2019-06-01 02:50:37 +02:00
Mario Rodas 6e86ed9062 gitAndTools.lab: 0.15.3 -> 0.16.0 (#62301) 2019-05-31 10:57:17 -07:00
Mario Rodas 5675922458
gitAndTools.git-standup: init at 2.3.1 2019-05-31 04:20:00 -05:00
lewo 3213c6ca3d
Merge pull request #61116 from mmlb/add-gitstatus
gitAndTools.gitstatus: init at 20190506
2019-05-30 10:26:31 +02:00
Manuel Mendez c9d1a0d252 gitAndTools.gitstatus: init at unstable-2019-05-06 2019-05-28 11:57:09 -04:00
hyperfekt de5a9dea88 gitAndTools.transcrypt: query dependencies in helper scripts
adds a tool to get the paths of the dependencies needed by the helper scripts
(which are written only once and are never updated) to the output and patches
them to use it expand their path
2019-05-19 01:20:13 +09:00
hyperfekt 13b97cffae gitAndTools.transcrypt: add hidden dependencies 2019-05-19 01:20:13 +09:00
Renaud 7e082f01da
Merge pull request #61431 from r-ryantm/auto-update/svn-all-fast-export
gitAndTools.svn-all-fast-export: 1.0.13 -> 1.0.16
2019-05-13 23:51:27 +02:00
lewo 694b1c9e7d
Merge pull request #60653 from callahad/fast-export-v190107
gitAndTools.gitFastExport: (old) -> v190107
2019-05-13 11:53:17 +02:00
R. RyanTM 12ae350d36 gitAndTools.svn-all-fast-export: 1.0.13 -> 1.0.16
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/svn-all-fast-export/versions
2019-05-12 22:59:47 -07:00
Spencer Baugh 4b8803dae6 switch users of "gnupg1" to plain "gnupg"
gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
2019-05-12 20:08:50 +02:00
Dan Callahan 1d13eb119d
gitAndTools.gitFastExport: (old) -> v190107 2019-05-12 14:40:15 +01:00
Mario Rodas 14fa46a3f8
Merge pull request #60677 from royneary/git-bug-0.5.0
gitAndTools.git-bug: 0.4.0 -> 0.5.0
2019-05-03 10:50:08 -05:00
royneary 71a3f9f9e9 gitAndTools.git-bug: remove deps.nix 2019-05-03 17:13:14 +02:00
Mario Rodas 1b816da6c3
Merge pull request #60726 from r-ryantm/auto-update/pre-commit
gitAndTools.pre-commit: 1.15.1 -> 1.15.2
2019-05-03 06:30:45 -05:00
Alyssa Ross bcd07bbf74
Merge pull request #60391 from cohei/update-ghq
ghq: 0.8.0 -> 0.10.2
2019-05-02 16:29:38 +00:00
R. RyanTM 0a46fab9cb gitAndTools.pre-commit: 1.15.1 -> 1.15.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/pre-commit/versions
2019-05-02 00:33:58 -07:00
royneary 29678b9b7d gitAndTools.git-bug: fix --version output 2019-05-02 00:47:42 +02:00
royneary 70c2e3633a gitAndTools.git-bug: 0.4.0 -> 0.5.0 2019-05-01 23:44:44 +02:00
Gürkan Gür 7ef359f21b gitAndTools.gita: 0.8.2 -> 0.9.2 2019-04-30 22:23:52 +02:00
TANIGUCHI Kohei 0c8f9b8831 ghq: 0.8.0 -> 0.10.2 2019-04-29 04:57:52 +09:00
Mario Rodas 1e8ebd96ac
Merge pull request #60040 from woffs/gitflow-1.12.2
gitflow: 1.11.0 -> 1.12.2
2019-04-23 23:28:00 -05:00
Frank Doepper a5f4a13214 gitflow: 1.11.0.-> 1.12.2 2019-04-22 21:56:43 +02:00
Daniel Schaefer bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Joachim F 302a770a51
Merge pull request #59605 from montag451/git-annex-remote-dbx
git-annex-remote-dbx: init at 1.0.3
2019-04-21 07:43:03 +00:00
Maximilian Bosch f1c559057e
Merge pull request #59889 from sondr3/sondr3/git-ignore-1.0.0
git-ignore: 0.2.0 -> 1.0.0
2019-04-20 13:12:30 +02:00
Maximilian Bosch dd5ac26e78
git-ignore: split outputs
Use a separate `man` output[1]. All outputs will be installed when using
the package i.e. with `nix-env -f . -iA gitAndTools.git-ignore`.

[1] https://nixos.org/nix/manual/#ssec-derivation
2019-04-20 08:00:24 +02:00
Sondre Nilsen c5e963f36c
git-ignore: 0.2.0 -> 1.0.0 2019-04-19 16:34:40 +02:00
Robin Gloster afe4f8ace5
Merge pull request #59666 from r-ryantm/auto-update/pre-commit
gitAndTools.pre-commit: 1.14.4 -> 1.15.1
2019-04-17 18:12:39 +00:00
Alyssa Ross 2df0437695
Merge pull request #57730 from alyssais/git-remote-hg
gitAndTools.git-remote-hg: 0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2 -> 1.0.0
2019-04-16 09:37:05 +00:00
R. RyanTM 7b60fb4bb7 gitAndTools.pre-commit: 1.14.4 -> 1.15.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pre-commit/versions
2019-04-15 20:06:06 -07:00
montag451 7744ae3d77 git-annex-remote-dbx: init at 1.0.3 2019-04-15 17:10:17 +02:00
Will Dietz 4e3b5a0753 hub: 2.11.1 -> 2.11.2 (#59502)
https://github.com/github/hub/releases/tag/v2.11.2
2019-04-15 13:29:48 +02:00
Frederik Rietdijk d108b49168 Merge master into staging-next 2019-04-09 16:38:35 +02:00
Tim Steinbach f53ffadbc5
git: Add update script 2019-04-07 09:15:28 -04:00
Frederik Rietdijk 4a125f6b20 Merge master into staging-next 2019-04-07 08:33:41 +02:00
Ryan Mulligan 77f7764865
Merge pull request #58891 from r-ryantm/auto-update/subgit
gitAndTools.subgit: 3.2.4 -> 3.3.6
2019-04-05 09:36:08 -07:00
Jan Tojnar cb1a20499a
Merge branch 'master' into staging 2019-04-05 11:37:15 +02:00
R. RyanTM ca0fe4bd77 gitAndTools.subgit: 3.2.4 -> 3.3.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subgit/versions
2019-04-02 21:04:34 -07:00
Matthias Beyer a9d4d87f05 qgit: Fix meta.homepage
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2019-03-31 21:48:30 +02:00
Will Dietz b10d09901b gitAndTools.hub: 2.11.0 -> 2.11.1 2019-03-29 10:51:53 -05:00
Will Dietz 89e15afa66 gitAndTools.hub: 2.10.0 -> 2.11.0
https://github.com/github/hub/releases/tag/v2.11.0
https://github.com/github/hub/releases/tag/v2.10.2
https://github.com/github/hub/releases/tag/v2.10.1
2019-03-29 02:48:53 -05:00
Wael M. Nasreddine 5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Wael Nasreddine 52dae14f0c
buildGoModule: use go_1_12 instead of go_1_11 (#58103) 2019-03-21 20:40:07 -07:00
Will Dietz 31600452bc gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
https://github.com/zaquestion/lab/releases/tag/v0.15.3
2019-03-21 18:13:33 -07:00
Will Dietz 68ded8b4ec gitAndTools.lab: simplify by moving to buildGoModule! 2019-03-20 14:55:05 -05:00
Will Dietz 3d8170098f lab: generate and install zsh completion
Env variables are set to dummy values
so `lab` doesn't get stuck trying to helpfully
interact with user for initial configuration.
2019-03-20 14:55:04 -05:00
xeji bc92dd657b
Merge pull request #56376 from artemist/git-2.21.0
git: 2.19.2 -> 2.21.0
2019-03-16 00:29:54 +01:00
Alyssa Ross 58a1c542ca
gitAndTools.git-remote-hg: 0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2 -> 1.0.0
The current version no longer works with our packaged Mecurial.[1]

The original repository appears to no longer be maintained, but there is
a maintained fork, which is now used for the Debian package.

[1]: https://github.com/felipec/git-remote-hg/issues/72
2019-03-15 23:01:47 +00:00
talyz 3f1fdb8bf5 gitAndTools.gitRemoteGcrypt: Add missing dependencies (#57637)
Add the runtime dependencies coreutils, gawk, gnused and gnugrep.
2019-03-14 22:16:40 +01:00
Will Dietz ce6fada508 lab: manually fixup deps.nix to fix build (via 'replace' in go.mod) 2019-03-13 17:28:55 -05:00
Will Dietz 536f2696dc gitAndTools.lab: 0.14.0 -> 0.15.2
https://github.com/zaquestion/lab/releases/tag/v0.15.0
https://github.com/zaquestion/lab/releases/tag/v0.15.1
https://github.com/zaquestion/lab/releases/tag/v0.15.2
2019-03-13 17:28:53 -05:00
Jascha Geerds ffedc3e4a9 misc: Remove myself from list of maintainers
Unfortunately I don't have the time anymore to maintain those
packages.
2019-03-12 23:50:52 +01:00
R. RyanTM e954144fab gitAndTools.pre-commit: 1.14.2 -> 1.14.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pre-commit/versions
2019-03-11 11:51:54 -07:00
Gürkan Gür 0f87efb60c gitAndTools.gita: 0.7.2 -> 0.8.2 2019-03-04 16:31:03 +01:00
R. RyanTM 93109d5032 git-secrets: 1.2.1 -> 1.3.0 (#56677)
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-secrets/versions
2019-03-04 13:18:10 +01:00
R. RyanTM 3063f1332d gitAndTools.git-hub: 1.0.1 -> 1.0.3
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-hub/versions
2019-03-02 01:05:13 -08:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Will Dietz 46c4100552 gitAndTools.hub: simplify 2019-02-27 15:37:23 -06:00
Will Dietz 0185daf3ab gitAndTools.hub: 2.9.0 -> 2.10.0
https://github.com/github/hub/releases/tag/v2.10.0
2019-02-27 14:02:25 -06:00
Artemis Tosini fc917e5346
git: 2.19.2 -> 2.21.0 2019-02-25 19:21:45 +00:00
Sondre Nilsen 4e0b4a2f50 git-ignore: init at v0.2.0 (#56248)
A small program to quickly and easily fetch .gitignore templates from
www.gitignore.io
2019-02-25 16:47:18 +01:00
Matthew Bauer 73061742af Merge remote-tracking branch 'NixOS/master' into staging 2019-02-24 18:54:32 -05:00
Ryan Mulligan 6cdcc10016
Merge pull request #53465 from borisbabic/master
gitAndTools.pre-commit: 1.11.1 -> 1.14.2
2019-02-24 13:31:51 -08:00
Frederik Rietdijk 5871da418f Merge staging into python-unstable 2019-02-21 08:02:10 +01:00
Matthias Beyer f1f4f38909 Revert "Remove maintainership"
I'm baaaaack!

This patch reverts my patch where I removed myself as maintainer because
of my traveling. I'm back now and I want to maintain these packages
again.

This reverts commit ce1c1e3093.
2019-02-20 19:57:34 +01:00
Pierre Bourdon ce15dafc7d
git: build diff-highlight if Perl support is enabled
Fixes #27671.

git/git@0c977dbc81 made that script
require an extra build step.
2019-02-20 01:11:32 +01:00
worldofpeace 96ac29b2e0 gitAndTools.hub: 2.7.0 -> 2.9.0
We need to add git to PATH to build the manual
as they execute `hub version | tail -1` to get the version
to embed into it.

Though git is really only needed because it runs `git version`
as well.
2019-02-17 11:54:29 -05:00
Frederik Rietdijk d2c3fd5af0 Python: fix outfall after setting strictDeps = true; 2019-02-17 14:40:54 +01:00
Bob van der Linden 550852b617
git-cola: 3.2 -> 3.3 2019-02-17 13:52:23 +01:00
Will Dietz bbbf4b9037 git-extras: 4.6.0 -> 4.7.0
https://github.com/tj/git-extras/releases/tag/4.7.0
2019-02-11 17:23:06 -06:00
Gurkan 936c9f4118 gitAndTools.gita: init at 0.7.3 (#55533) 2019-02-11 11:24:43 +01:00
Markus Kowalewski 89e7e12cd3
qgit: add markuskowa as maintainer 2019-02-09 20:49:24 +01:00
Boris Babic 02a3a15bfd gitAndTools.pre-commit: 1.11.1 -> 1.14.2 2019-02-04 21:54:36 +01:00
Franz Pletz 7568981df9
Merge pull request #54923 from marsam/fix-lab-package
gitAndTools.lab: specify subPackages
2019-02-03 09:07:09 +00:00
R. RyanTM 3f864c454a gitAndTools.diff-so-fancy: 1.2.0 -> 1.2.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/diff-so-fancy/versions
2019-02-03 08:59:31 +00:00
Mario Rodas 048016e8c8
gitAndTools.lab: specify subPackages
Otherwise it builds an internal `docs` command.
2019-01-30 06:44:59 -05:00
Andreas Rammhold 4fbce625ed
gitAndTools.grv: use buildGoPackage instead of buildGo19Package 2019-01-30 01:16:18 +01:00
R. RyanTM 6c9493e92d git-secret: 0.2.4 -> 0.2.5
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-01-17 12:59:36 -08:00
Eelco Dolstra ac97ba25ae
Revert "libgit2: 0.26.6 → 0.27.7"
This reverts commit cc50638176 because
it breaks cargo (again, see fca4fbeba9):

  $ cargo build
      Updating crates.io index
  Segmentation fault
2019-01-11 14:58:45 +01:00
Andreas Rammhold 590f267c5b
gitAndTools.grv: 0.3.0 -> 0.3.1 2019-01-09 22:16:22 +01:00
Kirill Elagin 047def418e
git: Do not split gitweb output
This partially reverts 9029ed933c as
`git-instaweb`, which comes with git, needs on gitweb and having them in
separate outputs results in a cycle.
2019-01-06 16:14:49 +03:00
Kirill Elagin 813c6d4664
git, gitweb: Fix git-instaweb
* Make the build system embed the correct path to gitweb into git-instaweb
* Move gitweb fixups to the git expression, to make sure that gitweb
used by git-instaweb is functional
* This will increase the closure size of git, but only with perlSupport
2019-01-06 14:56:54 +03:00
Piotr Bogdan 4477dedfba gitAndTools.svn-all-fast-export: link with libsvn_fs-1 explicitly 2019-01-04 21:44:18 +00:00
Frederik Rietdijk 092e3b50a8 Merge master into staging-next 2019-01-02 21:08:27 +01:00
R. RyanTM 4bf76de51c gitAndTools.gitRemoteGcrypt: 1.1 -> 1.2 (#52312)
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-remote-gcrypt/versions
2019-01-01 19:55:43 +01:00
Frederik Rietdijk 070290bda7 Merge master into staging-next 2018-12-31 12:00:36 +01:00