From: "Thompson, David" <dthompson2@worcester.edu>
To: 60698@debbugs.gnu.org
Subject: [bug#60698] [PATCH] gnu: git-annex: Patch 'git-annex webapp' to use hardcoded lsof.
Date: Mon, 9 Jan 2023 18:10:11 -0500 [thread overview]
Message-ID: <CAJ=RwfYjG-=J=FP53jQ2q8VtNa5Pi8pGT6_fPwCFFC9qVkGLVw@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
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
[-- Attachment #2: 0001-gnu-git-annex-Patch-git-annex-webapp-to-use-hardcode.patch --]
[-- Type: text/x-patch, Size: 1889 bytes --]
From 86914063988c01eb399097e7746a81a4ae51c159 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
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
next reply other threads:[~2023-01-09 23:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 23:10 Thompson, David [this message]
2023-01-16 17:17 ` [bug#60698] [PATCH] gnu: git-annex: Patch 'git-annex webapp' to use hardcoded lsof Simon Tournier
2023-06-06 6:00 ` bug#60698: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ=RwfYjG-=J=FP53jQ2q8VtNa5Pi8pGT6_fPwCFFC9qVkGLVw@mail.gmail.com' \
--to=dthompson2@worcester.edu \
--cc=60698@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).