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

kdiff3: 1.7.x -> 1.8.1 #61623

Merged
merged 2 commits into from May 19, 2019
Merged

kdiff3: 1.7.x -> 1.8.1 #61623

merged 2 commits into from May 19, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 17, 2019

Drop git-diff patch, really hope it's not still outstanding
(and it doesn't apply).
cc @vcunat (who filed linked upstream issue)

Motivation for this change
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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from peterhoeg May 17, 2019 09:44
charles-dyfis-net
charles-dyfis-net approved these changes May 18, 2019
View reviewed changes
Copy link
Contributor

@charles-dyfis-net charles-dyfis-net left a comment

Choose a reason for hiding this comment

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

Looks good on a read; builds and executes on NixOS with sandboxing enabled.

pkgs/tools/text/kdiff3/default.nix Outdated Show resolved Hide resolved
pkgs/tools/text/kdiff3/default.nix Show resolved Hide resolved
@dtzWill
kdiff3: 1.8, finally a release!
9b3b2af 
Drop git-diff patch, really hope it's not still outstanding
(and it doesn't apply).
cc @vcunat (who filed linked upstream issue)
@dtzWill dtzWill changed the title kdiff3: 1.8, finally a release! kdiff3: 1.7.x -> 1.8.1 May 19, 2019
@dtzWill dtzWill merged commit 8932e2c into NixOS:master May 19, 2019
@dtzWill dtzWill deleted the update/kdiff3-1.8 branch May 19, 2019 08:25
@vcunat
Copy link
Member

vcunat commented May 19, 2019

So far git merge-tool seems to work OK for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charles-dyfis-net charles-dyfis-net charles-dyfis-net approved these changes

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

Assignees
No one assigned
Labels
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
@dtzWill @vcunat @charles-dyfis-net