Merge remote-tracking branch 'upstream/master' into HEAD

2017-09-08 20:48:14 +02:00
parent 0061fae2e6 e9183fd2d4
commit febd5e323d
85 changed files with 2013 additions and 991 deletions
@@ -151,12 +151,12 @@ let
          sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
        '';

-        meta = {
-          license = stdenv.lib.licenses.ruby;
-          homepage = http://www.ruby-lang.org/en/;
+        meta = with stdenv.lib; {
          description = "The Ruby language";
-          maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];
-          platforms = stdenv.lib.platforms.all;
+          homepage    = http://www.ruby-lang.org/en/;
+          license     = licenses.ruby;
+          maintainers = with maintainers; [ vrthra manveru ];
+          platforms   = platforms.all;
        };

        passthru = rec {