Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5aae21daea76
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85d160e24b1c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 2, 2019

  1. gem-config: add idn-ruby, rpam2, cld3

    Milan Pässler committed May 2, 2019
    Copy the full SHA
    bd81420 View commit details

  2. Merge pull request #60693 from petabyteboy/feature/ruby-gems 

    gem-config: add idn-ruby, rpam2, cld3
    @alyssais
    alyssais authored May 2, 2019
    Copy the full SHA
    85d160e View commit details
Showing with 14 additions and 1 deletion.
  1. +14 −1 pkgs/development/ruby-modules/gem-config/default.nix
15 changes: 14 additions & 1 deletion pkgs/development/ruby-modules/gem-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf
, libselinux ? null, libsepol ? null
}@args:

@@ -79,6 +79,11 @@ in
buildInputs = [ which icu zlib ];
};

cld3 = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ protobuf ];
};

curb = attrs: {
buildInputs = [ curl ];
};
@@ -201,6 +206,10 @@ in
buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
};

idn-ruby = attrs: {
buildInputs = [ libidn ];
};

# disable bundle install as it can't install anything in addition to what is
# specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R
# to compensate for read-only files in site_template in nix store.
@@ -340,6 +349,10 @@ in
buildInputs = [ imagemagick which ];
};

rpam2 = attrs: {
buildInputs = [ linux-pam ];
};

ruby-libvirt = attrs: {
buildInputs = [ libvirt pkgconfig ];
buildFlags = [