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

magit-annex: provide external.git #44552

Closed
wants to merge 1 commit into from
Closed

Conversation

mdorman
Copy link
Contributor

@mdorman mdorman commented Aug 6, 2018

Refactor the code to add the input from the magit expression to be reusable.

Motivation for this change

#44539 details how the magit-annex package broke; this is the same breakage that magit experienced---this refactors @ttuegel's solution for that package to be reusable, and adds a similar annotation to magit-annex.

Things done

Rebuilt magit using the refactored expression, which worked fine, and confirmed that the magit-annex expression now installs.

  • 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.

Refactor the code to add the input from the `magit` expression to be
reusable.
@@ -22,6 +22,10 @@ self:

super = imported;

addBuildDepends = pkg: xs: pkg.overrideAttrs (attrs: {
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need this addBuildDepends abstraction instead of just chaining overrideAttrs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, personally, I feel like using named abstraction is a better alternative than coding by cut-and-paste---and there are four instances of that cut-and-paste in the file at present.

But if people don't think there's value, then, ehh, whatever.

@mdorman mdorman closed this Aug 7, 2018
@mdorman mdorman deleted the magit-annex branch August 7, 2018 10:46
@oxij
Copy link
Member

oxij commented Aug 7, 2018 via email

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