gitlab-shell: 10.2.0 -> 10.3.0

NixOS · Dec 22, 2019 · 6972aec · 6972aec
1 parent 743f3cc
commit 6972aec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,12 +2,12 @@
 
 buildGoPackage rec {
   pname = "gitlab-shell-go";
-  version = "10.2.0";
+  version = "10.3.0";
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj";
+    sha256 = "0kxbw2n5kabh0876xqn1dcjbxyrp82ms566rw065nqrb32g8c2hk";
   };
 
   buildInputs = [ ruby ];

diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,7 +1,7 @@
-diff --git a/go/internal/config/config.go b/go/internal/config/config.go
+diff --git a/internal/config/config.go b/internal/config/config.go
 index 2231851..c869930 100644
---- a/go/internal/config/config.go
-+++ b/go/internal/config/config.go
+--- a/internal/config/config.go
++++ b/internal/config/config.go
 @@ -3,7 +3,6 @@ package config
  import (
  	"io/ioutil"
@@ -29,10 +29,10 @@ index 2231851..c869930 100644
  }
 
  func newFromFile(filename string) (*Config, error) {
-diff --git a/go/internal/keyline/key_line.go b/go/internal/keyline/key_line.go
-index f92f50b..160e287 100644
---- a/go/internal/keyline/key_line.go
-+++ b/go/internal/keyline/key_line.go
+diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
+index c29a320..c44b701 100644
+--- a/internal/keyline/key_line.go
++++ b/internal/keyline/key_line.go
 @@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi
  }
 
@@ -43,10 +43,10 @@ index f92f50b..160e287 100644
  	return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
  }
 diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
-index 1416488..90a5f79 100644
+index 52ac5ee..d96baa3 100644
 --- a/support/gitlab_config.rb
 +++ b/support/gitlab_config.rb
-@@ -4,7 +4,7 @@ class GitlabConfig
+@@ -7,7 +7,7 @@ class GitlabConfig
    attr_reader :config
 
    def initialize