Commit Graph

2935 Commits

Author SHA1 Message Date
Evan Stoll
847fd1711d gitkraken: 6.4.0 -> 6.4.1 2019-12-20 07:10:26 -05:00
Florian Klink
1c15955340
Merge pull request #75834 from talyz/gitlab-12.5.5
gitlab: 12.5.4 -> 12.5.5
2019-12-19 21:15:23 +01:00
Evan Stoll
80d6b17035 gitkraken: 6.3.1 -> 6.4.0 2019-12-19 10:56:53 -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
talyz
7d602d3d36 gitlab: 12.5.4 -> 12.5.5 2019-12-17 22:18:10 +01: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
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