From cb395eaadb8571604a964373d56d754d9e8597b7 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 25 Jan 2015 16:10:04 -0500
Subject: [PATCH] gitlab-shell: fix evaluation

---
 .../version-management/gitlab-shell/default.nix           | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 3d4ae689f6b6..467e39f7141e 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, ruby, rubyLibs, fetchgit }:
+{ stdenv, ruby, bundler, fetchgit }:
 
 stdenv.mkDerivation rec {
   version = "2.1.0";
   name = "gitlab-shell-${version}";
-  
+
   srcs = fetchgit {
     url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
     rev = "823aba63e444afa2f45477819770fec3cb5f0159";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    ruby rubyLibs.bundler
+    ruby bundler
   ];
 
   installPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     export HOME=$(pwd)
     bundle install -j4 --verbose --local --deployment --without development test
   '';
-  
+
   # gitlab-shell will try to read its config relative to the source
   # code by default which doesn't work in nixos because it's a
   # read-only filesystem
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fe5f544a2c9..dce3e0341f2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1315,14 +1315,14 @@ let
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
-  # Evaluation broken by recent ruby changes.
   gitlab = callPackage ../applications/version-management/gitlab {
     libiconv = libiconvOrLibc;
     ruby = ruby_2_1_3;
   };
 
-  # Evaluation broken by recent ruby changes.
-  # gitlab-shell = callPackage ../applications/version-management/gitlab-shell { };
+  gitlab-shell = callPackage ../applications/version-management/gitlab-shell {
+    ruby = ruby_2_1_3;
+  };
 
   glusterfs = callPackage ../tools/filesystems/glusterfs { };