diff options
| author | Jude Taylor <me@jude.bio> | 2015-09-26 06:25:01 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-01 08:58:28 -0700 |
| commit | 5379504451c67b9773191d4cc56638072d3239d3 (patch) | |
| tree | d35d4c85115c1c3d30eea454601122ab0be5013f /pkgs/top-level | |
| parent | c720f06f7c84bed458eecb78c37eaf993b6f1404 (diff) | |
| download | nixlib-5379504451c67b9773191d4cc56638072d3239d3.tar nixlib-5379504451c67b9773191d4cc56638072d3239d3.tar.gz nixlib-5379504451c67b9773191d4cc56638072d3239d3.tar.bz2 nixlib-5379504451c67b9773191d4cc56638072d3239d3.tar.lz nixlib-5379504451c67b9773191d4cc56638072d3239d3.tar.xz nixlib-5379504451c67b9773191d4cc56638072d3239d3.tar.zst nixlib-5379504451c67b9773191d4cc56638072d3239d3.zip | |
Merge pull request #9834 from NixOS/rubies
Merge Ruby versions into one file
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d5b7771d427..24a183f43eb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5091,23 +5091,13 @@ let bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { }; - ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { - inherit (darwin) libobjc; - }; - ruby_2_0_0 = callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { }; - ruby_2_1_0 = callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { }; - ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }; - ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { }; - ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { }; - ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { - inherit (darwin) libobjc libunwind; - }; - ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { - inherit (darwin) libobjc libunwind; - }; - ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { - inherit (darwin) libobjc libunwind; - }; + inherit (callPackages ../development/interpreters/ruby {}) + # TODO: uncomment when ruby_1_8_7 doesn't need autoconf + # ruby_1_8_7 + ruby_1_9_3 + ruby_2_0_0 + ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 + ruby_2_2_0 ruby_2_2_2; # Ruby aliases ruby = ruby_2_2; |