diff options
author | Simon Lackerbauer <simon@lackerbauer.com> | 2018-03-14 14:04:39 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-03-22 02:29:27 +0100 |
commit | 08bf87420f0a680f6a3765bcb99a97e5edc57bfb (patch) | |
tree | 781045b9a42f70c7c54294a947b6b022d041888c /pkgs/applications/version-management/gitlab-shell | |
parent | 31d77fd4f3d009631e0dc4361bfc0648fadcce4a (diff) | |
download | nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.tar nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.tar.gz nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.tar.bz2 nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.tar.lz nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.tar.xz nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.tar.zst nixlib-08bf87420f0a680f6a3765bcb99a97e5edc57bfb.zip |
gitlab-shell: 5.10.2 -> 6.0.3
Diffstat (limited to 'pkgs/applications/version-management/gitlab-shell')
3 files changed, 19 insertions, 33 deletions
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 2d013ff70944..ca5b8a84fbf9 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.10.2"; + version = "6.0.3"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf"; + sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; }; buildInputs = [ ruby bundler go ]; diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index 1c694266e470..b0ee31cf39dd 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -1,12 +1,11 @@ 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 +++ b/support/go_build.rb -@@ -25,9 +25,8 @@ module GoBuild - def run!(env, cmd) +@@ -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) -- + - if !system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index d0e555b33df9..bc1aa8583867 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -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 index c57b4de..88cfc95 100644 --- a/go/internal/config/config.go @@ -38,3 +11,17 @@ index c57b4de..88cfc95 100644 if err != nil { 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 |