public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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

8
pkgs/applications/version-management/gitlab-shell/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, ruby, rubyLibs, fetchgit }: { stdenv, ruby, bundler, fetchgit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.0"; version = "2.1.0";
name = "gitlab-shell-${version}"; name = "gitlab-shell-${version}";
srcs = fetchgit { srcs = fetchgit {
url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
rev = "823aba63e444afa2f45477819770fec3cb5f0159"; rev = "823aba63e444afa2f45477819770fec3cb5f0159";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
ruby rubyLibs.bundler ruby bundler
]; ];
installPhase = '' installPhase = ''
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
export HOME=$(pwd) export HOME=$(pwd)
bundle install -j4 --verbose --local --deployment --without development test bundle install -j4 --verbose --local --deployment --without development test
''; '';
# gitlab-shell will try to read its config relative to the source # 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 # code by default which doesn't work in nixos because it's a
# read-only filesystem # read-only filesystem

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

@ -1315,14 +1315,14 @@ let
gifsicle = callPackage ../tools/graphics/gifsicle { }; gifsicle = callPackage ../tools/graphics/gifsicle { };
# Evaluation broken by recent ruby changes.
gitlab = callPackage ../applications/version-management/gitlab { gitlab = callPackage ../applications/version-management/gitlab {
libiconv = libiconvOrLibc; libiconv = libiconvOrLibc;
ruby = ruby_2_1_3; 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 { }; glusterfs = callPackage ../tools/filesystems/glusterfs { };