diff options
Diffstat (limited to 'pkgs/development/ruby-modules')
-rw-r--r-- | pkgs/development/ruby-modules/bundix/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 11 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 8ddff908a1a..4eb06f76aba 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,29 +1,20 @@ { buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, - nix-prefetch-git, fetchpatch }: + nix-prefetch-git }: buildRubyGem rec { inherit (bundler) ruby; name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "bundix"; rev = version; - sha256 = "05y8sy6v9km1dwvpjzkjxpfzv95g6yzac1b5blac2f1r2kw167p8"; + sha256 = "sha256-iMp6Yj7TSWDqge3Lw855/igOWdTIuFH1LGeIN/cpq7U="; }; - patches = [ - # write trailing newline to gemset.nix - # https://github.com/nix-community/bundix/pull/78 - (fetchpatch { - url = "https://github.com/nix-community/bundix/commit/02ca7a6c656a1e5e5465ad78b31040d82ae1a7e6.patch"; - sha256 = "18r30icv7r79dlmxz1d1qlk5b6c7r257x23sqav55yhfail9hqrb"; - }) - ]; - buildInputs = [ ruby bundler ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 791ae3d0d31..ebe1396d1d7 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -211,7 +211,16 @@ in ''; }; - pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + pg_query = attrs: lib.optionalAttrs (attrs.version == "2.0.1") { + dontBuild = false; + postPatch = '' + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/13-2.0.0"; + sha256 = "0ghk0dlmrn634p3zjr41fy4ipgw8i44f67a4l8cspqg0395m3rp5"; + }}';" ext/pg_query/extconf.rb + ''; + } // lib.optionalAttrs (attrs.version == "1.3.0") { + # Needed for gitlab dontBuild = false; postPatch = '' sed -i "s;'https://codeload.github.com.*';'${fetchurl { |