diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-10-20 21:29:18 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-10-22 08:46:57 +0100 |
| commit | c6b949c09c791e6fe4d88d5c0971fdce83a22268 (patch) | |
| tree | ffa5492e5da5b8d7497d831b5a229828c068b4c5 /pkgs/development/interpreters/ruby | |
| parent | 3ef1d2a9602c18f8742e1fb63d5ae9867092e3d6 (diff) | |
| download | nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.tar nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.tar.gz nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.tar.bz2 nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.tar.lz nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.tar.xz nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.tar.zst nixpkgs-c6b949c09c791e6fe4d88d5c0971fdce83a22268.zip | |
ruby_2_6, rubyPackages_2_6: drop unused package
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/patchsets.nix | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index ba132acf722..b6010cf32d1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -26,7 +26,6 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - atLeast27 = lib.versionAtLeast ver.majMin "2.7"; atLeast30 = lib.versionAtLeast ver.majMin "3.0"; baseruby = self.override { useRailsExpress = false; @@ -105,7 +104,7 @@ let inherit patchSet useRailsExpress ops fetchpatch; patchLevel = ver.patchLevel; }).${ver.majMinTiny} - ++ op atLeast27 ./do-not-regenerate-revision.h.patch + ++ [ ./do-not-regenerate-revision.h.patch ] ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch # Ruby prior to 3.0 has a bug the installer (tools/rbinstall.rb) but # the resulting error was swallowed. Newer rubygems no longer swallows @@ -252,14 +251,6 @@ let ) args; in self; in { - ruby_2_6 = generic { - version = rubyVersion "2" "6" "8" ""; - sha256 = { - src = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq"; - git = "0rc3n6sk8632r0libpv8jwslc7852hgk64rvbdrspc9razjwx21c"; - }; - }; - ruby_2_7 = generic { version = rubyVersion "2" "7" "4" ""; sha256 = { diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 5c2992bb859..3ea358c349a 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,11 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.6.8" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" - "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" - ]; "2.7.4" = 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" |