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.

Sign up for GitHub

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

Jump to bottom

buildGoModule/vend: use upstream instead of fork #95487

Merged
merged 1 commit into from Aug 19, 2020
Merged

buildGoModule/vend: use upstream instead of fork #95487

merged 1 commit into from Aug 19, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Aug 15, 2020 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

Closes #94574

@zowoq zowoq mentioned this pull request Aug 15, 2020
Closed
10 tasks
@zowoq
Copy link
Contributor Author

zowoq commented Aug 15, 2020

@ofborg build aerc mautrix-whatsapp

@kalbasit
Copy link
Member

I'm confused, didn't we fork to avoid maintaining a patch? Why are switching back?

@zowoq
Copy link
Contributor Author

zowoq commented Aug 15, 2020

I'm confused, didn't we fork to avoid maintaining a patch? Why are switching back?

See discussion in #94574.

@zowoq zowoq marked this pull request as ready for review August 17, 2020 06:11
@ofborg ofborg bot requested a review from Mic92 August 17, 2020 08:01
Mic92
Mic92 reviewed Aug 19, 2020
View reviewed changes
pkgs/servers/mautrix-whatsapp/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {

buildInputs = [ olm ];

vendorSha256 = "05cqwprd1rcciw27wyz7lj1s3zmz2vq093vw1cx3kkjyf6lq8sk6";
vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s";
Copy link
Member

Choose a reason for hiding this comment

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

Because of this we should not wait too long to merge it to get in before the branch off.

@zowoq
Copy link
Contributor Author

zowoq commented Aug 19, 2020

Rebased on master and rechecked the hashes.

@zowoq zowoq merged commit 7dec299 into NixOS:master Aug 19, 2020
@zowoq zowoq deleted the vend-upstream branch August 19, 2020 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@flokli flokli flokli left review comments

@Vskilet Vskilet Awaiting requested review from Vskilet

@Ma27 Ma27 Awaiting requested review from Ma27

@kalbasit kalbasit Awaiting requested review from kalbasit

@tadeokondrak tadeokondrak Awaiting requested review from tadeokondrak

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zowoq @kalbasit @Mic92 @flokli