tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gitlab-shell: 5.9.3 -> 5.10.2
Robin Gloster
8 years ago
0ad54e43
e7e12e51
+16
-5
2 changed files
expand all
collapse all
unified
split
pkgs
applications
version-management
gitlab-shell
default.nix
remove-hardcoded-locations.patch
+3
-5
pkgs/applications/version-management/gitlab-shell/default.nix
···
1
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
2
3
stdenv.mkDerivation rec {
4
-
version = "5.9.3";
5
name = "gitlab-shell-${version}";
6
7
srcs = fetchFromGitLab {
8
owner = "gitlab-org";
9
repo = "gitlab-shell";
10
rev = "v${version}";
11
-
sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p";
12
};
13
14
-
buildInputs = [
15
-
ruby bundler go
16
-
];
17
18
patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];
19
···
1
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
2
3
stdenv.mkDerivation rec {
4
+
version = "5.10.2";
5
name = "gitlab-shell-${version}";
6
7
srcs = fetchFromGitLab {
8
owner = "gitlab-org";
9
repo = "gitlab-shell";
10
rev = "v${version}";
11
+
sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf";
12
};
13
14
+
buildInputs = [ ruby bundler go ];
0
0
15
16
patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];
17
+13
pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
···
25
end
26
27
def api
0
0
0
0
0
0
0
0
0
0
0
0
0
···
25
end
26
27
def api
28
+
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
29
+
index c57b4de..88cfc95 100644
30
+
--- a/go/internal/config/config.go
31
+
+++ b/go/internal/config/config.go
32
+
@@ -27,7 +27,7 @@ func New() (*Config, error) {
33
+
}
34
+
cfg.RootDir = dir
35
+
36
+
- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))
37
+
+ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH"))
38
+
if err != nil {
39
+
return nil, err
40
+
}