From patchwork Mon Jan 9 23:10:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Thompson, David" X-Patchwork-Id: 46004 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 7D34427BBED; Mon, 9 Jan 2023 23:11:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 476BB27BBEB for ; Mon, 9 Jan 2023 23:11:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pF1IM-0003LX-5n; Mon, 09 Jan 2023 18:11:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pF1IE-0003Kq-Aw for guix-patches@gnu.org; Mon, 09 Jan 2023 18:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pF1IE-0005Mm-2H for guix-patches@gnu.org; Mon, 09 Jan 2023 18:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pF1ID-0004uU-RL for guix-patches@gnu.org; Mon, 09 Jan 2023 18:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60698] [PATCH] gnu: git-annex: Patch 'git-annex webapp' to use hardcoded lsof. Resent-From: "Thompson, David" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Jan 2023 23:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60698 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60698@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167330582918819 (code B ref -1); Mon, 09 Jan 2023 23:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2023 23:10:29 +0000 Received: from localhost ([127.0.0.1]:38377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pF1Hg-0004tT-PV for submit@debbugs.gnu.org; Mon, 09 Jan 2023 18:10:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:53066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pF1He-0004tJ-Gd for submit@debbugs.gnu.org; Mon, 09 Jan 2023 18:10:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pF1He-0003AB-3A for guix-patches@gnu.org; Mon, 09 Jan 2023 18:10:26 -0500 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pF1Hc-0005Gn-Dt for guix-patches@gnu.org; Mon, 09 Jan 2023 18:10:25 -0500 Received: by mail-qt1-x82d.google.com with SMTP id a25so2370839qto.10 for ; Mon, 09 Jan 2023 15:10:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=worcester-edu.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=KeHmzcexG3Rce077WT48hFsd47VcO2zo8sAEHqvm5/s=; b=O/q/dXReokRuv9cJsgsYr6Cowi1NnwFvak0QHWsZntA7r2x2Cmn5iC7yhwmtwhabTb HLp/26TLKls8/0sqNQmr9jBuELi6FrVyRYWu7/ZIJVFp71OY2+kk5CRvu2XqLgCaJDU6 mZ7QtrbqXMt6N7/SpZLfOeixFpgJ00bDMarvHst9SAlearj4dcP9Jf0nRV9Cc8ueW8+2 uRTh0XmEZkKPOYM3X8icXudyAphEEx9Vy28LCYA17JeFsTpP+foMzqYwGTEq3l0RlCeu ALa6xg/BpmJe04S8j+tqX3Ai0APhVNmpmOkiAZR2EwiY4XMn1vMdV6RHKGpY6Idby0aP SjHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KeHmzcexG3Rce077WT48hFsd47VcO2zo8sAEHqvm5/s=; b=0MyCcICe3wEkxqRn+WVWIl39D7UuZaDpTXGMiCSgIsqSUbbsLzeWDv3eRYlEQni0HV ct0aTS0le+fVj/pqUOceiuJjO8zNiGlcstp6tUIrXrrP3iSDhWnfmzQ7lPSNSd5uNswh NZBxGxbeloNdNp1ladzU6X+zBcr5KANFBswHxcl2q/IAdEBm0+BmYsCGrYILjbQsARHX 4jTgJhqKY2jspODm3LXgbVHBmXq/4BRKBPqSXtZ3pycxJyG6CwWszwMK+l5HiuT90Q7Q IAvmHJnD68SWVENjno8i5XBWqV4oXBmtL9RmHafShXokoTluxmlVq+BWI3BPM2RcQmuV 2nEw== X-Gm-Message-State: AFqh2kqvfDWIqzF1EsrB5HTm6EeXVJLj+QgbpH+hLflEtf7gj4F9eDA+ QEYwczZ1769A9l0m+qHhaujntosFVGZQc2YGJi+kY1deSnP+wQ== X-Google-Smtp-Source: AMrXdXsZHzzzZI+unnHyp/Bc6bt4Kt6ktjNOvPZKMvHATC8fCbFbTwfF6u1H9KCcSb9+/j8h2FW37UGWRkDvw3NDZYo= X-Received: by 2002:ac8:12c5:0:b0:3a6:8f2f:d0cc with SMTP id b5-20020ac812c5000000b003a68f2fd0ccmr2931428qtj.412.1673305822924; Mon, 09 Jan 2023 15:10:22 -0800 (PST) MIME-Version: 1.0 From: "Thompson, David" Date: Mon, 9 Jan 2023 18:10:11 -0500 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::82d; envelope-from=dthompson2@worcester.edu; helo=mail-qt1-x82d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi all, I'm back with another 'git-annex webapp' patch. In order for the git-annex assistant's file watching capabilities to work it needs access to the lsof utility. WDYT? - Dave From 86914063988c01eb399097e7746a81a4ae51c159 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 9 Jan 2023 18:06:10 -0500 Subject: [PATCH] gnu: git-annex: Patch 'git-annex webapp' to use hardcoded lsof. * gnu/packages/haskell-apps.scm (git-annex)[arguments]: Substitute "lsof" in 'patch-webapp' phase. [inputs]: Add lsof. --- gnu/packages/haskell-apps.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 4ac486eeb6..9cb383eeb2 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -50,6 +50,7 @@ (define-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages haskell-web) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages lsof) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -335,7 +336,11 @@ (define-public git-annex ;; webapp' runs without making the user also install xdg-utils. (substitute* '("Assistant/WebApp/DashBoard.hs" "Utility/WebApp.hs") - (("xdg-open") (which "xdg-open"))))) + (("xdg-open") (which "xdg-open"))) + ;; Also replace loose references to lsof. + (substitute* "Assistant/Threads/Watcher.hs" + (("\"lsof\"") + (string-append "\"" (which "lsof") "\""))))) (add-before 'configure 'factor-setup (lambda _ ;; Factor out necessary build logic from the provided @@ -480,6 +485,7 @@ (define-public git-annex ghc-yesod-core ghc-yesod-form ghc-yesod-static + lsof rsync xdg-utils)) (propagated-inputs -- 2.38.1