public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab-shell: 6.0.3 -> 7.1.2

Browse Source
This commit is contained in:
Robin Gloster 2018-04-25 19:55:58 +02:00
parent 59ad9933ff
commit ddec4ae7a0
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }: { stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.0.3"; version = "7.1.2";
name = "gitlab-shell-${version}"; name = "gitlab-shell-${version}";
srcs = fetchFromGitLab { srcs = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni";
}; };
buildInputs = [ ruby bundler go ]; buildInputs = [ ruby bundler go ];
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.gitlab.com/; homepage = http://www.gitlab.com/;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz globin ];
license = licenses.mit; license = licenses.mit;
}; };
} }

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

@ -5,8 +5,8 @@ index 30a6b71..46b4dfa 100644
@@ -26,8 +26,8 @@ module GoBuild @@ -26,8 +26,8 @@ module GoBuild
raise "env must be a hash" unless env.is_a?(Hash) raise "env must be a hash" unless env.is_a?(Hash)
raise "cmd must be an array" unless cmd.is_a?(Array) raise "cmd must be an array" unless cmd.is_a?(Array)
- if !system(env, *cmd) - unless system(env, *cmd)
- abort "command failed: #{env.inspect} #{cmd.join(' ')}" - abort "command failed: #{env.inspect} #{cmd.join(' ')}"
- end - end
+ puts "Starting #{env.inspect} #{cmd.join(' ')}" + puts "Starting #{env.inspect} #{cmd.join(' ')}"

4
pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
View File

@ -19,9 +19,9 @@ index 1452f95..2b40327 100644
end end
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) - Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
+ # Except we don't, because we're already in the right directory on nixos! + # Except we don't, because we're already in the right directory on nixos!
+ Kernel::exec(env, *args, unsetenv_others: true) + Kernel.exec(env, *args, unsetenv_others: true)
end end
def api def api