diff options
author | zimbatm <zimbatm@zimbatm.com> | 2016-03-15 20:49:07 +0000 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2016-03-19 22:06:26 +0000 |
commit | 5a64bc44ead7099857e5ecec339e87a80a60796e (patch) | |
tree | 8130746780b4d7c7e636e4e70433418b86951478 | |
parent | 3547ffa89fec408e93627c03f8bf0b3c98bde0e2 (diff) |
move all ruby modules to development/ruby-modules
-rw-r--r-- | pkgs/development/ruby-modules/bundix/default.nix (renamed from pkgs/development/interpreters/ruby/bundix/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/bundler-env/default.nix (renamed from pkgs/development/interpreters/ruby/bundler-env/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/bundler-env/gen-bin-stubs.rb (renamed from pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/bundler/default.nix (renamed from pkgs/development/interpreters/ruby/bundler.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix (renamed from pkgs/development/interpreters/ruby/gemconfig/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/mkrf_conf_xapian.rb (renamed from pkgs/development/interpreters/ruby/gemconfig/mkrf_conf_xapian.rb) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/xapian-Rakefile (renamed from pkgs/development/interpreters/ruby/gemconfig/xapian-Rakefile) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem/default.nix (renamed from pkgs/development/interpreters/ruby/build-ruby-gem/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem/gem-post-build.rb (renamed from pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb) | 0 | ||||
-rw-r--r-- | pkgs/development/ruby-modules/gem/nix-bundle-install.rb (renamed from pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb) | 0 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
12 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index ac3abcdcdf7b9..ac3abcdcdf7b9 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/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 index d5e2154ab3b3e..d5e2154ab3b3e 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default.nix +++ b/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 index fa77682cfd593..fa77682cfd593 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb +++ b/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 index 718da20b00683..718da20b00683 100644 --- a/pkgs/development/interpreters/ruby/bundler.nix +++ b/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 index dd4ae725095dd..dd4ae725095dd 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/default.nix +++ b/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 index e19f06e23ac29..e19f06e23ac29 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/mkrf_conf_xapian.rb +++ b/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 index 9f0b8e72f08c9..9f0b8e72f08c9 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/xapian-Rakefile +++ b/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 index 6e1b0c00bd080..6e1b0c00bd080 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/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 index 4480c525bf16e..4480c525bf16e 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb +++ b/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 index 48ab5270c22f6..48ab5270c22f6 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c8f1ed3b7c35c..f2e1bbc5102cc 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 6f2c015840d49..3ac55c8f81754 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 |