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

plasma-workspace: fix patch #59112

Merged
merged 1 commit into from Apr 7, 2019
Merged

plasma-workspace: fix patch #59112

merged 1 commit into from Apr 7, 2019

Conversation

nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Apr 7, 2019

Motivation for this change

Patch wasn't applied entirely because of a line number error in a diff header (see L84)

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.

- Patch wasn't applied entirely because of a line number error in a diff header (see L84)
- Rewrite of the patch file using git to fix other inconsistencies (git format-patch)
@nyanloutre nyanloutre requested a review from ttuegel as a code owner April 7, 2019 13:06
@nyanloutre
Copy link
Member Author

@GrahamcOfBorg build nixosTests.plasma5

@nyanloutre
Copy link
Member Author

I pushed everything needed for the plasma5 test to https://nyanloutre.cachix.org/

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Seems good. I don't understand why patch doesn't error out on this, as various others kinds of errors are caught.

@xeji xeji merged commit 71aef6f into NixOS:master Apr 7, 2019
scalavision pushed a commit to scalavision/nixpkgs that referenced this pull request Apr 7, 2019
@nyanloutre
Copy link
Member Author

@vcunat: patch didn't throw an error and failed silently while git apply immediately returned an error

@nyanloutre nyanloutre deleted the plasma_5_15_fix branch April 7, 2019 14:47
@vcunat
Copy link
Member

vcunat commented Apr 7, 2019

Maybe it's worth reporting upstream.

@dtzWill
Copy link
Member

dtzWill commented Apr 7, 2019

(sorry for the breakage folks, thanks for the fix! 👍)

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