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

git-cola: 2.8 -> 2.10 #24552

Merged
merged 1 commit into from Apr 2, 2017
Merged

git-cola: 2.8 -> 2.10 #24552

merged 1 commit into from Apr 2, 2017

Conversation

ndowens
Copy link
Contributor

@ndowens ndowens commented Apr 2, 2017

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@ndowens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bobvanderlinden and @FRidh to be potential reviewers.

@FRidh
Copy link
Member

FRidh commented Apr 2, 2017

Looks good.

By the way, I think wrapPythonPrograms is called twice, once in the fixupPhase and once more in the postFixup.

git-cola: Remove postFixup
@ndowens
Copy link
Contributor Author

ndowens commented Apr 2, 2017

@FRidh I removed postFixup, though not sure if it was the correct thing to do or not; from what I can tell git-cola works but see if you think it shouldn't have been done?

@bobvanderlinden
Copy link
Member

Apparently the problem with Nix's wrapping and import __future__ was fixed and the hack isn't needed anymore, so removing it is alright. I just tried this PR and it seems to be running fine. Code improved as well, so 👍 for merging.

@Mic92 Mic92 merged commit a18ac4f into NixOS:master Apr 2, 2017
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

5 participants