Last Modified: <%= file.last_modified %>
Requires: diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index a562411cbb39..db611f66ad69 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPackages, lib, defaultGemConfig, buildRubyGem +{ stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation -, buildEnv, bundler, bundix, makeWrapper, removeReferencesTo +, buildEnv, bundler, bundix +, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo } @ args: let @@ -19,10 +20,6 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby20 = ver.majMin == "2.0"; - isRuby21 = ver.majMin == "2.1"; - atLeast25 = lib.versionAtLeast ver.majMin "2.5"; - atLeast27 = lib.versionAtLeast ver.majMin "2.7"; atLeast30 = lib.versionAtLeast ver.majMin "3.0"; self = lib.makeOverridable ( { stdenv, buildPackages, lib @@ -92,14 +89,12 @@ let enableParallelBuilding = true; - hardeningDisable = lib.optional isRuby20 "format"; - patches = (import ./patchsets.nix { inherit patchSet useRailsExpress ops fetchpatch; patchLevel = ver.patchLevel; }).${ver.majMinTiny} - ++ op (atLeast27 && lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch + ++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch ++ op (atLeast30 && useBaseRuby) ./do-not-update-gems-baseruby.patch ++ ops (!atLeast30 && rubygemsSupport) [ # We upgrade rubygems to a version that isn't compatible with the @@ -121,16 +116,9 @@ let rm -rf $sourceRoot/{lib,test}/rubygems* cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib cp -r ${rubygems}/test/rubygems $sourceRoot/test - '' + opString isRuby21 '' - rm "$sourceRoot/enc/unicode/name2ctype.h" ''; - postPatch = if isRuby21 then '' - rm tool/config_files.rb - cp ${config}/config.guess tool/ - cp ${config}/config.sub tool/ - '' - else opString atLeast25 '' + postPatch = '' sed -i configure.ac -e '/config.guess/d' cp --remove-destination ${config}/config.guess tool/ cp --remove-destination ${config}/config.sub tool/ @@ -275,46 +263,6 @@ in { mkRubyVersion = rubyVersion; mkRuby = generic; - ruby_1_9 = generic { - version = rubyVersion "1" "9" "3" "p551"; - sha256 = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv"; - }; - - ruby_2_0 = generic { - version = rubyVersion "2" "0" "0" "p648"; - sha256 = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446"; - }; - - ruby_2_1 = generic { - version = rubyVersion "2" "1" "10" ""; - sha256 = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv"; - }; - - ruby_2_2 = generic { - version = rubyVersion "2" "2" "9" ""; - sha256 = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg"; - }; - - ruby_2_3 = generic { - version = rubyVersion "2" "3" "8" ""; - sha256 = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm"; - }; - - ruby_2_4 = generic { - version = rubyVersion "2" "4" "9" ""; - sha256 = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr"; - }; - - ruby_2_5 = generic { - version = rubyVersion "2" "5" "8" ""; - sha256 = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc"; - }; - - ruby_2_6 = generic { - version = rubyVersion "2" "6" "8" ""; - sha256 = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq"; - }; - ruby_2_7 = generic { version = rubyVersion "2" "7" "6" ""; sha256 = "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877"; diff --git a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix index 79e3c1ad1479..a0e2b90b0f4a 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,81 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - - "1.9.3" = [ - ./ssl_v3.patch - ./rand-egd.patch - ./ruby19-parallel-install.patch - ./bitperfect-rdoc.patch - ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/01-fix-make-clean.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/02-zero-broken-tests.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/03-railsbench-gc.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/06-track-live-dataset-size.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/09-thread-variables.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/10-faster-loading.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/11-falcon-st-opt.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/12-falcon-sparse-array.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/13-falcon-array-queue.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/14-railsbench-gc-fixes.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/17-backport-psych-20.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/18-fix-missing-c-return-event.patch" - "${patchSet}/patches/ruby/1.9.3/p${patchLevel}/railsexpress/19-fix-process-daemon-call.patch" - ]; - "2.0.0" = [ - ./ssl_v3.patch - ./rand-egd.patch - ] ++ ops useRailsExpress [ - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/02-railsexpress-gc.patch" - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" - ]; - "2.1.10" = [ - ./rand-egd.patch - ] ++ ops useRailsExpress [ - # 2.1.10 patchsets are not available, but 2.1.8 patchsets apply - "${patchSet}/patches/ruby/2.1.8/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/05-funny-falcon-stc-density.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/06-funny-falcon-stc-pool-allocation.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/07-aman-opt-aset-aref-str.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" - "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" - ]; - "2.2.9" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.3.8" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.4.9" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.5.8" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" - "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" - ]; - "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.6" = 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" diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rand-egd.patch b/nixpkgs/pkgs/development/interpreters/ruby/rand-egd.patch deleted file mode 100644 index e4f6452000c2..000000000000 --- a/nixpkgs/pkgs/development/interpreters/ruby/rand-egd.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb -index e272cba..3a1fa71 100644 ---- a/ext/openssl/extconf.rb -+++ b/ext/openssl/extconf.rb -@@ -87,6 +87,7 @@ - have_func("PEM_def_callback") - have_func("PKCS5_PBKDF2_HMAC") - have_func("PKCS5_PBKDF2_HMAC_SHA1") -+have_func("RAND_egd") - have_func("X509V3_set_nconf") - have_func("X509V3_EXT_nconf_nid") - have_func("X509_CRL_add0_revoked") -diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c -index 29cbf8c..27466fe 100644 ---- a/ext/openssl/ossl_rand.c -+++ b/ext/openssl/ossl_rand.c -@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len) - return str; - } - -+#ifdef HAVE_RAND_EGD - /* - * call-seq: - * egd(filename) -> true -@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len) - } - return Qtrue; - } -+#endif /* HAVE_RAND_EGD */ - - /* - * call-seq: -@@ -219,7 +221,9 @@ Init_ossl_rand(void) - DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1); - DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1); - DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1); -+#ifdef HAVE_RAND_EGD - DEFMETH(mRandom, "egd", ossl_rand_egd, 1); - DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2); -+#endif /* HAVE_RAND_EGD */ - DEFMETH(mRandom, "status?", ossl_rand_status, 0) - } diff --git a/nixpkgs/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch b/nixpkgs/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch deleted file mode 100644 index bb8063508732..000000000000 --- a/nixpkgs/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: ruby-1.9.3-p392/lib/mkmf.rb -=================================================================== ---- ruby-1.9.3-p392.orig/lib/mkmf.rb -+++ ruby-1.9.3-p392/lib/mkmf.rb -@@ -2039,8 +2039,8 @@ static: $(STATIC_LIB)#{$extout ? " insta - end - for f in files - dest = "#{dir}/#{File.basename(f)}" -- mfile.print("install-rb#{sfx}: #{dest} #{dir}\n") -- mfile.print("#{dest}: #{f}\n") -+ mfile.print("install-rb#{sfx}: #{dest}\n") -+ mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n") - mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n") - if defined?($installed_list) and !$extout - mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") diff --git a/nixpkgs/pkgs/development/interpreters/ruby/ssl_v3.patch b/nixpkgs/pkgs/development/interpreters/ruby/ssl_v3.patch deleted file mode 100644 index faa402165751..000000000000 --- a/nixpkgs/pkgs/development/interpreters/ruby/ssl_v3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/ext/openssl/ossl_ssl.c 2015-11-26 16:41:03.775058140 +0000 -+++ b/ext/openssl/ossl_ssl.c 2015-11-26 16:40:56.191907346 +0000 -@@ -138,9 +138,12 @@ - OSSL_SSL_METHOD_ENTRY(SSLv2_server), - OSSL_SSL_METHOD_ENTRY(SSLv2_client), - #endif -+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ -+ defined(HAVE_SSLV3_CLIENT_METHOD) - OSSL_SSL_METHOD_ENTRY(SSLv3), - OSSL_SSL_METHOD_ENTRY(SSLv3_server), - OSSL_SSL_METHOD_ENTRY(SSLv3_client), -+#endif - OSSL_SSL_METHOD_ENTRY(SSLv23), - OSSL_SSL_METHOD_ENTRY(SSLv23_server), - OSSL_SSL_METHOD_ENTRY(SSLv23_client), - diff --git a/nixpkgs/pkgs/development/tools/rhc/default.nix b/nixpkgs/pkgs/development/tools/rhc/default.nix deleted file mode 100644 index 634ca28aaf13..000000000000 --- a/nixpkgs/pkgs/development/tools/rhc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, bundlerEnv, ruby_2_2, stdenv, makeWrapper }: - -stdenv.mkDerivation rec { - name = "rhc-1.38.7"; - - env = bundlerEnv { - name = "rhc-1.38.7-gems"; - - ruby = ruby_2_2; - - gemdir = ./.; - }; - - buildInputs = [ makeWrapper ]; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${env}/bin/rhc $out/bin/rhc - ''; - - meta = with lib; { - homepage = https://github.com/openshift/rhc; - description = "OpenShift client tools"; - license = licenses.asl20; - maintainers = [ maintainers.szczyp ]; - }; -} diff --git a/nixpkgs/pkgs/tools/video/flvtool2/default.nix b/nixpkgs/pkgs/tools/video/flvtool2/default.nix deleted file mode 100644 index 0875b7ee1d1a..000000000000 --- a/nixpkgs/pkgs/tools/video/flvtool2/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, buildRubyGem, ruby }: - -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "flvtool2"; - version = "1.0.6"; - source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; - - meta = { - homepage = "https://github.com/unnu/flvtool2"; - description = "A tool to manipulate Macromedia Flash Video files"; - platforms = ruby.meta.platforms; - license = lib.licenses.bsd3; - }; -} diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 20d1938dad66..8fe56f766489 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -6325,10 +6325,6 @@ with pkgs; flowblade = callPackage ../applications/video/flowblade { }; - flvtool2 = callPackage ../tools/video/flvtool2 { - ruby = ruby_2_2; - }; - fmbt = callPackage ../development/tools/fmbt { python = python2; }; @@ -15167,14 +15163,6 @@ with pkgs; }) mkRubyVersion mkRuby - ruby_1_9 - ruby_2_0 - ruby_2_1 - ruby_2_2 - ruby_2_3 - ruby_2_4 - ruby_2_5 - ruby_2_6 ruby_2_7 ruby_3_0 ruby_3_1; @@ -15182,27 +15170,10 @@ with pkgs; ruby = ruby_2_7; rubyPackages = rubyPackages_2_7; - rubyPackages_1_9 = recurseIntoAttrs ruby_1_9.gems; - rubyPackages_2_0 = recurseIntoAttrs ruby_2_0.gems; - rubyPackages_2_1 = recurseIntoAttrs ruby_2_1.gems; - rubyPackages_2_2 = recurseIntoAttrs ruby_2_2.gems; - rubyPackages_2_3 = recurseIntoAttrs ruby_2_2.gems; - rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; - rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; - rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; - ruby_1_9-gems = recurseIntoAttrs ruby_1_9.gems; - ruby_2_0-gems = recurseIntoAttrs ruby_2_0.gems; - ruby_2_1-gems = recurseIntoAttrs ruby_2_1.gems; - ruby_2_2-gems = recurseIntoAttrs ruby_2_2.gems; - ruby_2_3-gems = recurseIntoAttrs ruby_2_3.gems; - ruby_2_4-gems = recurseIntoAttrs ruby_2_4.gems; - ruby_2_5-gems = recurseIntoAttrs ruby_2_5.gems; - ruby_2_6-gems = recurseIntoAttrs ruby_2_6.gems; - mruby = callPackage ../development/compilers/mruby { }; scsh = callPackage ../development/interpreters/scsh { }; -- cgit 1.4.1