ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

gitlab-shell: 7.1.2 -> 8.1.1

Browse Source
This commit is contained in:
Kristoffer Thømt Ravneberg 2018-09-21 09:34:26 +02:00 committed by Robin Gloster
parent 949172f289
commit bfc8d80c6e
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,19 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
version = "7.1.2";
version = "8.1.1";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni";
sha256 = "12lhxlkdbxqiwb2jm66lwykb3mba1kndd3miwb6ac9l6ngvqgyzz";
};
buildInputs = [ ruby bundler go ];
patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];
patches = [ ./remove-hardcoded-locations.patch ];
installPhase = ''
ruby bin/compile
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "SSH access and repository management app for GitLab";
homepage = http://www.gitlab.com/;
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz globin ];

16
pkgs/applications/version-management/gitlab-shell/fixes.patch
View File

@ -1,16 +0,0 @@
diff --git a/support/go_build.rb b/support/go_build.rb
index 30a6b71..46b4dfa 100644
--- a/support/go_build.rb
+++ b/support/go_build.rb
@@ -26,8 +26,8 @@ module GoBuild
raise "env must be a hash" unless env.is_a?(Hash)
raise "cmd must be an array" unless cmd.is_a?(Array)
- unless system(env, *cmd)
- abort "command failed: #{env.inspect} #{cmd.join(' ')}"
- end
+ puts "Starting #{env.inspect} #{cmd.join(' ')}"
+ Process::wait(Process::spawn(env, *cmd))
+ abort "command failed: #{env.inspect} #{cmd.join(' ')}" unless $?.exitstatus == 0
end
end