From ec6b205b5ae905e487967604028381bc822076cc Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Tue, 6 Aug 2024 22:15:53 +0200 Subject: [PATCH] usbguard: 1.1.2 -> 1.1.3 Drop patch, because it is included in the new release. --- pkgs/os-specific/linux/usbguard/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 755ea603e2a5..dfa31dd3a97c 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , installShellFiles , nixosTests @@ -22,27 +21,17 @@ }: stdenv.mkDerivation rec { - version = "1.1.2"; + version = "1.1.3"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - hash = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; + hash = "sha256-8y8zaKJfoIXc9AvG1wi3EzZA7BR2wVFLuOyD+zpBY0s="; fetchSubmodules = true; }; - patches = [ - # Pull upstream fix for gcc-13: - # https://github.com/USBGuard/usbguard/pull/586 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/USBGuard/usbguard/commit/22b1e0897af977cc96af926c730ff948bd120bb5.patch"; - hash = "sha256-yw0ZHcn6naHcsfsqdBB/aTgCwvEHecew/6HDmjyY2ZA="; - }) - ]; - nativeBuildInputs = [ autoreconfHook installShellFiles @@ -94,6 +83,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://usbguard.github.io/"; license = licenses.gpl2Plus; + platforms = platforms.linux; maintainers = [ maintainers.tnias ]; }; }