Merge remote-tracking branch 'upstream/staging' into deps-reorg

2017-09-28 12:32:57 -04:00
parent f08d6f0e2d 4e22e88b91
commit f037625f87
789 changed files with 15725 additions and 8096 deletions
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -71,6 +71,10 @@ in
  charlock_holmes = attrs: {
    buildInputs = [ which icu zlib ];
  };
+  
+  curb = attrs: {
+    buildInputs = [ curl ];
+  };

  dep-selector-libgecode = attrs: {
    USE_SYSTEM_GECODE = true;