Commit graph

3029 commits

Author SHA1 Message Date
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
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
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
Frederik Rietdijk 51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Milan Pässler a43003d633 gitlab: 12.5.2 -> 12.5.3 2019-12-04 11:30:40 +01:00
Jan Tojnar 30fae2883e
Merge branch 'master' into staging-next 2019-12-03 16:51:48 +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 55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01: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 9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +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
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
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
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
Daiderd Jordan 7da9844fde
Merge pull request #73826 from LnL7/darwin-git
git: disable failing test on darwin
2019-11-22 21:27:49 +01: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
Mario Rodas 31a9f6a341 pijul: fix build 2019-11-21 19:08:06 -08:00
Milan Pässler f53fe02ff0 gitlab: 12.4.2 -> 12.4.3 2019-11-21 09:35:56 +00:00
Frederik Rietdijk 10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk 65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
Frederik Rietdijk 5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
Michael Weiss f7b894e031
gitRepo: 1.13.7.1 -> 1.13.8 2019-11-19 11:08:58 +01:00
adisbladis dcfc821c6c
treewide: Stop using Qt 5.9 2019-11-18 20:10:43 +00:00
adisbladis c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
kolaente 8d5a0e1ef1
gitea: 1.9.5 -> 1.10.0 2019-11-18 20:36:35 +01:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
kolaente c5939e67cd
gitea: 1.9.5 -> 1.9.6 2019-11-14 20:09:55 +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
Paweł Kruszewski a2a5c65529 bcompare: 4.3.1.24438 -> 4.3.2.24472
(#72614)
2019-11-09 16:15:25 +01:00
Evan Stoll 67a0fafc49 gitkraken: 6.3.0 -> 6.3.1 (#73048) 2019-11-08 15:29:46 +00:00
Florian Klink a2429cffa3
Merge pull request #72894 from talyz/gitlab-12.4.2
gitlab: 12.4.1 -> 12.4.2
2019-11-08 15:23:39 +01:00
Matthew Bauer 5ebd36403e
Merge pull request #70641 from maggesi/rename-z77z-into-maggesi
Rename z77z into maggesi
2019-11-07 17:18:20 -05: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
Aaron Andersen c22e76e450
Merge pull request #71605 from aanderse/redmine-cleanup
redmine: drop 3.4.x package, 4.0.4 -> 4.0.5
2019-11-06 18:02:48 -05:00
Jan Tojnar 3f2a425da3
Merge branch 'staging-next' into staging 2019-11-06 18:10:57 +01:00
talyz a779d7751e gitlab: 12.4.1 -> 12.4.2 2019-11-06 10:56:20 +01:00
talyz 22302ce845 gitlab: Limit node memory consumption to 2048MB
Hydra fails to build the assets on i686 - it runs out of memory. If we
limit the max consumption to 2048MB the assets still build, and will
hopefully also build on hydra.
2019-11-06 10:56:20 +01:00
talyz a30facc96e gitlab: Don't build any gitlab component outside linux
For some reason hydra seems to have issues downloading the
gitlab-workhorse source on macOS. Since we don't build the rails app
for macOS, the other components seem a bit useless there, so we
limit them to linux for now.
2019-11-06 10:56:20 +01:00
Gabriel Ebner c89b97e023 git-sizer: 1.0.0 -> 1.3.0 2019-11-05 18:36:00 +01:00
Frederik Rietdijk c4e30cf98c Merge staging-next into staging 2019-11-05 14:18:08 +01:00
Tim Steinbach 0a9e548b2f
git: 2.23.0 -> 2.24.0 2019-11-04 09:35:15 -05:00
Robert Hensing 64a8f2e48d
Merge pull request #71301 from nathyong/p4v-openssl-patch
p4v: explicitly depend on openssl 1.0 series
2019-11-04 14:35:43 +01:00
Edmund Wu 8fea620113 sourcehut.gitsrht: build git-srht-shell 2019-11-04 01:46:59 -08:00
Edmund Wu 9051e284ce sourcehut.core: fix build 2019-11-04 01:46:59 -08:00
Edmund Wu 78bbf841ea scmsrht: 0.15.3 -> 0.16.0 2019-11-04 01:46:59 -08:00
Edmund Wu 09570b1b0c todosrht: 0.51.11 -> 0.51.13 2019-11-04 01:46:59 -08:00
Edmund Wu 0d487aef71 pastesrht: 0.7.1 -> 0.7.3 2019-11-04 01:46:59 -08:00
Edmund Wu eb9b2ac6a0 metasrht: 0.35.3 -> 0.37.0 2019-11-04 01:46:59 -08:00
Edmund Wu 2269781690 hgsrht: 0.16.0 -> 0.16.2 2019-11-04 01:46:59 -08:00
Edmund Wu 7967cb05ad gitsrht: 0.34.2 -> 0.35.6 2019-11-04 01:46:59 -08:00
Edmund Wu 257f5d6303 dispatchsrht: 0.11.1 -> 0.12.3 2019-11-04 01:46:59 -08:00
Edmund Wu 9bc8540d86 buildsrht: 0.47.9 -> 0.48.0 2019-11-04 01:46:59 -08:00
Edmund Wu 21529a91d9 srht: 0.54.3 -> 0.54.4 2019-11-04 01:46:59 -08: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
Maximilian Bosch 945a52c90d
Merge pull request #72382 from kolaente/update/gitea-1.9.5
gitea: 1.9.4 -> 1.9.5
2019-11-01 11:33:59 +01:00
kolaente 67d0e44dc7
gitea: 1.9.4 -> 1.9.5 2019-10-31 20:33:22 +01:00
talyz 2e8417b52a gitlab: 12.4.0 -> 12.4.1 2019-10-31 18:55:08 +01:00
Vincent Laporte 7e51c79f17 monotoneViz: refactor out of ocamlPackages 2019-10-30 18:05:20 +00:00
worldofpeace 9121c914fc
Merge pull request #54530 from MatrixAI/dvc
dvc: init at 0.24.3
2019-10-29 01:14:50 +00:00
talyz 5081a6cd56 gitlab: 12.3.5 -> 12.4.0
- gitlab-shell no longer requires ruby for anything else than the
  install script, so the bundlerEnv stuff could be dropped

- gitlab-shell and gitlab-workhorse now report their versions
  correctly
2019-10-28 14:56:37 +01:00
Pawel Kruszewski 7d43ee015a bcompare: 4.3.0.24364 -> 4.3.1.24438 2019-10-28 08:22:46 +01:00
Roger Qiu 3c3ac19c43
dvc: init at 0.24.3 2019-10-28 13:07:58 +11:00
Aaron Andersen 9ec808ae62 redmine: 4.0.4 -> 4.0.5 2019-10-26 10:40:31 -04:00
Aaron Andersen 50e5139893 redmine: drop 3.4.x package 2019-10-26 10:40:16 -04:00
Mario Rodas 9e5a30b43e git-backup: init at 0.2.0 2019-10-24 18:50:34 -07:00
Mario Rodas 04cbe1b85b gitAndTools.delta: 0.0.12 -> 0.0.14 2019-10-24 10:14:39 +02:00
Dmitry Kalinkin e98a2d752c
Merge pull request #71483 from eadwu/sourcehut/update-2
sourcehut: update 2
2019-10-23 17:39:18 -04:00
Michael Weiss 597881a9e1
gitRepo: 1.13.7 -> 1.13.7.1 2019-10-22 21:23:49 +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
Florian Klink 1125fb02cc
Merge pull request #71428 from talyz/gitlab-already-initialized-constant
gitlab: Get rid of most 'already initialized constant'-warnings
2019-10-21 20:52:54 +02:00
Edmund Wu ec6740ab8d
scmsrht: 0.14.2 -> 0.15.3 2019-10-20 21:51:06 -04:00
Edmund Wu e481e10632
pastesrht: 0.5.2 -> 0.7.1 2019-10-20 21:50:54 -04:00
Edmund Wu cc64ae180f
metasrht: 0.35.2 -> 0.35.3 2019-10-20 21:50:49 -04:00
Edmund Wu ea1d0ce7ff
listssrht: 0.38.1 -> 0.38.3 2019-10-20 21:50:35 -04:00
Edmund Wu 815a204aa1
hgsrht: 0.15.2 -> 0.16.0 2019-10-20 21:50:21 -04:00
Edmund Wu d1f0cbd4fe
gitsrht: 0.33.1 -> 0.34.2 2019-10-20 21:50:16 -04:00
Edmund Wu 690ffc9761
buildsrht: 0.47.8 -> 0.47.9 2019-10-20 21:49:55 -04:00
Edmund Wu 7ebc8ded84
srht: 0.54.2 -> 0.54.3 2019-10-20 21:49:40 -04:00
talyz ed4a09c6f3 gitlab: Get rid of most 'already initialized constant'-warnings
On start, unicorn, sidekiq and other parts running ruby code emits
quite a few warnings similar to

/var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
/var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here

This seems to be caused by the same ruby files being evaluated
multiple times due to the paths being different - sometimes they're
loaded using the direct path and sometimes through a symlink, due to
our split between config and package data. To fix this, we make sure
that the offending files in the state directory always reference the
store path, regardless of that being the real file or a symlink.
2019-10-19 19:30:28 +02:00
Evan Stoll 9deca47b33 gitkraken: 6.2.1 -> 6.3.0 (#71294)
* gitkraken: 6.2.1 -> 6.3.0

* gitkraken: run preInstall and postInstall hooks during installPhase

* gitkraken: move dpkg to nativeBuildInputs
2019-10-18 18:26:12 +02:00
Nathan Yong 1ced63da76 p4v: explicitly depend on openssl 1.0 series
The 2017.3 version of p4v is linked against `libssl.so.1.0.0`.  Since
the default openssl in NixOS 2019.09 has been changed to openssl 1.1,
the p4v package must now import the openssl_1_0_2 derivation.
2019-10-18 09:26:28 +11:00
Frank Doepper bf12dc1ce7 git-annex-utils: init at 0.04-3-g531bb33 2019-10-15 14:41:24 +02:00
Marco Maggesi 24d0bd37b5
Merge branch 'master' into rename-z77z-into-maggesi 2019-10-13 18:06:23 +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
Renaud 05ab1cc756
Merge pull request #70950 from ktor/bcompare-4.3.0.24364
bcompare: 4.2.10.23938 -> 4.3.0.24364
2019-10-11 23:46:58 +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
Pawel Kruszewski eaa72aa453 bcompare: 4.2.10.23938 -> 4.3.0.24364 2019-10-11 06:14:23 +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
Dmitry Kalinkin a7b3728c64
Merge pull request #70255 from eadwu/sourcehut/update-1
sourcehut.*: 2019.10.02
2019-10-09 12:50:58 -04:00
Michael Weiss bd16602cb9
gitRepo: 1.13.6 -> 1.13.7 2019-10-09 18:02:22 +02:00
Elis Hirwing 79852ae24a
Merge pull request #70777 from kolaente/update/gitea-1.9.4
gitea: 1.9.3 -> 1.9.4
2019-10-09 09:34:45 +02:00
Robin Gloster eadeca9ea7
Merge pull request #70216 from talyz/gitlab_12_3_2
gitlab: 12.1.6 -> 12.3.5, bundler: 1.17.2 -> 1.17.3
2019-10-09 00:27:04 +02: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
kolaente 7c087faeb8
gitea: 1.9.3 -> 1.9.4 2019-10-08 21:11:07 +02:00
talyz c115d4df88 gitlab: Add myself to list of maintainers 2019-10-08 16:37:01 +02:00
talyz 9be76d0b6a gitlab: 12.3.4 -> 12.3.5 2019-10-08 16:35:50 +02:00
talyz afa3abf632 gitlab: Refactor for new repo structure
GitLab recently restructured their repos; whereas previously they had
one gitlab-ce and one gitlab-ee repo, they're now one and the
same. All proprietary components are put into the ee subdirectory -
removing it gives us the foss / community version of GitLab. For more
info, see
https://about.gitlab.com/2019/02/21/merging-ce-and-ee-codebases/

This gives us the opportunity to simplify things quite a bit, since we
don't have to keep track of two separate versions of either the base
data or rubyEnv.
2019-10-08 15:52:11 +02:00
Frederik Rietdijk a0c34f54cc Merge master into staging-next 2019-10-08 11:56:52 +02:00
talyz 59324d1fb9 gitlab: Build frontend assets from source
Instead of extracting prebuilt assets from the debian build, build
them from the source. This should give faster package updates and
reduces the amount of data needed to be downloaded by more than 500MB.
2019-10-08 11:24:06 +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
R. RyanTM 55023876bd fossil: 2.9 -> 2.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fossil/versions
2019-10-07 10:23:52 -07:00
Marco Maggesi ff1ed720e2 Rename z77z into maggesi
Make the "handle" of the maintainer match the name of the github account.
Also update the email address.
2019-10-07 17:05:25 +02:00
Renaud 61d745e571
Merge pull request #69959 from r-ryantm/auto-update/src
src: 1.26 -> 1.27
2019-10-06 16:45:44 +02:00
Edmund Wu 55d5a90182
sourcehut.srht: unmark as broken 2019-10-06 08:48:40 -04:00
Edmund Wu c4ce930c23
sourcehut.*: fix setuptools validation 2019-10-06 08:48:32 -04: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
Christine Koppelt ee06d27cf2 treewide: add some missing meta: descriptions and homepages (#70497) 2019-10-06 00:59:26 -04:00
Edmund Wu 2c16a2498c
scmsrht: 0.13.3 -> 0.14.2 2019-10-05 10:45:49 -04:00
Edmund Wu 748f4b1a78
todosrht: 0.46.8 -> 0.51.11 2019-10-05 10:45:44 -04:00
Edmund Wu 21e541520f
pastesrht: 0.5.1 -> 0.5.2 2019-10-05 10:45:34 -04:00
Edmund Wu 5fe13e341b
metasrht: 0.34.3 -> 0.35.2 2019-10-05 10:45:30 -04:00
Edmund Wu bf7cce0418
mansrht: 0.12.4 -> 0.13.5 2019-10-05 10:45:24 -04:00
Edmund Wu f71bf95ffb
listssrht: 0.36.3 -> 0.38.1 2019-10-05 10:45:15 -04:00
Edmund Wu 9fecb93740
hgsrht: 0.13.0 -> 0.15.2 2019-10-05 10:45:02 -04:00
Edmund Wu 3c842a91a0
gitsrht: 0.32.3 -> 0.33.1 2019-10-05 10:44:52 -04:00
Edmund Wu facecca784
dispatchsrht: 0.11.0 -> 0.11.1 2019-10-05 10:44:46 -04:00
Edmund Wu c503f76409
buildsrht: 0.45.13 -> 0.47.8 2019-10-05 10:44:43 -04:00
Edmund Wu 093ea80e98
srht: 0.52.13 -> 0.54.2 2019-10-05 10:44:28 -04:00
Linus Heckemann 141b7210cb
Merge pull request #70256 from Ma27/drop-nodejs-11_x
nodejs-11_x: remove
2019-10-04 18:14:15 +02:00
talyz 09e657efea gitlab-shell: Split patch into ruby and go parts
Split the remove-hardcoded-locations patch into two separate patches,
one for the ruby package and one for the go package. This is clearer
and results in fewer rebuilds.
2019-10-04 18:06:23 +02:00
talyz f3eb063ecf gitlab: 12.1.6 -> 12.3.4
- Update GitLab to 12.3.4

- Update update.py to cope with the new upstream repository structure

- Refactor gitlab-shell to use buildGoPackage and bundlerEnv for
  dependencies

- Refactor gitlab-workhorse to use buildGoPackage for dependencies

- Make update.py able to update gitlab-shell and gitlab-workhorse
  dependencies

- Various fixes necessary for update to work
2019-10-04 18:03:05 +02:00
Mario Rodas 011c984b45
gitAndTools.delta: init at 0.0.12 2019-10-04 04:20:00 -05:00
Maximilian Bosch 594378ceea
sourcehut: mark as broken
There were several custom python dependencies broken. I decided to
modify the `sourcehut` expression as it wouldn't even evaluate without
nodejs-11_x I didn't manage to get it building.
2019-10-03 14:33:34 +02:00
Maximilian Bosch 334641d112
nodejs-11_x: remove
Package is EOLed by upstream: https://github.com/nodejs/Release

Fixes #69008
2019-10-03 14:33:34 +02:00
Dmitry Kalinkin c83db0cc53
sourcehut: use recurseIntoAttrs 2019-10-02 23:40:47 -04:00
Jan Tojnar b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00
Jonathan Ringer fe24628a26 git-up: 1.4.2 -> 1.6.1 2019-10-03 00:19:33 +02:00
Evan Stoll cdc963c5f3 gitkraken: 6.2.0 -> 6.2.1 2019-10-02 22:55:04 +02:00
Frederik Rietdijk 503081fa5b Merge staging into staging-next 2019-09-29 11:05:22 +02:00
R. RyanTM 7f33507e85 src: 1.26 -> 1.27
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions
2019-09-28 20:46:00 -07: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
Orivej Desh dc4224bc54 Merge branch 'master' into staging
* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
2019-09-22 21:33:00 +00: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
Mario Rodas 9e968db302 git-lfs: use buildGoPackage 2019-09-21 04:34:00 -05:00
worldofpeace b0c2aea20b
treewide: drop adding hicolor-icon-theme where possible
This was either for the setup-hook to remove caches or added
even though the respective icon theme propagated it.
2019-09-18 22:47:26 +02:00
Jan Tojnar f5ef80b46d
Merge branch 'staging-next' into staging 2019-09-18 21:16:01 +02: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
Michael Weiss 1c8ed8fd7e
gitRepo: 1.13.5.1 -> 1.13.6 2019-09-17 21:28:29 +02:00
worldofpeace 2fe6173cc6
Merge pull request #68455 from rvolosatovs/update/git-lfs
git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13 compatibility
2019-09-17 13:26:38 -04:00
Aaron Andersen 7e5098a4eb
Merge pull request #68619 from evanjs/feature/gitkraken-6.2.0
gitkraken: 6.1.4 -> 6.2.0
2019-09-15 09:39:12 -04:00
Miguel Madrid Mencía 148c82e07e
maintainer: mimadrid: update github username and personal data 2019-09-14 12:15:46 +02:00
Evan Stoll 62195d4609 gitkraken: 6.1.4 -> 6.2.0 2019-09-12 17:39:50 -04:00
Roman Volosatovs 9630cb4b8d
git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13 compatibility 2019-09-10 22:55:30 +02: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
Frederik Rietdijk e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Marek Mahut 462cdb9aac
Merge pull request #68255 from jluttine/nbstripout-0.3.6
nbstripout: 0.3.1 -> 0.3.6
2019-09-08 22:38:13 +02:00
Elis Hirwing 8b71bb0ad4
gitea: 1.9.2 -> 1.9.3
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.9.3
2019-09-07 22:25:14 +02:00
Doron Behar 1ce20f23e7 gitAndTools.hub: 2.12.3 -> 2.12.4 2019-09-07 18:37:29 +00:00
Jaakko Luttinen 8b51ee3667
nbstripout: 0.3.1 -> 0.3.6 2019-09-07 14:43:43 +03:00
Milan Pässler 1d6c542b22 gerrit: 2.14.6 -> 3.0.2 2019-09-06 22:01:22 +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
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
Michael Weiss 3c6d4d7e06
gitRepo: 1.13.5 -> 1.13.5.1 2019-08-30 22:54:27 +02:00
Michael Weiss a66012b3ec
gitRepo: 1.13.4 -> 1.13.5 2019-08-30 17:53:58 +02: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
Marek Mahut d41b832ac2
Merge pull request #67442 from jlesquembre/blackbox
blackbox: 1.20170611 -> 1.20181219
2019-08-25 18:35:17 +02:00
José Luis Lafuente 25cae26c54
blackbox: 1.20170611 -> 1.20181219 2019-08-25 15:25:51 +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
worldofpeace a980a2c3ca
Merge pull request #62708 from ktor/bcompare-4.2.10.23938
bcompare: init at 4.2.10.23938
2019-08-24 11:38:42 -04: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
Pawel Kruszewski 803108a1a6 bcompare: init at 4.2.10.23938 2019-08-23 19:01:32 +02:00
Robin Gloster 2cc05be907
treewide: openssl_1_1 pinning is unnecessary 2019-08-23 02:02:50 +02:00
Robin Gloster c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
kolaente 3ddb1a09fc
gitea: 1.9.1 -> 1.9.2 2019-08-22 19:38:21 +02:00
Evan Stoll 6d74533300 gitkraken: 6.1.3 -> 6.1.4 2019-08-21 13:00:22 -04: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
markuskowa 7bc147a496
Merge pull request #66810 from evanjs/feature/gitkraken-6.1.3
gitkraken: 6.1.1 -> 6.1.3
2019-08-18 19:14:59 +02:00
Danylo Hlynskyi a2ea2a1945
tortoisehg: untie from mercurial and update to 5.0.2 (#66173)
* tortoisehg: untie from mercurial

When I've added `tortoisehg` package, it turned out that mercurial updates
sometimes broke thg. I've added a comment to `mercurial/default.nix` to
update torotisehg version during mercurial updates, but this worked the other way round:
mercurial stopped to be updated regularly (https://github.com/NixOS/nixpkgs/pull/60993).

And sadly it didn't solve the issue - https://github.com/NixOS/nixpkgs/issues/61759.

Here I'm trying to untie them. Tortoisehg will build a custom mercurial package
if versions don't match. This makes updating tortoisehg more complicated,
but it is still better than current situation.

* expose custom mercurial from thg package
2019-08-18 18:28:03 +03:00
Florian Klink 36ece762e5
Merge pull request #66621 from flokli/gitlab-12.1.6
gitlab-ce: 12.0.3 -> 12.1.6
2019-08-18 14:08:14 +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
Evan Stoll 0be1f764fb gitkraken: add evanjs to maintainers 2019-08-17 22:04:47 -04:00
Evan Stoll 58b482987e gitkraken: remove gnome2 2019-08-17 22:04:47 -04:00
Evan Stoll 52f36c3db4 gitkraken: 6.1.1 -> 6.1.3 2019-08-17 21:30:42 -04:00
Marek Mahut 92571e8a55 nbstripout: moving buildInputs to checkInputs
Fixes https://hydra.nixos.org/build/98602011
2019-08-17 23:10:37 +02: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
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00