From 64fe2b5eb6111cd8fc1688bf177988cc7fe7d4d9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 15 Mar 2016 20:50:10 +0000 Subject: [PATCH 1/4] gitlab: remove unused parameter --- pkgs/applications/version-management/gitlab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 87d20b7c9d31..9a3ce8bed224 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, defaultGemConfig, libiconv, ruby +{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, libiconv, ruby , tzdata, git, nodejs, procps }: From eccad06e23a12bea201f1f540b56808b4ed71a12 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 15 Mar 2016 20:50:57 +0000 Subject: [PATCH 2/4] remove unsed ruby-sqlite3 package --- .../ruby-modules/sqlite3/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 pkgs/development/ruby-modules/sqlite3/default.nix diff --git a/pkgs/development/ruby-modules/sqlite3/default.nix b/pkgs/development/ruby-modules/sqlite3/default.nix deleted file mode 100644 index 33a8951921e7..000000000000 --- a/pkgs/development/ruby-modules/sqlite3/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, ruby, sqlite}: - -stdenv.mkDerivation { - name = "ruby-sqlite3-1.2.4"; - src = fetchurl { - url = http://rubyforge.org/frs/download.php/42055/sqlite3-ruby-1.2.4.tar.bz2; - sha256 = "1mmhlrggzdsbhpmifv1iibrf4ch3ycm878pxil3x3xhf9l6vp0a7"; - }; - buildInputs = [ruby sqlite]; - buildPhase = "true"; - installPhase = '' - mkdir -p $out/lib - ruby setup.rb config --prefix=$out - # --bindir $out/bin --libdir $out/lib - ruby setup.rb setup - ruby setup.rb install - ''; -} From 3547ffa89fec408e93627c03f8bf0b3c98bde0e2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 16 Mar 2016 19:56:47 +0000 Subject: [PATCH 3/4] ruby: remove unused patches --- .../development/interpreters/ruby/patches.nix | 138 ------------------ .../ruby-modules/fake-s3-list-bucket.patch | 30 ---- 2 files changed, 168 deletions(-) delete mode 100644 pkgs/development/interpreters/ruby/patches.nix delete mode 100644 pkgs/development/ruby-modules/fake-s3-list-bucket.patch diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix deleted file mode 100644 index 0cc477c991ef..000000000000 --- a/pkgs/development/interpreters/ruby/patches.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk, python, stdenv, libiconv, imagemagick -, pkgconfig }: - -let - - patchUsrBinEnv = writeScript "path-usr-bin-env" '' - #!/bin/sh - echo "===================" - find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" - find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" - ''; - -in - -{ - buildr = { - # Many Buildfiles rely on RUBYLIB containing the current directory - # (as was the default in Ruby < 1.9.2). - extraWrapperFlags = "--prefix RUBYLIB : ."; - }; - - fakes3 = { - postInstall = '' - cd $out/${ruby.gemPath}/gems/* - patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch} - ''; - }; - - ffi = { - postUnpack = "onetuh"; - buildFlags = ["--with-ffi-dir=${libffi}"]; - NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; - }; - - iconv = { buildInputs = [ libiconv ]; }; - - libv8 = { - # This fix is needed to fool scons, which clears the environment by default. - # It's ugly, but it works. - # - # We create a gcc wrapper wrapper, which reexposes the environment variables - # that scons hides. Furthermore, they treat warnings as errors causing the - # build to fail, due to an unused variable. - # - # Finally, we must set CC and AR explicitly to allow scons to find the - # compiler and archiver - - preBuild = '' - cat > $TMPDIR/g++ < -Date: Wed Sep 4 16:16:12 2013 -0400 - - Fix LS_BUCKET - - GET foo.s3.amazonaws.com/ and GET s3.amazonaws.com/foo should result in - an LS_BUCKET request, but under the previous logic it would result in a - LIST_BUCKETS request. GET s3.amazonaws.com/ still results in a - LIST_BUCKETS request due to the 'if path == "/" and s_req.is_path_style' - conditional. - - Signed-off-by: Shea Levy - -diff --git a/lib/fakes3/server.rb b/lib/fakes3/server.rb -index 6958151..36d9cad 100644 ---- a/lib/fakes3/server.rb -+++ b/lib/fakes3/server.rb -@@ -213,10 +213,7 @@ module FakeS3 - elems = path.split("/") - end - -- if elems.size == 0 -- # List buckets -- s_req.type = Request::LIST_BUCKETS -- elsif elems.size == 1 -+ if elems.size < 2 - s_req.type = Request::LS_BUCKET - s_req.query = query - else From 5a64bc44ead7099857e5ecec339e87a80a60796e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 15 Mar 2016 20:49:07 +0000 Subject: [PATCH 4/4] 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