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

gitlab: 13.0.14 -> 13.4.3

Browse Source 
13.4.3
This commit is contained in:
Jeff Slight
2020-11-20 19:26:30 +01:00
committed by Milan Pässler
parent 8b010d8904
commit c16a977386
18 changed files with 5018 additions and 2037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+6 -2
View File
@@ -2,12 +2,12 @@
buildGoPackage rec {
pname = "gitlab-shell";
version = "13.2.0";
version = "13.7.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "0drdpg4nmhzrmy8sl1f3hcd1278bpapgf0wmhi94xlyayh47j53a";
sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
};
buildInputs = [ ruby ];
@@ -17,6 +17,10 @@ buildGoPackage rec {
goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
goDeps = ./deps.nix;
preBuild = ''
rm -rf "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor"
'';
postInstall = ''
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/
pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
Generated
+1238 -50
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+8 -8
View File
@@ -30,18 +30,18 @@ index 2231851..c869930 100644
func newFromFile(filename string) (*Config, error) {
diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
index c29a320..c44b701 100644
index e2abb82..7e9c481 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
}
@@ -38,7 +38,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi
func (k *KeyLine) ToString() string {
- command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
sslCertDirEnvVar := k.sslCertDirEnvVar()
- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
+ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id)
return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
}
if sslCertDirEnvVar != "" {
sslCertDirEnvVar = fmt.Sprintf(`%s `, sslCertDirEnvVar)
diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
index 52ac5ee..d96baa3 100644
--- a/support/gitlab_config.rb