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

usbguard: 0.7.4 -> 0.7.5 #68080

Merged
merged 2 commits into from Sep 5, 2019
Merged

usbguard: 0.7.4 -> 0.7.5 #68080

merged 2 commits into from Sep 5, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Sep 4, 2019

Motivation for this change

https://github.com/USBGuard/usbguard/releases/tag/usbguard-0.7.5

  • no longer needs/uses qt as of 0.7.5
  • asciidoctor -> asciidoc, drop pandoc
    (pandoc only seems to be used as part of doc spell-check
    which we don't enable anyway)
  • docbook bits
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 @

@dtzWill
usbguard: 0.7.4 -> 0.7.5
60256c1 
https://github.com/USBGuard/usbguard/releases/tag/usbguard-0.7.5

* no longer needs/uses qt as of 0.7.5
* asciidoctor -> asciidoc, drop pandoc
  (pandoc only seems to be used as part of doc spell-check
   which we don't enable anyway)
* docbook bits
jonringer
jonringer reviewed Sep 4, 2019
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -16527,7 +16527,7 @@ in

upower = callPackage ../os-specific/linux/upower { };

usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard {
usbguard = callPackage ../os-specific/linux/usbguard {
libgcrypt = null;
};

Copy link
Contributor

Choose a reason for hiding this comment

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

you also need to kill the usbguard-nox entry on pkgs/top-level/all-packages.nix:16535

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch, thanks! Added alias to avoid breakage for anyone using usbguard-nox.

jonringer
jonringer approved these changes Sep 5, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS
diff LGTM
binaries seem to work
leaf package

[3 built, 86 copied (264.0 MiB), 51.9 MiB DL]
https://github.com/NixOS/nixpkgs/pull/68080
1 package were build:
usbguard

@mmahut mmahut merged commit 998acc5 into NixOS:master Sep 5, 2019
@ivan
Copy link
Member

ivan commented Sep 5, 2019

This is a somewhat unfortunate upgrade, because 0.7.4 had a useful and working GUI for allowing or denying a device, while 0.7.5 removed it entirely. USBGuard/usbguard@bf3bb09 says "the Qt applet will be maintained in a separate repository", but I do not see it in http://github.com/USBGuard.

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

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 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
4 participants
@dtzWill @ivan @jonringer @mmahut