alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gitlab-shell: fix evaluation

Browse source
This commit is contained in:
Charles Strahan 2015-01-25 16:10:04 -05:00
parent 6eaa419920
commit cb395eaadb
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/gitlab-shell/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, ruby, rubyLibs, fetchgit }:
{ stdenv, ruby, bundler, fetchgit }:
stdenv.mkDerivation rec {
version = "2.1.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
ruby rubyLibs.bundler
ruby bundler
];
installPhase = ''

6
pkgs/top-level/all-packages.nix
View file

@ -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 { };