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

Jump to bottom

synergy: 1.8.8 -> 1.11.0 #80138

Merged
merged 1 commit into from Feb 15, 2020
Merged

synergy: 1.8.8 -> 1.11.0 #80138

merged 1 commit into from Feb 15, 2020

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Feb 14, 2020

This gets rid of a few patches that aren't needed any more, adds one to make the tests work again and updates the MacOS patch. It also introduces two builds - one with the Qt application and one without.

The patch to get the tests working will be submitted upstream and hopefully not be needed for future releases.

I've tested this very briefly on MacOS; it works, but could use some love - it should for example be bundled to integrate better. I'll look into fixing this too when I have access to a Mac and some time, probably next week :) At any rate, this works as well or better than it previously did, so I don't think this is a merge stopper, just a nice-to-have.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@talyz
synergy: 1.8.8 -> 1.11.0
966062d 
This gets rid of a few patches that aren't needed any more, adds one
to make the tests work again and updates the MacOS patch. It also
introduces two builds - one with the Qt application and one without.

The patch to get the tests working will be submitted upstream and
hopefully not be needed for future releases.
@talyz
Copy link
Contributor Author

talyz commented Feb 14, 2020

@GrahamcOfBorg build synergy synergyWithoutGUI

@ofborg ofborg bot requested a review from aszlig February 14, 2020 21:04
@talyz talyz mentioned this pull request Feb 14, 2020
Merged
@benley benley merged commit 29c5035 into NixOS:master Feb 15, 2020
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Feb 15, 2020
@talyz @dtzWill
synergy: 1.8.8 -> 1.11.0 (NixOS#80138)
e9cfefe 
This gets rid of a few patches that aren't needed any more, adds one
to make the tests work again and updates the MacOS patch. It also
introduces two builds - one with the Qt application and one without.

The patch to get the tests working will be submitted upstream and
hopefully not be needed for future releases.

(cherry picked from commit 29c5035)
@talyz talyz deleted the synergy-1.11.0 branch June 16, 2021 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aszlig aszlig Awaiting requested review from aszlig

@alyssais alyssais Awaiting requested review from alyssais

@benley benley Awaiting requested review from benley

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@talyz @benley