From patchwork Wed Jul 29 22:01:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 23451 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B0CC27BBE3; Wed, 29 Jul 2020 23:03:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A606827BBE1 for ; Wed, 29 Jul 2020 23:03:09 +0100 (BST) Received: from localhost ([::1]:36456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uAH-0004vl-4y for patchwork@mira.cbaines.net; Wed, 29 Jul 2020 18:03:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uAA-0004u6-Jq for guix-patches@gnu.org; Wed, 29 Jul 2020 18:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0uAA-00082i-8v for guix-patches@gnu.org; Wed, 29 Jul 2020 18:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0uAA-0000eO-5T for guix-patches@gnu.org; Wed, 29 Jul 2020 18:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42306] [PATCH] gnu: Add nfs4-acl-tools Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Jul 2020 22:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun Cc: 42306@debbugs.gnu.org Received: via spool by 42306-submit@debbugs.gnu.org id=B42306.15960601222428 (code B ref 42306); Wed, 29 Jul 2020 22:03:02 +0000 Received: (at 42306) by debbugs.gnu.org; 29 Jul 2020 22:02:02 +0000 Received: from localhost ([127.0.0.1]:33858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0u9B-0000cw-Vh for submit@debbugs.gnu.org; Wed, 29 Jul 2020 18:02:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0u98-0000cY-Ec for 42306@debbugs.gnu.org; Wed, 29 Jul 2020 18:02:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54627) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0u92-0007y6-OC; Wed, 29 Jul 2020 18:01:52 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:51726 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k0u91-0007Gq-9B; Wed, 29 Jul 2020 18:01:51 -0400 From: Marius Bakke In-Reply-To: <20200727071139.GB3225@zpidnp36> References: <20200710092101.GA22947@zpidnp36> <87blk3vcyn.fsf@gnu.org> <20200727071139.GB3225@zpidnp36> Date: Thu, 30 Jul 2020 00:01:28 +0200 Message-ID: <87k0ymq8uf.fsf@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Lars-Dominik Braun writes: > Hey Marius, > >> Sorry for the late reply... > no problem. > >> The patch mostly LGTM, but no longer applies. Can you rebase it on >> current master? Meanwhile, a few comments: > Sure, see attached patch, which (hopefully) also improves the description. Thanks! FYI I had to convert the patch from ISO-8859-1 encoding to UTF-8 in order to make it apply. Applied with the following changes: ...however I also decided to move it to (gnu packages nfs). > I noticed linting fails with a pattern matching error, because git:// protocol > URI’s are not supported. The second patch fixes it, but I’m not sure that’s a > “proper” solution. Me neither and I don't feel like jumping on that one right away. :-) It seems we already have a number of git:// URLs around so it would be good to fix it, can you submit the second patch to a separate issue? Thanks! diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 128afc52c2..a6409765ff 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -27,7 +27,6 @@ #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) - #:use-module (gnu packages bash) #:use-module (gnu packages gettext) #:use-module (gnu packages perl) #:use-module (guix packages) @@ -116,14 +115,13 @@ #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-bin-sh - (lambda* (#:key inputs native-inputs #:allow-other-keys) + (lambda _ (substitute* "include/buildmacros" - (("/bin/sh") (string-append (assoc-ref inputs "bash-minimal") "/bin/sh"))) + (("/bin/sh") (which "sh"))) #t))))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf) - ("bash-minimal" ,bash-minimal) ("libtool" ,libtool))) (inputs `(("attr" ,attr))) @@ -134,4 +132,3 @@ POSIX equivalents @command{getfacl} and @command{setfacl}. They fetch and manipulate access control lists for files and directories on NFSv4 mounts.") (license bsd-3))) -