diff options
| author | Robin Gloster <mail@glob.in> | 2018-04-25 19:55:58 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-04-26 00:15:24 +0200 |
| commit | ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f (patch) | |
| tree | 930a89c7f002ad54e2519af34e605d554f8751e7 /pkgs | |
| parent | 59ad9933ff5065bbc14231d7a66c87bedfa0bad7 (diff) | |
| download | nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.tar nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.tar.gz nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.tar.bz2 nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.tar.lz nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.tar.xz nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.tar.zst nixpkgs-ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f.zip | |
gitlab-shell: 6.0.3 -> 7.1.2
Diffstat (limited to 'pkgs')
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ca5b8a84fbf..09c1cd13d44 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 = "6.0.3"; + version = "7.1.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; + sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni"; }; buildInputs = [ ruby bundler go ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index b0ee31cf39d..29e4dccb26c 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -5,8 +5,8 @@ index 30a6b71..46b4dfa 100644 @@ -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) + +- unless system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end + puts "Starting #{env.inspect} #{cmd.join(' ')}" 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 bc1aa858386..38181399eec 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -19,9 +19,9 @@ index 1452f95..2b40327 100644 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) +- 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) ++ Kernel.exec(env, *args, unsetenv_others: true) end def api |