diff options
| author | Robin Gloster <mail@glob.in> | 2018-01-07 04:58:31 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-01-07 05:02:45 +0100 |
| commit | 0ad54e43dfcd9a111459637edadf7d77e38203f7 (patch) | |
| tree | 8afb8b3735e001130b6caa8e416b3b11c9b9dbc4 /pkgs/applications/version-management/gitlab-shell | |
| parent | e7e12e5173525037fec187bd7ef043ec7ec61e4e (diff) | |
| download | nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.tar nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.tar.gz nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.tar.bz2 nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.tar.lz nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.tar.xz nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.tar.zst nixlib-0ad54e43dfcd9a111459637edadf7d77e38203f7.zip | |
gitlab-shell: 5.9.3 -> 5.10.2
Diffstat (limited to 'pkgs/applications/version-management/gitlab-shell')
| -rw-r--r-- | pkgs/applications/version-management/gitlab-shell/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch | 13 |
2 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ac05ca4c4847..ab0ff74f03f5 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,19 +1,17 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "5.9.3"; + version = "5.10.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p"; + sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf"; }; - buildInputs = [ - ruby bundler go - ]; + buildInputs = [ ruby bundler go ]; patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ]; diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index dd1ecafb8bf8..f28e74b88c50 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -25,3 +25,16 @@ index e7d0254..181ec8a 100644 end 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 + } |