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

Add patiencediff python library #106100

Merged
merged 3 commits into from Dec 7, 2020
Merged

Conversation

wildsebastian
Copy link
Contributor

Add external patiencediff library to python-modules and as a dependency
to breezy.

Motivation for this change

nix-prefetch-baz does not build with latest breezy version 3.1.0. This requires the external package patiencediff.

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.

Copy link
Member

@nyanloutre nyanloutre left a comment

Choose a reason for hiding this comment

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

Tested it successfully on my system

Comment on lines 15 to 17
meta = with stdenv.lib; {
description = "This package contains the implementation of the patiencediff algorithm";
homepage = "https://www.breezy-vcs.org/";
};
Copy link
Member

Choose a reason for hiding this comment

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

Could you add the license and a maintainer ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure thing!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I hope it is fine that I added myself as maintainer. I did not want to push it to someone else.

@orivej
Copy link
Contributor

orivej commented Dec 7, 2020

Thank you! I have made some changes to this PR:

  • split into multiple commits; (The general rule is to have one commit per package or per a non-package directory.)
  • named them according to the CONTRIBUTING guide;
  • enabled patiencediff tests; (Did you copy doCheck = false; # too complicated to setup from another package?)
  • changed its license from gpl2 to gpl2Plus. (Its source say "either version 2 of the License, or (at your option) any later version".)

@wildsebastian
Copy link
Contributor Author

@orivej Thank you!

  • Sorry, I missed the multi commit rule.
  • Also my bad, sorry for that.
  • My bad again
    Thank you for your comment! I will be more careful next time!

@orivej-nixos orivej-nixos merged commit 6acae29 into NixOS:master Dec 7, 2020
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