public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modernize rubies

Browse Source
This commit is contained in:
Jude Taylor 2015-07-09 15:42:47 -07:00
parent f72beea75e
commit 7393c6c69d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/ruby/ruby-2.2.0.nix
View File

@ -7,6 +7,7 @@
, libyaml, yamlSupport ? true , libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true , libffi, fiddleSupport ? true
, ruby_2_2_0, autoreconfHook, bison, useRailsExpress ? true , ruby_2_2_0, autoreconfHook, bison, useRailsExpress ? true
, libiconv, libobjc, libunwind
}: }:
let let
@ -47,7 +48,8 @@ stdenv.mkDerivation rec {
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
# running on darwin # running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline); ++ (op (!cursesSupport && stdenv.isDarwin) readline)
++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/interpreters/ruby/ruby-2.2.2.nix
View File

@ -7,6 +7,7 @@
, libyaml, yamlSupport ? true , libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true , libffi, fiddleSupport ? true
, ruby_2_2_2, autoreconfHook, bison, useRailsExpress ? true , ruby_2_2_2, autoreconfHook, bison, useRailsExpress ? true
, libiconv, libobjc, libunwind
}: }:
let let
@ -47,7 +48,8 @@ stdenv.mkDerivation rec {
# support is not enabled, so add readline to the build inputs if curses # support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're # support is disabled (if it's enabled, we already have it) and we're
# running on darwin # running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline); ++ (op (!cursesSupport && stdenv.isDarwin) readline)
++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View File

@ -5047,7 +5047,9 @@ let
ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.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 { }; ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { };
ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { }; ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { };
ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { }; ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix {
inherit (darwin) libobjc libunwind;
};
# Ruby aliases # Ruby aliases
ruby = ruby_2_2; ruby = ruby_2_2;