diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-02-24 04:20:00 +0000 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-02-24 04:20:00 +0000 |
commit | 2f22789063096c2690c3310f487f3a799ed09f87 (patch) | |
tree | 9660109680ee98ea20c22bfd2b94c4aed6af357e /pkgs/development/interpreters/ruby | |
parent | 6323dc433f93741ba1ab8e927320638627fd540b (diff) |
rvm-patchsets: drop
Diffstat (limited to 'pkgs/development/interpreters/ruby')
-rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 18 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/rvm-patchsets.nix | 8 |
3 files changed, 2 insertions, 36 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 73c6e286aa922..19ca74ffa0486 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -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; }; @@ -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 @@ -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"; @@ -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. diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix deleted file mode 100644 index 2bf5bc7296c6a..0000000000000 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: - -{ - "2.7.7" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" - "${patchSet}/patches/ruby/2.7/head/railsexpress/04-malloc-trim.patch" - ]; - "3.0.5" = ops useRailsExpress [ - "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" - "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" - ]; - "3.1.2" = ops useRailsExpress [ - "${patchSet}/patches/ruby/3.1/head/railsexpress/01-improve-gc-stats.patch" - "${patchSet}/patches/ruby/3.1/head/railsexpress/02-malloc-trim.patch" - ]; -} diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix deleted file mode 100644 index fbbfd4c973027..0000000000000 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "skaes"; - repo = "rvm-patchsets"; - rev = "e6574c54a34fe6e4d45aa1433872a22ddfe14cf3"; - hash = "sha256-x2KvhgRVJ4Nc5v1j4DggKO1u3otG8HVMxhq4yuUKnds="; -} |