diff options
| author | Milan Pässler <milan@petabyte.dev> | 2020-11-20 21:02:55 +0100 |
|---|---|---|
| committer | Milan Pässler <milan@petabyte.dev> | 2020-11-21 01:38:35 +0100 |
| commit | 2429d5a307198b2349dcc2b69dec63359622e222 (patch) | |
| tree | bc85b3d0a2c4a1e234ce542b162c3cf16334cb18 /pkgs/development/ruby-modules/gem-config | |
| parent | 0f82bd767b16daa7e228464593bcf6b7dd4baae4 (diff) | |
| download | nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.gz nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.bz2 nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.lz nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.xz nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.tar.zst nixpkgs-2429d5a307198b2349dcc2b69dec63359622e222.zip | |
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).
Diffstat (limited to 'pkgs/development/ruby-modules/gem-config')
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9ccc369429d..04370a46b90 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -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 ]; |