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

Unbreak hg-git #50401

Merged
merged 1 commit into from Nov 25, 2018
Merged

Unbreak hg-git #50401

merged 1 commit into from Nov 25, 2018

Conversation

mikesperber
Copy link
Contributor

Motivation for this change

hg-git did not work with the current Mercurial because of well-known issues,
one of which is fixed in the latest release, the second one of which has a simple
patch.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

};

propagatedBuildInputs = [ dulwich ];
patches = [
# Needs patch to work with Mercurial 4.8
# https://bitbucket.org/durin42/hg-git/issues/264/unexpected-keyword-argument-createopts-hg
Copy link
Member

Choose a reason for hiding this comment

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

Can you use?

fetchpatch {
  url = "https://bitbucket.org/rsalmaso/hg-git/commits/a778506fd4be0bf1afa75755f6ee9260fa234a0f/raw";
  sha256 = "<insert-sha-sum>";
}

@mikesperber
Copy link
Contributor Author

Sure, but could you briefly explain why? It seems it inserts a dependency on a bitbucket page making the build process more fragile.

@Mic92
Copy link
Member

Mic92 commented Nov 15, 2018

Then we don't need to carry the patch in our channel, it is clear where the patch comes from and our cache will also make sure that the patch is available when bitbucket is down.

@mikesperber
Copy link
Contributor Author

Thanks for the explanation! (And thanks for the quick review.)

Done.

@c0bw3b c0bw3b merged commit f0261e3 into NixOS:master Nov 25, 2018
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

4 participants