From a30facc96e4059964784468c31db103bb9495028 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 9 Oct 2019 15:45:12 +0200 Subject: [PATCH 1/3] 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. --- pkgs/applications/version-management/gitlab/gitaly/default.nix | 2 +- .../version-management/gitlab/gitlab-shell/default.nix | 2 +- .../version-management/gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b07c3590d3d..dd17618dc74 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -55,7 +55,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { homepage = https://gitlab.com/gitlab-org/gitaly; description = "A Git RPC service for handling all the git calls made by GitLab"; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ roblabla globin fpletz ]; license = licenses.mit; }; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 03aad8c02c3..2a83cbe5f3c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "SSH access and repository management app for GitLab"; homepage = http://www.gitlab.com/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; }; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b8364c1efeb..aa8cf7c164c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; }; From 22302ce845bb1dfc61cb0c3bf62a051d81c5a326 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 4 Nov 2019 16:46:05 +0100 Subject: [PATCH 2/3] 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. --- pkgs/applications/version-management/gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index e6ed0ef53a2..0075f91ae2d 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -76,7 +76,7 @@ let bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" + bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=2048" bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production runHook postBuild From a779d7751e93bc187c98603b8c1e84637fc4535c Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 6 Nov 2019 10:55:45 +0100 Subject: [PATCH 3/3] gitlab: 12.4.1 -> 12.4.2 --- pkgs/applications/version-management/gitlab/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a0e62271373..42cc127e40d 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,9 +1,9 @@ { - "version": "12.4.1", - "repo_hash": "0dmb8ds6c5paxg35nricaywfhsgmp5rr46kk21hy2hsddgwkyb4k", + "version": "12.4.2", + "repo_hash": "00y8n0y7wydwxq62fyf7hcpx90zz5sw458m2773lz7pdgnpnrdc2", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.4.1-ee", + "rev": "v12.4.2-ee", "passthru": { "GITALY_SERVER_VERSION": "1.67.0", "GITLAB_PAGES_VERSION": "1.11.0",