cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #143399 from talyz/gitlab-14.4.1

Browse source 
gitlab: 14.4.0 -> 14.4.1
This commit is contained in:
Kim Lindberger 2021-10-29 15:09:47 +02:00 committed by GitHub
commit 5195af24da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,14 +1,14 @@
{
"version": "14.4.0",
"repo_hash": "1hkx30abwbhwrlwr4sykpjgsk8k2k375d9xl1pxjhg3n8vwqncs8",
"version": "14.4.1",
"repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm",
"yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.4.0-ee",
"rev": "v14.4.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.4.0",
"GITALY_SERVER_VERSION": "14.4.1",
"GITLAB_PAGES_VERSION": "1.46.0",
"GITLAB_SHELL_VERSION": "13.21.1",
"GITLAB_WORKHORSE_VERSION": "14.4.0"
"GITLAB_WORKHORSE_VERSION": "14.4.1"
}
}

11
pkgs/applications/version-management/gitlab/default.nix
View file

@ -36,6 +36,15 @@ let
buildInputs = [ file ];
buildFlags = [ "--enable-system-libraries" ];
};
# the included yarn rake task attaches the yarn:install task
# to assets:precompile, which is both unnecessary (since we
# run `yarn install` ourselves) and undoes the shebang patches
# in node_modules
railties = x.railties // {
dontBuild = false;
patches = [ ./railties-remove-yarn-install-enhancement.patch ];
patchFlags = "-p2";
};
};
groups = [
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
@ -95,8 +104,6 @@ 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
# hack: rake gettext:po_to_json breaks the node_modules folder. We repair it by patching the shebangs again.
patchShebangs node_modules/
bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -20,7 +20,7 @@ let
};
};
};
version = "14.4.0";
version = "14.4.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@ -32,7 +32,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-GnjG/LuHvulNrwj1/4r07snue7rysZ74cWpf60w48cc=";
sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg=";
};
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.4.0";
version = "14.4.1";
src = fetchFromGitLab {
owner = data.owner;

13
pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index 0226da721a..365cdeb0f9 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -27,8 +27,3 @@ namespace :yarn do
exit 1
end
end
-
-# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
-if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
- Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
-end