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

gitlab-shell: 5.9.3 -> 5.10.2

This commit is contained in:
Robin Gloster 2018-01-07 04:58:31 +01:00
parent e7e12e5173
commit 0ad54e43df
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,17 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }: { stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.9.3"; version = "5.10.2";
name = "gitlab-shell-${version}"; name = "gitlab-shell-${version}";
srcs = fetchFromGitLab { srcs = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-shell"; repo = "gitlab-shell";
rev = "v${version}"; rev = "v${version}";
sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p"; sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf";
}; };
buildInputs = [ buildInputs = [ ruby bundler go ];
ruby bundler go
];
patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ]; patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];

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

@ -25,3 +25,16 @@ index e7d0254..181ec8a 100644
end end
def api def api
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
index c57b4de..88cfc95 100644
--- a/go/internal/config/config.go
+++ b/go/internal/config/config.go
@@ -27,7 +27,7 @@ func New() (*Config, error) {
}
cfg.RootDir = dir
- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))
+ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH"))
if err != nil {
return nil, err
}