From 19180957f5415ef60aebd31a56c03446ae0cdcf7 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Tue, 6 Sep 2016 22:12:27 -0700 Subject: [PATCH] ruby_1_9: remove package Remove ruby 1.9 since it is EOLed upstream --- .../development/interpreters/ruby/default.nix | 8 ------ .../interpreters/ruby/patchsets.nix | 26 ------------------- .../ruby/ruby19-parallel-install.patch | 15 ----------- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 51 deletions(-) delete mode 100644 pkgs/development/interpreters/ruby/ruby19-parallel-install.patch diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d5f3a6d39902..98be02da3b26 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -180,14 +180,6 @@ let ) args; in self; in { - ruby_1_9_3 = generic { - version = rubyVersion "1" "9" "3" "p551"; - sha256 = { - src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv"; - git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s"; - }; - }; - ruby_2_0_0 = generic { version = rubyVersion "2" "0" "0" "p647"; sha256 = { diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index a3aeaf6a8ba0..f1b82210aec2 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,32 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel }: rec { - "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 diff --git a/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch b/pkgs/development/interpreters/ruby/ruby19-parallel-install.patch deleted file mode 100644 index bb8063508732..000000000000 --- a/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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddc6d5062db4..af1a6220ecf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5888,7 +5888,6 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; inherit (callPackage ../development/interpreters/ruby {}) - ruby_1_9_3 ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 @@ -5897,7 +5896,6 @@ with pkgs; # Ruby aliases ruby = ruby_2_3; - ruby_1_9 = ruby_1_9_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5;