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

wire-desktop: add a proper throw #65917

Merged
merged 1 commit into from
Aug 4, 2019
Merged

wire-desktop: add a proper throw #65917

merged 1 commit into from
Aug 4, 2019
+4 −2

Conversation

worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Aug 4, 2019 •
edited
Loading

Motivation for this change

cc @toonn. I guess this was the one little detail we forgot 854b434.

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Sorry, something went wrong.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Aug 4, 2019
@vcunat
Copy link
Member

vcunat commented Aug 4, 2019 •
edited
Loading

Well, the practical issue was worked around by or "" in the version part already, I believe. EDIT: my point was to hide the error until meta.platforms can be inspected and trigger the normal throw message, but I don't particularly care.

@worldofpeace
Copy link
Contributor Author

Huh I see @vcunat. Might as well do it like this I guess, also realizing I forgot to do it for version.

@worldofpeace
wire-desktop: add a proper throw

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
d03c72c
@toonn
Copy link
Contributor

toonn commented Aug 4, 2019

👍 Looks much better to me than the workaround. (Sidenote, throwSystem's not documented in the nixpkgs manual.)

@worldofpeace
Copy link
Contributor Author

+1 Looks much better to me than the workaround. (Sidenote, throwSystem's not documented in the nixpkgs manual.)

throwSystem is something that's defined here and also the electron expression.
But I don't think the detail @vcunat explained at 854b434 and #65917 (comment) is.

@worldofpeace worldofpeace merged commit 521b818 into NixOS:master Aug 4, 2019
@worldofpeace worldofpeace deleted the wire-desktop/throw branch August 4, 2019 13:19
@toonn
Copy link
Contributor

toonn commented Aug 4, 2019

Hmm, the definition for throwSystem has actually been proliferated throughout nixpkgs. Can we propose it for inclusion in lib or a more appropriate place?

@worldofpeace worldofpeace mentioned this pull request Nov 28, 2019
Merged
10 tasks
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
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@worldofpeace @vcunat @toonn