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

P4Merge init 18.2 #40789

Closed
wants to merge 1 commit into from
Closed

P4Merge init 18.2 #40789

wants to merge 1 commit into from

Conversation

PsyanticY
Copy link
Contributor

Motivation for this change

Visual Merge Tool and Diff Tool for Designers and Developers Alike.
#40722

(Not sure if that is the best place for such package.)

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
    • other Linux distributions (Ubuntu 18.04)
  • 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/)
  • Fits CONTRIBUTING.md.

@xeji
Copy link
Contributor

xeji commented May 19, 2018

Have a look at the existing p4v package, it includes p4merge but needs updating to build.
If that works, I'd recommend using p4v instead of adding an extra package which essentially is just a subset.

@PsyanticY PsyanticY mentioned this pull request May 20, 2018
Closed
@PsyanticY PsyanticY closed this May 20, 2018
@PsyanticY
Copy link
Contributor Author

True, Closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@PsyanticY @xeji @GrahamcOfBorg