public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68080 from dtzWill/update/usbguard-0.7.5

Browse Source 
usbguard: 0.7.4 -> 0.7.5
This commit is contained in:
Marek Mahut 2019-09-05 08:14:43 +02:00 committed by GitHub
commit 998acc5079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/linux/usbguard/default.nix
View File

@ -1,11 +1,8 @@
{ {
stdenv, fetchurl, lib, stdenv, fetchurl, lib,
pkgconfig, libxml2, libxslt, pkgconfig, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl, asciidoc,
dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, audit, dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf,
withGui ? true, audit,
qtbase ? null,
qttools ? null,
qtsvg ? null,
libgcrypt ? null, libgcrypt ? null,
libsodium ? null libsodium ? null
}: }:
@ -15,20 +12,23 @@ with stdenv.lib;
assert libgcrypt != null -> libsodium == null; assert libgcrypt != null -> libsodium == null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.7.4"; version = "0.7.5";
pname = "usbguard"; pname = "usbguard";
repo = "https://github.com/USBGuard/usbguard"; repo = "https://github.com/USBGuard/usbguard";
src = fetchurl { src = fetchurl {
url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k"; sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
asciidoc
pkgconfig pkgconfig
libxslt # xsltproc libxslt # xsltproc
libxml2 # xmllint libxml2 # xmllint
docbook_xml_dtd_45
docbook_xsl
]; ];
buildInputs = [ buildInputs = [
@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
audit audit
] ]
++ (lib.optional (libgcrypt != null) libgcrypt) ++ (lib.optional (libgcrypt != null) libgcrypt)
++ (lib.optional (libsodium != null) libsodium) ++ (lib.optional (libsodium != null) libsodium);
++ (lib.optionals withGui [ qtbase qtsvg qttools ]);
configureFlags = [ configureFlags = [
"--with-bundled-catch" "--with-bundled-catch"
@ -51,8 +50,7 @@ stdenv.mkDerivation rec {
"--with-polkit" "--with-polkit"
] ]
++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt") ++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
++ (lib.optional (libsodium != null) "--with-crypto-library=sodium") ++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
++ (lib.optional withGui "--with-gui-qt=qt5");
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/aliases.nix
View File

@ -373,6 +373,7 @@ mapAliases ({
ucsFonts = ucs-fonts; # added 2016-07-15 ucsFonts = ucs-fonts; # added 2016-07-15
ultrastardx-beta = ultrastardx; # added 2017-08-12 ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10 usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
v4l_utils = v4l-utils; # added 2019-08-07 v4l_utils = v4l-utils; # added 2019-08-07
vimbWrapper = vimb; # added 2015-01 vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01 vimprobable2Wrapper = vimprobable2; # added 2015-01

6
pkgs/top-level/all-packages.nix
View File

@ -16535,14 +16535,10 @@ in
upower = callPackage ../os-specific/linux/upower { }; upower = callPackage ../os-specific/linux/upower { };
usbguard = libsForQt5.callPackage ../os-specific/linux/usbguard { usbguard = callPackage ../os-specific/linux/usbguard {
libgcrypt = null; libgcrypt = null;
}; };
usbguard-nox = usbguard.override {
withGui = false;
};
usbtop = callPackage ../os-specific/linux/usbtop { }; usbtop = callPackage ../os-specific/linux/usbtop { };
usbutils = callPackage ../os-specific/linux/usbutils { }; usbutils = callPackage ../os-specific/linux/usbutils { };