3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

196 commits

Author SHA1 Message Date
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
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
Christine Koppelt ee06d27cf2 treewide: add some missing meta: descriptions and homepages (#70497) 2019-10-06 00:59:26 -04: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
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00: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
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
Florian Klink 48da993627 gitaly: 1.47.0 -> 1.53.2 2019-08-14 14:52:16 +02:00
Florian Klink 362076c581 gitlab-ee: 12.0.3 -> 12.1.6 2019-08-14 14:51:59 +02:00
Florian Klink 8ce1c4c26a gitlab-ce: 12.0.3 -> 12.1.6 2019-08-14 14:51:00 +02:00
Florian Klink 765491c895 gitlab: remove gitlab-deb-data.tar after extracting from it
There's no reason to ship a 1.6GiB .tar file in the output.
Slims down that output from 1.9GiB to ~350MiB
2019-08-14 14:45:08 +02:00
Florian Klink 89aae903da gitaly: fix hashes
It seems the sha256 hashes of 3 gitaly dependencies were wrong or
changed.
2019-07-27 14:29:29 +02:00
Robin Gloster a33ddd7a68
gitlab-shell: fix fallback bin searching 2019-07-16 03:51:22 +02:00
Ben Gamari 9f77b4a599 gitaly: Fix IFD import 2019-07-15 21:29:57 -04:00
Robin Gloster 5589612599
gitlab: add all necessary gem groups 2019-07-16 01:18:42 +02:00
Robin Gloster 722ee7756b
gitlab: add gitaly go mod handling for the updater 2019-07-16 01:18:11 +02:00
Robin Gloster 6c98b0ff43
gitaly: add go mod deps 2019-07-16 01:17:38 +02:00
Ben Gamari 363b352af3 gitlab: 11.10.8 -> 12.0.3
This is a major version bump but things were generally straightforward
save two wrinkles:

 * it is necessary to ignore collisions in the gitlab bundler
   environment as both `omniauth_oauth2_generic` and
   `apollo_upload_server` provide a `console` executable.

 * grpc had to be patched since its build system expects the `AR`
   environment variable to contain not just the path to `ar` but
   also the `rpc` flags (see the discussion in nixpkgs #63056).
2019-07-14 23:03:39 +02:00
Florian Klink 1a205ad7fb gitlab-ce: remove substituteInPlace
This was removed in
23bcbf04c8
(since v11.6.0)
2019-07-05 00:44:10 +02:00
Florian Klink 80c35fb2a5 gitaly: 1.34.1 -> 1.34.3 2019-07-05 00:44:10 +02:00
Florian Klink 580be224c7 gitlab-ee: 11.10.5 -> 11.10.8 2019-07-05 00:44:10 +02:00
Florian Klink c57a9d7f9a gitlab-ce: 11.10.5 -> 11.10.8 2019-07-05 00:44:10 +02:00
Léo Gaspard 42170cbf58
gitlab: add link to nixos test in passthru.tests 2019-06-13 02:23:15 +02:00
Marek Mahut bf01a3ba94 gitlab: 11.10.4 -> 11.10.5 2019-06-13 01:45:13 +02:00
Robin Gloster 2ec5786a4d
gitaly: fix build 2019-05-06 19:11:43 +02:00
Florian Klink d237c8a182 gitlab-ee: 11.9.11 -> 11.10.4 2019-05-03 20:22:08 +02:00
Florian Klink 02124aa8fb gitlab-ce: 11.9.11 -> 11.10.4 2019-05-03 20:21:55 +02:00
Florian Klink 41d95302c0 gitlab-workhorse: 8.3.3 -> 8.5.2 2019-05-03 20:21:12 +02:00
Florian Klink 030bc8086b gitaly: 1.27.2 -> 1.34.1 2019-05-03 20:20:20 +02:00
Florian Klink 61bf39c5a1 gitlab-shell: 8.7.1 -> 9.0.0 2019-05-03 20:20:01 +02:00
Florian Klink 847eb76cf8 gitlab: update.py: properly sort version numbers, ignore invalid versions 2019-05-03 20:18:14 +02:00
Florian Klink cc785b3b9a gitaly: 1.27.1 -> 1.27.2 2019-05-01 14:49:16 +02:00
Florian Klink 5d6f6d5d94 gitlab-ee: 11.9.8 -> 11.9.11 2019-05-01 14:48:58 +02:00
Florian Klink b9df035cb7 gitlab-ce: 11.9.8 -> 11.9.11 2019-05-01 14:48:27 +02:00
Florian Klink 33423e52c6 gitlab-ee: 11.9.1 -> 11.9.8 2019-04-22 23:41:32 +02:00
Florian Klink 04b5eb10c0 gitlab-ce: 11.9.1 -> 11.9.8 2019-04-22 23:41:32 +02:00
Florian Klink 74eb807f83 gitlab-workhorse: 8.3.1 -> 8.3.3 2019-04-22 23:41:32 +02:00
Ben Gamari 50a4de7326 nixos/gitlab: Install and fixup vendorised gitlab-shell
gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.
2019-03-29 11:53:07 -04:00
Florian Klink ec319793b4 gitlab: 11.9.0 -> 11.9.1 2019-03-26 21:00:04 +01:00
Florian Klink e558347243 gitaly: 1.27.0 -> 1.27.1 2019-03-26 20:59:46 +01:00
Ben Gamari d8c16f11a6 gitlab: 11.8.2 -> 11.9.0 2019-03-25 15:25:11 -04:00
Ben Gamari 0ba98bb64c gitlab: 11.7.5 -> 11.8.2 2019-03-25 15:25:06 -04:00
Wael M. Nasreddine 483d823ec4
gitlab-shell: export GOCACHE in the installPhase
TMPDIR, in `GOCACHE = "$TMPDIR";`, will not be intepreted  when it's set
outside of a phase.
2019-03-11 09:59:15 -07:00
Wael M. Nasreddine 6ef04cabd4
go_1_12: init at go 1.12 2019-03-02 14:24:17 -08:00
Florian Klink f4a7c16bd9 gitlab-ee: 11.7.4 -> 11.7.5 2019-02-17 13:43:52 +01:00
Florian Klink 7f6351a21d gitlab: 11.7.4 -> 11.7.5 2019-02-17 13:43:38 +01:00
Florian Klink 75f66b19dd gitlab-workhorse: 8.0.1 -> 8.0.2 2019-02-17 13:42:35 +01:00
Jeff Slight 8c043d3c7b gitlab: 11.6.3 -> 11.7.4 2019-02-06 00:30:29 +01:00
Robin Gloster 8fac37db00
gitlab: 11.6.0 -> 11.6.3 2019-01-07 20:08:15 +01:00
Florian Klink 134a6decae gitlab-workhorse: 7.1.3 -> 7.6.0 2018-12-25 15:25:45 +01:00
Florian Klink ca69c9c2d0 gitlab-shell: 8.4.1 -> 8.4.3 2018-12-25 15:25:45 +01:00
Florian Klink 97e7cf75fa gitaly: 0.129.0 -> 1.7.1 2018-12-25 15:25:45 +01:00
Florian Klink 4d7ce7a605 gitlab-ee: 11.5.5 -> 11.6.0 2018-12-25 15:25:45 +01:00
Florian Klink 7ea6bde0ae gitlab-ce: 11.5.5 -> 11.6.0 2018-12-25 15:25:45 +01:00
Florian Klink 78f336b21d gitlab: add missing f.truncate() call to update.py script
when updating data.json, truncate file after reading and before writing
again, or we otherwise might end up with broken json
2018-12-25 15:25:45 +01:00
Florian Klink 236cb26954 gitlab-ee: 11.5.4 -> 11.5.5
CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/
2018-12-24 03:48:18 +01:00
Florian Klink 6397fd3e71 gitlab-ce: 11.5.4 -> 11.5.5
CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/
2018-12-24 03:48:18 +01:00
Florian Klink 1812014215 gitlab-ee: 11.5.1 -> 11.5.4 2018-12-16 19:47:35 +01:00
Florian Klink 4175f62a43 gitlab-ce: 11.5.1 -> 11.5.4 2018-12-16 19:47:35 +01:00
Robin Gloster c2b54dcee5
gitlab-shell: fix hard-coded path 2018-12-04 21:27:23 +01:00
Robin Gloster 88b63b2505
gitlab: 11.5.0 -> 11.5.1 2018-12-04 21:27:23 +01:00
Kristoffer Thømt Ravneberg a3ec5dce2b gitlab-shell: don't hardcode gitlab-shell paths in authorized_keys 2018-11-28 23:09:23 +01:00
Florian Klink 63f25471cb gitaly: 0.125.1 -> 0.129.0 2018-11-23 17:59:39 +01:00
Florian Klink 2f2dce92f2 update.py: lazy workaround for wrong meta.position on go packages 2018-11-23 17:59:39 +01:00
Florian Klink a33622e4d4 gitlab-workhorse: 7.0.0 -> 7.1.0 2018-11-23 17:59:39 +01:00
Florian Klink 293a631081 gitlab-shell: 8.3.3 -> 8.4.1 2018-11-23 17:59:38 +01:00
Florian Klink 625e66d879 gitlab: 11.4.4 -> 11.5.0, add data.json, make default.nix use it 2018-11-23 17:59:07 +01:00
Florian Klink 6d4643243c gitlab: add update.py script 2018-11-23 15:29:12 +01:00
Florian Klink 3233efb33b gitlab-workhorse: rename srcs attribute to src 2018-11-23 14:47:18 +01:00
Florian Klink 8b51e837b9 gitlab-workhorse: drop deterministic-build.patch
we already set VERSION in makeFlags below.
2018-11-23 13:22:50 +01:00
Florian Klink d768e3967f gitlab-workhorse: move to pkgs/applications/version-management/gitlab 2018-11-23 13:18:43 +01:00
Florian Klink cb79c1e60b gitaly: move to pkgs/applications/version-management/gitlab 2018-11-23 13:17:53 +01:00
Florian Klink 8e8f692e22 gitlab-shell: move to pkgs/applications/version-management/gitlab 2018-11-23 13:14:28 +01:00
Alyssa Ross 3c7bbb5850
gitlab: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:17 +00:00
Florian Klink 9e491f732a gitlab: 11.4.3 -> 11.4.4
SSRF in Kubernetes integration
The GitLab Kubernetes integration was vulnerable to a SSRF issue which could allow an attacker to make requests to access any internal URLs. The issue is now mitigated in the latest release and is assigned CVE-2018-18843.
2018-11-03 01:49:49 +01:00
Robin Gloster ec7cb84bf0
gitlab: refactor and fix test 2018-11-02 22:40:21 +01:00
Robin Gloster 3aec530964 gitlab: 11.4.0 -> 11.4.3 2018-10-29 20:42:02 +01:00
Robin Gloster 02afda3fd8 gitlab: 11.3.4 -> 11.4.0 2018-10-26 11:32:28 +02:00
Kristoffer Thømt Ravneberg 0083ca1266 gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #45574 2018-10-08 15:02:14 +02:00
Kristoffer Thømt Ravneberg d837338d6b gitlab: 11.2.3 -> 11.3.4 2018-10-08 15:01:29 +02:00
Robin Gloster ed85eb5433 gitlab: 11.2.3 -> 11.3.0 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg 6946d97ce4 gitlab-ee: init at 11.2.3 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg 51c1830147 gitlab: 10.8.0 -> 11.2.3 2018-09-25 03:53:32 +02:00
Uli Baum 8cd90e40be gitlab: add missing meta.platforms 2018-09-20 12:27:24 +02:00
Markus Kowalewski 8acffe39b7
gitlab: add meta data 2018-08-20 21:15:11 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Robin Gloster f21ac1bf69
gitlab: 10.7.0 -> 10.8.0 2018-05-24 04:40:46 +02:00
Robin Gloster 04ab1ed623
gitlab: 10.5.6 -> 10.7.0 2018-04-26 00:15:24 +02:00
Matthew Bauer ce8ce600ae unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
2018-03-26 17:40:55 -05:00
Robin Gloster 08946efdc8
gitlab: 10.5.4 -> 10.5.6 2018-03-22 02:29:28 +01:00
Simon Lackerbauer 1b55905806
gitlab: 10.3.4 -> 10.5.4 2018-03-22 02:29:28 +01:00
Robin Gloster 231f434a4d
gitlab: 10.3.3 -> 10.3.4
Fixes:
 - CVE-2017-0915
 - CVE-2018-3710
 - CVE-2017-0918
 - CVE-2017-0923
 - CVE-2017-0925
 - CVE-2017-0926
 - CVE-2017-0924
 - CVE-2017-0914
 - CVE-2017-0916
 - CVE-2017-0917
 - CVE-2017-0927
 - CVE-2017-0922

See https://about.gitlab.com/2018/01/16/gitlab-10-dot-3-dot-4-released/
for details.
2018-01-17 01:46:41 +01:00
Robin Gloster 1c5fd46d6c
gitlab: 10.1.1 -> 10.3.3 2018-01-07 05:02:53 +01:00
Servilio Afre Puentes f2ac5e0acf gitlab: 10.0.2 -> 10.1.1 2017-11-06 14:50:53 -05:00
Markus Mueller 60b0db0e08
gitlab: link tmp/ directory to writable path 2017-10-16 14:58:02 +02:00
Robin Gloster 57ed9e7e1d
gitlab: 9.5.5 -> 10.0.2 2017-09-28 23:14:31 +02:00
Robin Gloster e2822f6384
gitlab: 9.5.2 -> 9.5.5 2017-09-21 20:26:12 +02:00