tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gitlab: 14.4.0 -> 14.4.1
talyz
4 years ago
e06991e7
ffea1625
+30
-10
5 changed files
expand all
collapse all
unified
split
pkgs
applications
version-management
gitlab
data.json
default.nix
gitaly
default.nix
gitlab-workhorse
default.nix
railties-remove-yarn-install-enhancement.patch
+5
-5
pkgs/applications/version-management/gitlab/data.json
···
1
1
{
2
2
-
"version": "14.4.0",
3
3
-
"repo_hash": "1hkx30abwbhwrlwr4sykpjgsk8k2k375d9xl1pxjhg3n8vwqncs8",
2
2
+
"version": "14.4.1",
3
3
+
"repo_hash": "0sm44iyn32frc7njg6ypgbcip77mj5c3agn3cihk3lz7z5kr48lm",
4
4
"yarn_hash": "0l0lgcgxaira980a1y550pfsm4f2pw97gi8s5pghyfil2v2lyxyw",
5
5
"owner": "gitlab-org",
6
6
"repo": "gitlab",
7
7
-
"rev": "v14.4.0-ee",
7
7
+
"rev": "v14.4.1-ee",
8
8
"passthru": {
9
9
-
"GITALY_SERVER_VERSION": "14.4.0",
9
9
+
"GITALY_SERVER_VERSION": "14.4.1",
10
10
"GITLAB_PAGES_VERSION": "1.46.0",
11
11
"GITLAB_SHELL_VERSION": "13.21.1",
12
12
-
"GITLAB_WORKHORSE_VERSION": "14.4.0"
12
12
+
"GITLAB_WORKHORSE_VERSION": "14.4.1"
13
13
}
14
14
}
+9
-2
pkgs/applications/version-management/gitlab/default.nix
···
36
36
buildInputs = [ file ];
37
37
buildFlags = [ "--enable-system-libraries" ];
38
38
};
39
39
+
# the included yarn rake task attaches the yarn:install task
40
40
+
# to assets:precompile, which is both unnecessary (since we
41
41
+
# run `yarn install` ourselves) and undoes the shebang patches
42
42
+
# in node_modules
43
43
+
railties = x.railties // {
44
44
+
dontBuild = false;
45
45
+
patches = [ ./railties-remove-yarn-install-enhancement.patch ];
46
46
+
patchFlags = "-p2";
47
47
+
};
39
48
};
40
49
groups = [
41
50
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
···
95
104
96
105
bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
97
106
bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
98
98
-
# hack: rake gettext:po_to_json breaks the node_modules folder. We repair it by patching the shebangs again.
99
99
-
patchShebangs node_modules/
100
107
bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production
101
108
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
102
109
bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production
+2
-2
pkgs/applications/version-management/gitlab/gitaly/default.nix
···
20
20
};
21
21
};
22
22
};
23
23
-
version = "14.4.0";
23
23
+
version = "14.4.1";
24
24
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
25
25
in
26
26
···
32
32
owner = "gitlab-org";
33
33
repo = "gitaly";
34
34
rev = "v${version}";
35
35
-
sha256 = "sha256-GnjG/LuHvulNrwj1/4r07snue7rysZ74cWpf60w48cc=";
35
35
+
sha256 = "sha256-bATqaB7q3MlyacEiBXdcEDs+xsJUbULVnYTSpEznxFg=";
36
36
};
37
37
38
38
vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8=";
+1
-1
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
···
5
5
buildGoModule rec {
6
6
pname = "gitlab-workhorse";
7
7
8
8
-
version = "14.4.0";
8
8
+
version = "14.4.1";
9
9
10
10
src = fetchFromGitLab {
11
11
owner = data.owner;
+13
pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch
···
1
1
+
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
2
2
+
index 0226da721a..365cdeb0f9 100644
3
3
+
--- a/railties/lib/rails/tasks/yarn.rake
4
4
+
+++ b/railties/lib/rails/tasks/yarn.rake
5
5
+
@@ -27,8 +27,3 @@ namespace :yarn do
6
6
+
exit 1
7
7
+
end
8
8
+
end
9
9
+
-
10
10
+
-# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
11
11
+
-if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
12
12
+
- Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
13
13
+
-end