Skip to content

Commit

Permalink
rvm-patchsets: drop
Browse files Browse the repository at this point in the history
  • Loading branch information
marsam committed Feb 24, 2023
1 parent 6323dc4 commit 2f22789
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 36 deletions.
12 changes: 2 additions & 10 deletions pkgs/development/interpreters/ruby/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ let
op = lib.optional;
ops = lib.optionals;
opString = lib.optionalString;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; };
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };

Expand All @@ -25,7 +24,6 @@ let
self = lib.makeOverridable (
{ stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, useRailsExpress ? true
, rubygemsSupport ? true
, zlib, zlibSupport ? true
, openssl, openssl_1_1, opensslSupport ? true
Expand All @@ -51,11 +49,10 @@ let
, libiconv, libobjc, libunwind, Foundation
, makeBinaryWrapper, buildRubyGem, defaultGemConfig
, baseRuby ? buildPackages.ruby_3_1.override {
useRailsExpress = false;
docSupport = false;
rubygemsSupport = false;
}
, useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform || useRailsExpress
, useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform
}:
stdenv.mkDerivation rec {
pname = "ruby";
Expand Down Expand Up @@ -93,12 +90,7 @@ let

enableParallelBuilding = true;

patches =
(import ./patchsets.nix {
inherit patchSet useRailsExpress ops fetchpatch;
patchLevel = ver.patchLevel;
}).${ver.majMinTiny}
++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch
patches = op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch
++ op (atLeast30 && useBaseRuby) ./do-not-update-gems-baseruby.patch
++ ops (ver.majMin == "3.0") [
# Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions.
Expand Down
18 changes: 0 additions & 18 deletions pkgs/development/interpreters/ruby/patchsets.nix

This file was deleted.

8 changes: 0 additions & 8 deletions pkgs/development/interpreters/ruby/rvm-patchsets.nix

This file was deleted.

0 comments on commit 2f22789

Please sign in to comment.