public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab-shell: 10.2.0 -> 10.3.0

Browse Source
This commit is contained in:
talyz 2019-12-22 23:48:18 +01:00
parent 743f3cc258
commit 6972aec884
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -2,12 +2,12 @@
buildGoPackage rec { buildGoPackage rec {
pname = "gitlab-shell-go"; pname = "gitlab-shell-go";
version = "10.2.0"; version = "10.3.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj"; sha256 = "0kxbw2n5kabh0876xqn1dcjbxyrp82ms566rw065nqrb32g8c2hk";
}; };
buildInputs = [ ruby ]; buildInputs = [ ruby ];

17
pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix generated
View File

@ -387,22 +387,13 @@
sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k";
}; };
} }
{
goPackagePath = "github.com/otiai10/curr";
fetch = {
type = "git";
url = "https://github.com/otiai10/curr";
rev = "f5a3d24e5776";
sha256 = "01k33ifs9n0pnhwhbfb9ws3q5sa37fi7dhir5vjakpfzdin07y4w";
};
}
{ {
goPackagePath = "github.com/otiai10/mint"; goPackagePath = "github.com/otiai10/mint";
fetch = { fetch = {
type = "git"; type = "git";
url = "https://github.com/otiai10/mint"; url = "https://github.com/otiai10/mint";
rev = "v1.2.4"; rev = "v1.2.3";
sha256 = "1mf7b8h3akxbpj1rf3nk0ccqk5idd6z2gh9gm31phr7ll4gykn2m"; sha256 = "00slgv9mw2m22ix5prz2a98ji6kpzr0ap6bqs568rfdmk6hm5f0k";
}; };
} }
{ {
@ -662,8 +653,8 @@
fetch = { fetch = {
type = "git"; type = "git";
url = "https://gopkg.in/DataDog/dd-trace-go.v1"; url = "https://gopkg.in/DataDog/dd-trace-go.v1";
rev = "v1.9.0"; rev = "v1.7.0";
sha256 = "1zfbsmm8fbcwhd6j28q3ijyswn1d3dyhydx3ckqpkkp6qiam3c2j"; sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq";
}; };
} }
{ {

18
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
View File

@ -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 index 2231851..c869930 100644
--- a/go/internal/config/config.go --- a/internal/config/config.go
+++ b/go/internal/config/config.go +++ b/internal/config/config.go
@@ -3,7 +3,6 @@ package config @@ -3,7 +3,6 @@ package config
import ( import (
"io/ioutil" "io/ioutil"
@ -29,10 +29,10 @@ index 2231851..c869930 100644
} }
func newFromFile(filename string) (*Config, error) { func newFromFile(filename string) (*Config, error) {
diff --git 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 f92f50b..160e287 100644 index c29a320..c44b701 100644
--- a/go/internal/keyline/key_line.go --- a/internal/keyline/key_line.go
+++ b/go/internal/keyline/key_line.go +++ b/internal/keyline/key_line.go
@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi @@ -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) return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
} }
diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb 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 --- a/support/gitlab_config.rb
+++ b/support/gitlab_config.rb +++ b/support/gitlab_config.rb
@@ -4,7 +4,7 @@ class GitlabConfig @@ -7,7 +7,7 @@ class GitlabConfig
attr_reader :config attr_reader :config
def initialize def initialize