diff options
author | Kristoffer Thømt Ravneberg <ktra@dbc.dk> | 2018-09-21 09:34:26 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-09-25 03:53:32 +0200 |
commit | bfc8d80c6ec842b21b4a19306a871db7010048d8 (patch) | |
tree | bdd3fc607c57a37e96e82d37d803195136192d63 /pkgs/applications/version-management | |
parent | 949172f2890e9b4ed0ef1f60a895f3c4941986f9 (diff) | |
download | nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.tar nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.tar.gz nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.tar.bz2 nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.tar.lz nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.tar.xz nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.tar.zst nixpkgs-bfc8d80c6ec842b21b4a19306a871db7010048d8.zip |
gitlab-shell: 7.1.2 -> 8.1.1
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/gitlab-shell/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/version-management/gitlab-shell/fixes.patch | 16 |
2 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 09c1cd13d44..b8546dce952 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch deleted file mode 100644 index 29e4dccb26c..00000000000 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ /dev/null @@ -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 |