gitlab: 13.5.1 -> 13.6.0
Changed ruby version to 2.7.x to match upstream. Added a gem config for gitlab-pg_query as it tries to download a source tarball during the build process. Also removed a patch for gitaly that has become obsolete by upstream fix [here](https://gitlab.com/gitlab-org/gitaly/-/commit/de04077c25cc23b001317d2efdf5a9ead0bc86b9).
This commit is contained in:
@@ -201,6 +201,16 @@ in
|
||||
|
||||
gitlab-markup = attrs: { meta.priority = 1; };
|
||||
|
||||
gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") {
|
||||
dontBuild = false;
|
||||
postPatch = ''
|
||||
sed -i 's;"https://gitlab.com.*";"${fetchurl {
|
||||
url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz";
|
||||
sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j";
|
||||
}}";' ext/pg_query/extconf.rb
|
||||
'';
|
||||
};
|
||||
|
||||
glib2 = attrs: {
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gtk2 pcre ];
|
||||
|
||||
Reference in New Issue
Block a user