1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

2822 commits

Author SHA1 Message Date
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