gitlab: 13.6.0 -> 13.6.1 #104689
gitlab: 13.6.0 -> 13.6.1 #104689
Conversation
ghost
requested a review
from 
|
And it works with |
|
Result of 5 packages built:
|
|
@petabyteboy how did you test this? Did you deploy this anywhere? Did you try opening a MR against a repository? As far as I can tell, 13.6.0 is missing |
|
@GrahamcOfBorg eval |
|
@GrahamcOfBorg test gitlab |
| @@ -19,14 +19,14 @@ let | |||
| }; | |||
| }; | |||
| in buildGoPackage rec { | |||
There was a problem hiding this comment.
I noticed they have a go.mod now. can we ditch the 300+ line deps.nix's ? https://gitlab.com/gitlab-org/gitaly/-/blob/master/go.mod
There was a problem hiding this comment.
I think people have different opinions on which Go tooling should be used. I personally don't care so I changed it to buildGoModule and removed the deps.nix.
There was a problem hiding this comment.
Oh nevermind I forgot about other Go components of GitLab, I'll update this PR to remove all deps.nix files from GitLab components.
|
The problem ajs outlined comes from the lack of |
|
Full patch from our config repo: diff --git a/4pkgs/gitlab/gitaly/default.nix b/4pkgs/gitlab/gitaly/default.nix
index 309e9900..48271faa 100644
--- a/4pkgs/gitlab/gitaly/default.nix
+++ b/4pkgs/gitlab/gitaly/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby,
- bundlerEnv, pkgconfig, libgit2_0_27 }:
+{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby
+, bundlerEnv, pkgconfig
+# libgit2 + dependencies
+, libgit2, openssl, zlib, pcre, http-parser }:
let
rubyEnv = bundlerEnv rec {
@@ -30,13 +32,14 @@ in buildGoPackage rec {
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
+ GOFLAGS = "-tags=static,system_libgit2";
passthru = {
inherit rubyEnv;
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
+ buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
goDeps = ./deps.nix;
preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor";
|
|
Thanks a lot for the hint. I had to set buildFlags instead of GOFLAGS, but it did fix the issue. |
I deployed this and tested that git pull / git push work fine on a test repo. I will try to create a MR as well when submitting future updates, but maybe someone else (you?) can test it as well before it gets merged. |
There was a problem hiding this comment.
Works well in my manual testing (creating a repo, adding an ssh key, pushing commits, opening and merging an MR).
Just a thought - maybe the Requires= directive on the gitaly service should be changed to BindsTo=? This creates a stronger bond between them and gitaly will be stopped if gitlab fails for any reason, not just because it's manually stopped. I know this isn't really related to the PR, but it's such a small thing that it doesn't feel worth opening a separate PR over it.
|
Let's get this in - we can still open followup PRs later. Can you backport this to 20.09 as well? #104896 should be trickling through staging-20.09 soon. |
|
Is the update script also updating |
|
True, it doesn't update vendorSha256. I checked each one individually for 13.6.1, but we should add something for that to the update script. |
This is also the first time we used a new version of vgo2nix. This new
version adds a modulesDir attribute to each entry in deps.nix.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)