Unverified Commit 5c5bdd7b authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #240000 from aidalgol/jekyll-fixes

parents 42983931 7ce443a4

pkgs/development/ruby-modules/gem-config/default.nix

+11 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx

, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz

, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk

, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie

, bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie

, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml

, autoSignDarwinBinariesHook, fetchpatch

}@args:
@@ -711,6 +711,16 @@ in 
    buildFlags = [ "--disable-lto" ];

  });



  sass-embedded = attrs: {

    # Patch the Rakefile to use our dart-sass and not try to fetch anything.

    dontBuild = false;

    postPatch = ''

      substituteInPlace ext/sass/Rakefile \

        --replace \'dart-sass/sass\' \'${dart-sass}/bin/sass\' \

        --replace ' => %w[dart-sass]' ""

    '';

  };



  scrypt = attrs: lib.optionalAttrs stdenv.isDarwin {

    dontBuild = false;

    postPatch = ''

pkgs/top-level/ruby-packages.nix

+10 −0
Original line number Diff line number Diff line
@@ -3651,6 +3651,16 @@ 
    };

    version = "7.0.0";

  };

  webrick = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";

      type = "gem";

    };

    version = "1.8.1";

  };

  websocket-driver = {

    dependencies = ["websocket-extensions"];

    groups = ["default"];