Commit graph

149 commits

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