Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.03] gitlab 12.1.6 -> 2.2.3 #67773

Closed
wants to merge 4 commits into from

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Aug 30, 2019

Motivation for this change

19.03 backport for https://github.com/NixOS/nixpkgs/pull/67770/commits

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

(cherry picked from commit 63d31cf95c72a2fbf8506c5d770ed8116381dfc6)
(cherry picked from commit 441286f15ca39a7622873731cd7a5de8df67fd32)
(cherry picked from commit 47e5edd63d5b5d35085dce5df13e35ebcb639463)
(cherry picked from commit c9d8f22a774bc3dd8c8fc745cee8f4d443ad100c)

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "1zlngc498hnzbxwdjn3ymr0xwrnfgnzzhn9lyf37yfbjl8x28n3z";
sha256 = "02a1z2nky31acd17q2n4pi4jkbkr6x6frfi6qlcsmfza0x0kzpc0";
Copy link
Contributor

@jonringer jonringer Aug 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for darwin, it looks like there's a different release of this, or somehow getting a different hash:

hash mismatch in fixed-output derivation '/nix/store/kmrla6v72mv9gjk1pm9nwi7mlnsl4qis-source':
  wanted: sha256:02a1z2nky31acd17q2n4pi4jkbkr6x6frfi6qlcsmfza0x0kzpc0
  got:    sha256:0dfzib24a23z92jw2h3pzbl1d7m56rbf36l55mblwhx7nhan9v2g

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh? @LnL7, any thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fetching from gitlab should be the same on both darwin and linux. Maybe the used git binary behaves differently?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very odd, i know, but that's what ofborg is tripping on

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doing a nix-review on my macbook yields spectacular failures all over the place from trying to build ruby packages :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jonringer did it previously work on macos?

Copy link
Contributor

@jonringer jonringer Aug 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like that's a no.... gitlab expression only supports linux. Now I'm curious as to why ofborg tried to instantiate it...

@flokli flokli closed this Aug 31, 2019
@flokli
Copy link
Contributor Author

flokli commented Aug 31, 2019

Let's close this until #67770 is ready.

I restricted meta.platforms to platforms.linux on all gitlab server components and pushed a rebased version there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants