Merge staging-next into staging

2019-11-05 14:18:08 +01:00
parent acd2d19484 03a9822405
commit c4e30cf98c
252 changed files with 5991 additions and 1658 deletions
--- a/pkgs/development/ruby-modules/with-packages/default.nix
+++ b/pkgs/development/ruby-modules/with-packages/default.nix
@@ -64,6 +64,8 @@ let
          rm -f $out/bin/$(basename "$i")
          makeWrapper "$i" $out/bin/$(basename "$i") --set GEM_PATH ${gemEnv}/${ruby.gemPath}
        done
+
+        ln -s ${ruby}/nix-support $out/nix-support
      '';

      passthru = {