Commit Graph

1366 Commits

Author SHA1 Message Date
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
Asad Saeeduddin
4d67e30713
gitAndTools.git-interactive-rebase-tool: init 2020-02-02 10:09:28 +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
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
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
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
Tim Steinbach
a1d7308cf9
git: 2.24.1 -> 2.25.0 2020-01-13 19:22:51 -05: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
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
R. RyanTM
9bc1b6f8b9 gitAndTools.git-machete: 2.12.5 -> 2.12.6 2020-01-06 08:06:10 -08:00
royneary
8cc7acddda
gitAndTools.git-bug: 0.5.0 -> 0.6.0 2020-01-04 14:57:51 +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
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
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
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