From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kOVfORfz+GJmzwAAbAwnHQ (envelope-from ) for ; Sun, 14 Aug 2022 15:05:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UCp5ORfz+GIMzAAA9RJhRA (envelope-from ) for ; Sun, 14 Aug 2022 15:05:27 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8B0AB36E45 for ; Sun, 14 Aug 2022 15:05:27 +0200 (CEST) Received: from localhost ([::1]:36428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNDJ0-00020F-LN for larch@yhetil.org; Sun, 14 Aug 2022 09:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNDId-0001z9-5k for guix-patches@gnu.org; Sun, 14 Aug 2022 09:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46436) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNDIc-0000NM-SL for guix-patches@gnu.org; Sun, 14 Aug 2022 09:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNDIc-0003iv-NZ for guix-patches@gnu.org; Sun, 14 Aug 2022 09:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57198] [PATCH] gnu: usbguard: Use new package style. References: <20220814043656.26839-1-kiasoc5@disroot.org> In-Reply-To: <20220814043656.26839-1-kiasoc5@disroot.org> Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Aug 2022 13:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57198@debbugs.gnu.org Cc: kiasoc5 Received: via spool by 57198-submit@debbugs.gnu.org id=B57198.166048228614268 (code B ref 57198); Sun, 14 Aug 2022 13:05:02 +0000 Received: (at 57198) by debbugs.gnu.org; 14 Aug 2022 13:04:46 +0000 Received: from localhost ([127.0.0.1]:36181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNDIL-0003i3-2N for submit@debbugs.gnu.org; Sun, 14 Aug 2022 09:04:46 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNDII-0003hs-5T for 57198@debbugs.gnu.org; Sun, 14 Aug 2022 09:04:44 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 712AC40077; Sun, 14 Aug 2022 15:04:40 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1nhI_46r-5oV; Sun, 14 Aug 2022 15:04:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1660482277; bh=RtQWOYhP6DdWYMDgDyndOk6jQRiDhKrwbQbMSnM3MNo=; h=From:To:Cc:Subject:Date; b=Bzi8NbBfBuoZqvH2EpJYbdzJS1uXGHBngNsllUx59RBFXX3nkIufgCwxBfppazhr7 SrJTSSkP3tc7MrSQSJiRYm/JRGjtIXTPilFlVQlMGWqweEblU0LxyApWOM69+rTc5f t5/GZ7qh5OL2gbHMVWqrse1vqeC2/zina20w9rMZMMZTznR6LwNnVD2i30WO8A18ex vf8enk2qDtiw4VuHua3uOS1jCG/Jjf2W6Y7W+Y2GrzFYfVIdihes1OisZUMAN1GGBe VDYhfY/APRfBM9uzKIv8no2PYDOZa57zqw2OopqaZ4vFrKzNmE0C7HP+oCKfTazlXO qlTRbmmg+eaBg== Date: Sun, 14 Aug 2022 09:03:29 -0400 Message-Id: <20220814130327.66270-1-kiasoc5@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches From: kiasoc5 via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660482327; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ojG28aB/jMvqoswvRblkl1N1yqQGnDOOgQuBmRfSTEw=; b=OLRnhXl/BAXRKIXIWjS50I80uvTHG8c/1DnVwPaeXWES1oH5Zgozk8rRsy83QSXeLVH4V2 IIiU+ikF8Mh8LipgFn21yAAFDGZIp6Uafkzi3akphNbHrX+32Qecm6/BRxSjNwp0rJ3+QO YUIWxZTl94V1SNuRcS1Yjub/xXZKl3EMPY+r6ujjU4eTW+Bham9r9IBam4Kqwvv/WOeSGi 46rBqufmO7DABbmSon8C0k7SkIojQdY8jw6E1b9yJrMLBNjzYBtYceXalL+EVufMxlfGnu 7q0w5x/MfwVCHG5miWFBHJpFc6N4/o3wWVurDe8MYpPH/M27q5co9VVhZXMY4Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660482327; a=rsa-sha256; cv=none; b=uzxaKoXvlODbq5M2lxX4QgC9SkEzCPaeRnc8Tv0adI85wNnwmwQhyjY3UrzoQHR+hTWfZs Bm6LgDrV/DleCg05QoNCvufSiCbZlju8YNJTyMv5fdDEbx1WyXDRu7FCBLVnysKFcKb+oH jYaUcDAj8gJUvVCiLN+LgXxWbSaqfUkcg45t6Vhw8+8DuV9VC8M4gLDw7VqKYxi4iMxy7I LAiRaEwAZqHjtnBz5XD7MlUHhm0VfQCeCZtdJlrAdDQZvksrfTgI/pMZscISCXfyp1mtgx Ob7wVlnkgCXf8GFd87uPx0Nw7hLfRvQk9/zjexzRsRou+cdV3tnq9nLsvDkE6Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Bzi8NbBf; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.86 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Bzi8NbBf; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8B0AB36E45 X-Spam-Score: -0.86 X-Migadu-Scanner: scn1.migadu.com X-TUID: DYEdJKXQc99b Use G-exps and #$output while we're at it. * gnu/packages/hardware.scm (usbguard)[arguments]: Use G-expressions. <#:phases>: Use '#$output' instead of 'assoc-ref' --- gnu/packages/hardware.scm | 84 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index cfd667d757..8d06920b79 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1160,48 +1160,48 @@ (define-public usbguard (base32 "0lpyhkz5nr0c9mq57mgcvam5c8qfqqwjc4xd46n2ldqc9vhfsask")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-bootstrap-script - (lambda _ - ;; Don't attempt to fetch git submodules. - (substitute* "autogen.sh" - (("^git submodule.*") - "")))) - (add-after 'bootstrap 'patch-build-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure" - (("/usr/include/catch") - (dirname (search-input-file inputs "include/catch.hpp")))) - ;; Do not create log directory. - (substitute* "Makefile.in" ((".*/log/usbguard.*") "")) - ;; Disable LDAP tests: they use 'sudo'. - (substitute* "src/Tests/Makefile.in" - (("\\$\\(am__append_2\\)") "")))) - (add-after 'install 'delete-static-library - (lambda* (#:key outputs #:allow-other-keys) - ;; It can't be direclty disabled since it's needed for the tests. - (delete-file (string-append (assoc-ref outputs "out") - "/lib/libusbguard.a")))) - (add-after 'install 'install-zsh-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (site-functions - (string-append out "/share/zsh/site-functions"))) - (mkdir-p site-functions) - (copy-file "scripts/usbguard-zsh-completion" - (string-append site-functions "/_usbguard")))))) - #:make-flags - (list (string-append "BASH_COMPLETION_DIR=" - (assoc-ref %outputs "out") - "/etc/bash_completion.d")) - #:configure-flags - (list - "--localstatedir=/var" - "--enable-systemd=no" - "--with-ldap" - "--with-dbus" - "--with-polkit"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-bootstrap-script + (lambda _ + ;; Don't attempt to fetch git submodules. + (substitute* "autogen.sh" + (("^git submodule.*") + "")))) + (add-after 'bootstrap 'patch-build-scripts + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("/usr/include/catch") + (dirname (search-input-file inputs "include/catch.hpp")))) + ;; Do not create log directory. + (substitute* "Makefile.in" ((".*/log/usbguard.*") "")) + ;; Disable LDAP tests: they use 'sudo'. + (substitute* "src/Tests/Makefile.in" + (("\\$\\(am__append_2\\)") "")))) + (add-after 'install 'delete-static-library + (lambda args + ;; It can't be directly disabled since it's needed for the tests. + (delete-file (string-append #$output + "/lib/libusbguard.a")))) + (add-after 'install 'install-zsh-completion + (lambda args + (let ((site-functions + (string-append #$output "/share/zsh/site-functions"))) + (mkdir-p site-functions) + (copy-file "scripts/usbguard-zsh-completion" + (string-append site-functions "/_usbguard")))))) + #:make-flags + #~(list (string-append "BASH_COMPLETION_DIR=" + #$output + "/etc/bash_completion.d")) + #:configure-flags + #~(list + "--localstatedir=/var" + "--enable-systemd=no" + "--with-ldap" + "--with-dbus" + "--with-polkit"))) (inputs (list audit catch-framework -- 2.37.2