diff options
| author | Artturi <Artturin@artturin.com> | 2023-08-07 00:50:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 00:50:37 +0300 |
| commit | 5c5bdd7b938b0e055e980faa95f6fab1a2112fab (patch) | |
| tree | cd6f10a4f0304a8286ee73c69b4ec0c704e2b49a | |
| parent | 4298393110252c9ff608513fb264633c01925fc3 (diff) | |
| parent | 7ce443a48a06c0f2960317be36709a8c64c9f598 (diff) | |
| download | nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.tar nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.tar.gz nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.tar.bz2 nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.tar.lz nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.tar.xz nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.tar.zst nixpkgs-5c5bdd7b938b0e055e980faa95f6fab1a2112fab.zip | |
Merge pull request #240000 from aidalgol/jekyll-fixes
| -rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/ruby-packages.nix | 10 |
2 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a9eb1f96ab8..ce50ab2882e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -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 = '' diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 4d1b6136a85..3ee1a09bb2e 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -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"]; |