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

usbguard: 0.7.0 -> 0.7.2 #35892

Merged
merged 2 commits into from Feb 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/security/usbguard.nix
Expand Up @@ -192,7 +192,7 @@ in {

serviceConfig = {
Type = "simple";
ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}'';
ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -d -k -c ${daemonConfFile}'';
Restart = "on-failure";
};
};
Expand Down
13 changes: 0 additions & 13 deletions pkgs/os-specific/linux/usbguard/daemon_read_only_config.patch

This file was deleted.

18 changes: 8 additions & 10 deletions pkgs/os-specific/linux/usbguard/default.nix
@@ -1,7 +1,8 @@
{
stdenv, fetchurl, lib,
libxslt, pandoc, pkgconfig,
libxslt, pandoc, asciidoctor, pkgconfig,
dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,
audit,
libgcrypt ? null,
libsodium ? null
}:
Expand All @@ -11,23 +12,19 @@ with stdenv.lib;
assert libgcrypt != null -> libsodium == null;

stdenv.mkDerivation rec {
version = "0.7.0";
version = "0.7.2";
name = "usbguard-${version}";

repo = "https://github.com/dkopecek/usbguard";
repo = "https://github.com/USBGuard/usbguard";

src = fetchurl {
url = "${repo}/releases/download/${name}/${name}.tar.gz";
sha256 = "1e1485a2b47ba3bde9de2851b371d2552a807047a21e0b81553cf80d7f722709";
sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6";
};

patches = [
./daemon_read_only_config.patch
./documentation.patch
];

nativeBuildInputs = [
libxslt
asciidoctor
pandoc # for rendering documentation
pkgconfig
];
Expand All @@ -39,6 +36,7 @@ stdenv.mkDerivation rec {
libseccomp
polkit
protobuf
audit

qtbase
qtsvg
Expand All @@ -61,7 +59,7 @@ stdenv.mkDerivation rec {

meta = {
description = "The USBGuard software framework helps to protect your computer against BadUSB.";
homepage = "https://dkopecek.github.io/usbguard/";
homepage = "https://usbguard.github.io/";
license = licenses.gpl2;
maintainers = [ maintainers.tnias ];
};
Expand Down
32 changes: 0 additions & 32 deletions pkgs/os-specific/linux/usbguard/documentation.patch

This file was deleted.