Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bcbb7ec52dad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 23af4044501b
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Nov 8, 2019

  1. 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.

(cherry picked from commit a30facc)
    @talyz @flokli
    talyz authored and flokli committed Nov 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dhess Drew Hess
    GPG key ID: 4DC0BBFBE3FEF428
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84c3cf6 View commit details

  2. 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.

(cherry picked from commit 22302ce)
    @talyz @flokli
    talyz authored and flokli committed Nov 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce24a92 View commit details

  3. gitlab: 12.4.1 -> 12.4.2 

    (cherry picked from commit a779d77)
    @talyz @flokli
    talyz authored and flokli committed Nov 8, 2019
    Copy the full SHA
    23af404 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,8 +53,9 @@ in buildGoPackage rec {
outputs = [ "bin" "out" "ruby" ];

meta = with stdenv.lib; {
homepage = http://www.gitlab.com/;
platforms = platforms.unix;
homepage = https://gitlab.com/gitlab-org/gitaly;
description = "A Git RPC service for handling all the git calls made by GitLab";
platforms = platforms.linux;
maintainers = with maintainers; [ roblabla globin fpletz ];
license = licenses.mit;
};
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};