From patchwork Wed Oct 27 04:51:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34086 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 DF42C27BBE1; Wed, 27 Oct 2021 05:54:36 +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.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,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 ESMTPS id D2F8127BBE4 for ; Wed, 27 Oct 2021 05:54:34 +0100 (BST) Received: from localhost ([::1]:38048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxN-0002Zl-Tl for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:54:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawu-0001uZ-Pr for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawu-0003oI-Hg for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawu-00058w-GV for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 06/13] gnu: lsof: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039519527 (code B ref 51428); Wed, 27 Oct 2021 04:54:04 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:15 +0000 Received: from localhost ([127.0.0.1]:48119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00054c-Ig for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:15 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:36763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw2-000538-Q4 for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:11 -0400 Received: by mail-qv1-f49.google.com with SMTP id d6so1041260qvb.3 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zauxzH5kS4BoyQbl5SksLJXNtW9Yo1b173H3GLBvV7M=; b=h9p3nY4flUwoujk6Q2kMVB7xeQA/r3d3Ud1iEJEhahtOg8GT6es+DdlL97o+Y31zkp T7gG0nPR/LB4ARz+n9kTFKmwVs9Gje+SfeXlSIGHawg+VlfesO2t1Vu69k9xw40CMFsM yBzgc57vrM0vIwSvJqtKDbmq+T4gG5tRz2A6MDJYj55xq4Li5mOUPYolx22XvykcDZGb iqJX+yX2SM2spiYuQr8hN+1zSDOIOb0CRWTTQDtvbgYuFpi1G9GtrkVmRxDwy73JrXXP GiZc2E5NH4hg8mf16Hvo1xEJo7xu1lze9Vj2VleAtrNBuRQDGpjFPnm5Q+Pea+Sohq9B 9z8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zauxzH5kS4BoyQbl5SksLJXNtW9Yo1b173H3GLBvV7M=; b=zIX100v3NKHTmktJd/c8dQT1j4diW5mLKIjI56g/zWyMzxWcZqZ5bGFX2fQ/Bj6JgI c12BiW1kviPN67DjuJSJS+KhBSM7pbuNNaH4dbeRY3h/G0p0W7jYEVa4vDDqrFGR6PNF UZGS5HOH6rfNSmNDp/X2ZlKOZWhyxJWnxt2wtqLKJUFP/xedV8HuHlULveybfDG9C1BT XhjSUEaKinnEpFp7LaPVRZcdJ2UAd4V3VkpFOsC7bXbIVeidVHj8GYAfKqqRXBklsBYM l6MX4samYq13kQ8msrh5tBvd6wg48C7vxSAXawKB/ZllsoVQ5C8pnIZFkYT8HbsuEmJG I3yA== X-Gm-Message-State: AOAM532LKAl1g7fqUHPdX4KpdJ8tmNxGesdhgYlArqLWZl7aKoIWG4LP COH28kfaAKMvUabZy5Y58vH190lKQTw= X-Google-Smtp-Source: ABdhPJwHEW9PWhzBTlzQn45tgKZBhmuHSKJB86diWzLmYpBIEQsYWql21SMl/NeD4fvSowZV6xFOtg== X-Received: by 2002:a0c:c610:: with SMTP id v16mr26897219qvi.36.1635310385199; Tue, 26 Oct 2021 21:53:05 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:04 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:37 -0400 Message-Id: <20211027045151.9889-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> 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 * gnu/packages/lsof.scm (lsof): Fix indentation. --- gnu/packages/lsof.scm | 136 +++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index 7ded6ee726..04c1d80b52 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -32,76 +32,76 @@ (define-module (gnu packages lsof) (define-public lsof (package - (name "lsof") - (version "4.94.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lsof-org/lsof") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp")) - (patches (search-patches "lsof-fatal-test-failures.patch")))) - (build-system gnu-build-system) - (native-inputs - `(("groff" ,groff) ; for soelim - ("perl" ,perl))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (setenv "LSOF_CC" ,(cc-for-target)) - (setenv "LSOF_MAKE" "make") + (name "lsof") + (version "4.94.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lsof-org/lsof") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp")) + (patches (search-patches "lsof-fatal-test-failures.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("groff" ,groff) ; for soelim + ("perl" ,perl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "LSOF_CC" ,(cc-for-target)) + (setenv "LSOF_MAKE" "make") - ;; By default, the makefile captures the output of 'uname -a'. - ;; Provide a fixed output instead to make builds reproducible. - (setenv "LSOF_SYSINFO" - (string-append "GNU/" (utsname:sysname (uname)) - " (GNU Guix)")) + ;; By default, the makefile captures the output of 'uname -a'. + ;; Provide a fixed output instead to make builds reproducible. + (setenv "LSOF_SYSINFO" + (string-append "GNU/" (utsname:sysname (uname)) + " (GNU Guix)")) - (invoke "./Configure" "linux"))) - (add-after 'configure 'patch-timestamps - (lambda _ - (substitute* "Makefile" - (("`date`") "`date --date=@1`")))) - (add-after 'build 'build-man-page - (lambda _ - (with-output-to-file "lsof.8" - (lambda _ (invoke "soelim" "Lsof.8"))))) - (add-before 'check 'disable-failing-tests - (lambda _ - (substitute* "tests/Makefile" - ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. - (("(STDTST=.*) LTsock" _ prefix) prefix) - ;; LTnfs fails without access to a remote NFS server, and LTlock - ;; fails when run on a Btrfs file system (see: - ;; https://github.com/lsof-org/lsof/issues/152). - (("OPTTST=[[:space:]]*LTbigf LTdnlc LTlock LTnfs") - "OPTTST = LTbigf LTdnlc")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "tests" - ;; Tests refuse to run on ‘unvalidated’ platforms. - (make-file-writable "TestDB") - (invoke "./Add2TestDB") + (invoke "./Configure" "linux"))) + (add-after 'configure 'patch-timestamps + (lambda _ + (substitute* "Makefile" + (("`date`") "`date --date=@1`")))) + (add-after 'build 'build-man-page + (lambda _ + (with-output-to-file "lsof.8" + (lambda _ (invoke "soelim" "Lsof.8"))))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "tests/Makefile" + ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. + (("(STDTST=.*) LTsock" _ prefix) prefix) + ;; LTnfs fails without access to a remote NFS server, and LTlock + ;; fails when run on a Btrfs file system (see: + ;; https://github.com/lsof-org/lsof/issues/152). + (("OPTTST=[[:space:]]*LTbigf LTdnlc LTlock LTnfs") + "OPTTST = LTbigf LTdnlc")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + ;; Tests refuse to run on ‘unvalidated’ platforms. + (make-file-writable "TestDB") + (invoke "./Add2TestDB") - ;; The ‘standard’ tests suggest running ‘optional’ ones as well. - (invoke "make" "standard" "optional"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "lsof" (string-append out "/bin")) - (install-file "lsof.8" (string-append out "/share/man/man8")))))))) - (synopsis "Display information about open files") - (description - "Lsof stands for LiSt Open Files, and it does just that. + ;; The ‘standard’ tests suggest running ‘optional’ ones as well. + (invoke "make" "standard" "optional"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "lsof" (string-append out "/bin")) + (install-file "lsof.8" (string-append out "/share/man/man8")))))))) + (synopsis "Display information about open files") + (description + "Lsof stands for LiSt Open Files, and it does just that. It lists information about files that are open by the processes running on the system.") - (license (license:fsf-free - "file://00FAQ" - "License inspired by zlib, see point 1.9 of 00FAQ in the distribution.")) - (home-page "https://people.freebsd.org/~abe/"))) + (license (license:fsf-free + "file://00FAQ" + "License inspired by zlib, see point 1.9 of 00FAQ in the distribution.")) + (home-page "https://people.freebsd.org/~abe/")))