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

gitlab-shell: 5.10.2 -> 6.0.3

Browse Source
This commit is contained in:
Simon Lackerbauer 2018-03-14 14:04:39 +01:00 committed by Robin Gloster
parent 31d77fd4f3
commit 08bf87420f
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
3 changed files with 19 additions and 33 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,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }: { stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.10.2"; version = "6.0.3";
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 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf"; sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk";
}; };
buildInputs = [ ruby bundler go ]; buildInputs = [ ruby bundler go ];

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

@ -1,12 +1,11 @@
diff --git a/support/go_build.rb b/support/go_build.rb diff --git a/support/go_build.rb b/support/go_build.rb
index 82f94d2..40ba35e 100644 index 30a6b71..46b4dfa 100644
--- a/support/go_build.rb --- a/support/go_build.rb
+++ b/support/go_build.rb +++ b/support/go_build.rb
@@ -25,9 +25,8 @@ module GoBuild @@ -26,8 +26,8 @@ module GoBuild
def run!(env, cmd)
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) - if !system(env, *cmd)
- abort "command failed: #{env.inspect} #{cmd.join(' ')}" - abort "command failed: #{env.inspect} #{cmd.join(' ')}"
- end - end

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

@ -1,30 +1,3 @@
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 0b11ce3..ffc3faf 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
require_relative 'gitlab_metrics'
class GitlabProjects
- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
+ GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks')
# Project name is a directory name for repository with .git at the end
# It may be namespaced or not. Like repo.git or gitlab/repo.git
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index e7d0254..181ec8a 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -188,7 +188,8 @@ class GitlabShell
end
# 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)
+ # Except we don't, because we're already in the right directory on nixos !
+ Kernel::exec(env, *args, unsetenv_others: true)
end
def api
diff --git a/go/internal/config/config.go b/go/internal/config/config.go diff --git a/go/internal/config/config.go b/go/internal/config/config.go
index c57b4de..88cfc95 100644 index c57b4de..88cfc95 100644
--- a/go/internal/config/config.go --- a/go/internal/config/config.go
@ -38,3 +11,17 @@ index c57b4de..88cfc95 100644
if err != nil { if err != nil {
return nil, err return nil, err
} }
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 1452f95..2b40327 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -180,7 +180,8 @@ class GitlabShell
end
# 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)
+ # Except we don't, because we're already in the right directory on nixos!
+ Kernel::exec(env, *args, unsetenv_others: true)
end
def api