diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-09-05 08:14:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 08:14:43 +0200 |
| commit | 998acc507945767e3fa94c298fa324f8a90b911f (patch) | |
| tree | 1aaad8b9fc979809d679d192a8b238da86a8e618 /pkgs/top-level | |
| parent | 11e72e547d013894dfce88e68d0ec80a8bf0b545 (diff) | |
| parent | 222422f87f870e106aaebdf99558e0f805a2b8c2 (diff) | |
| download | nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.tar nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.tar.gz nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.tar.bz2 nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.tar.lz nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.tar.xz nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.tar.zst nixpkgs-998acc507945767e3fa94c298fa324f8a90b911f.zip | |
Merge pull request #68080 from dtzWill/update/usbguard-0.7.5
usbguard: 0.7.4 -> 0.7.5
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 202590f626f..b523d4a463d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -373,6 +373,7 @@ mapAliases ({ ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 + usbguard-nox = usbguard; # added 2019-09-04 v4l_utils = v4l-utils; # added 2019-08-07 vimbWrapper = vimb; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b008ffe0af..257e13d11bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16535,14 +16535,10 @@ in upower = callPackage ../os-specific/linux/upower { }; - usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard { + usbguard = callPackage ../os-specific/linux/usbguard { libgcrypt = null; }; - usbguard-nox = usbguard.override { - withGui = false; - }; - usbtop = callPackage ../os-specific/linux/usbtop { }; usbutils = callPackage ../os-specific/linux/usbutils { }; |