From bfc8d80c6ec842b21b4a19306a871db7010048d8 Mon Sep 17 00:00:00 2001
From: Kristoffer Thømt Ravneberg <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:34:26 +0200
Subject: gitlab-shell: 7.1.2 -> 8.1.1

---
 .../version-management/gitlab-shell/default.nix          |  9 +++++----
 .../version-management/gitlab-shell/fixes.patch          | 16 ----------------
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab-shell/fixes.patch

(limited to 'pkgs/applications/version-management')

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 09c1cd13d440..b8546dce952b 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 29e4dccb26c7..000000000000
--- 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
-- 
cgit 1.4.1