From 5a64bc44ead7099857e5ecec339e87a80a60796e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 15 Mar 2016 20:49:07 +0000 Subject: [PATCH] move all ruby modules to development/ruby-modules --- .../ruby => ruby-modules}/bundix/default.nix | 0 .../ruby => ruby-modules}/bundler-env/default.nix | 0 .../bundler-env/gen-bin-stubs.rb | 0 .../bundler/default.nix} | 0 .../gem-config}/default.nix | 0 .../gem-config}/mkrf_conf_xapian.rb | 0 .../gem-config}/xapian-Rakefile | 0 .../build-ruby-gem => ruby-modules/gem}/default.nix | 0 .../gem}/gem-post-build.rb | 0 .../gem}/nix-bundle-install.rb | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 13 +++++-------- 12 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/development/{interpreters/ruby => ruby-modules}/bundix/default.nix (100%) rename pkgs/development/{interpreters/ruby => ruby-modules}/bundler-env/default.nix (100%) rename pkgs/development/{interpreters/ruby => ruby-modules}/bundler-env/gen-bin-stubs.rb (100%) rename pkgs/development/{interpreters/ruby/bundler.nix => ruby-modules/bundler/default.nix} (100%) rename pkgs/development/{interpreters/ruby/gemconfig => ruby-modules/gem-config}/default.nix (100%) rename pkgs/development/{interpreters/ruby/gemconfig => ruby-modules/gem-config}/mkrf_conf_xapian.rb (100%) rename pkgs/development/{interpreters/ruby/gemconfig => ruby-modules/gem-config}/xapian-Rakefile (100%) rename pkgs/development/{interpreters/ruby/build-ruby-gem => ruby-modules/gem}/default.nix (100%) rename pkgs/development/{interpreters/ruby/build-ruby-gem => ruby-modules/gem}/gem-post-build.rb (100%) rename pkgs/development/{interpreters/ruby/build-ruby-gem => ruby-modules/gem}/nix-bundle-install.rb (100%) diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix similarity index 100% rename from pkgs/development/interpreters/ruby/bundix/default.nix rename to pkgs/development/ruby-modules/bundix/default.nix diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix similarity index 100% rename from pkgs/development/interpreters/ruby/bundler-env/default.nix rename to pkgs/development/ruby-modules/bundler-env/default.nix diff --git a/pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb similarity index 100% rename from pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb rename to pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/ruby-modules/bundler/default.nix similarity index 100% rename from pkgs/development/interpreters/ruby/bundler.nix rename to pkgs/development/ruby-modules/bundler/default.nix diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix similarity index 100% rename from pkgs/development/interpreters/ruby/gemconfig/default.nix rename to pkgs/development/ruby-modules/gem-config/default.nix diff --git a/pkgs/development/interpreters/ruby/gemconfig/mkrf_conf_xapian.rb b/pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb similarity index 100% rename from pkgs/development/interpreters/ruby/gemconfig/mkrf_conf_xapian.rb rename to pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb diff --git a/pkgs/development/interpreters/ruby/gemconfig/xapian-Rakefile b/pkgs/development/ruby-modules/gem-config/xapian-Rakefile similarity index 100% rename from pkgs/development/interpreters/ruby/gemconfig/xapian-Rakefile rename to pkgs/development/ruby-modules/gem-config/xapian-Rakefile diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix similarity index 100% rename from pkgs/development/interpreters/ruby/build-ruby-gem/default.nix rename to pkgs/development/ruby-modules/gem/default.nix diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb b/pkgs/development/ruby-modules/gem/gem-post-build.rb similarity index 100% rename from pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb rename to pkgs/development/ruby-modules/gem/gem-post-build.rb diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb similarity index 100% rename from pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb rename to pkgs/development/ruby-modules/gem/nix-bundle-install.rb diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c8f1ed3b7c35..f2e1bbc5102c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -15,6 +15,7 @@ rec { bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 buildbotSlave = buildbot-slave; # added 2014-12-09 + bundler_HEAD = bundler; # added 2015-11-15 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 clangAnalyzer = clang-analyzer; # added 2015-02-20 conkerorWrapper = conkeror; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f2c015840d4..3ac55c8f8175 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5589,14 +5589,11 @@ let pixie = callPackage ../development/interpreters/pixie { }; dust = callPackage ../development/interpreters/pixie/dust.nix { }; - bundix = callPackage ../development/interpreters/ruby/bundix { - ruby = ruby_2_1; - }; - bundler = callPackage ../development/interpreters/ruby/bundler.nix { }; - bundler_HEAD = bundler; - defaultGemConfig = callPackage ../development/interpreters/ruby/gemconfig/default.nix { }; - buildRubyGem = callPackage ../development/interpreters/ruby/build-ruby-gem { }; - bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; + buildRubyGem = callPackage ../development/ruby-modules/gem { }; + defaultGemConfig = callPackage ../development/ruby-modules/gem-config { }; + bundix = callPackage ../development/ruby-modules/bundix { }; + bundler = callPackage ../development/ruby-modules/bundler { }; + bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; inherit (callPackage ../development/interpreters/ruby {}) ruby_1_9_3