branch master updated: gnu: git-annex: Patch 'git-annex webapp' to use hardcoded lsof.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

davexunit pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 323d868ceb gnu: git-annex: Patch 'git-annex webapp' to use hardcoded 
lsof.
323d868ceb is described below

commit 323d868ceb0eb6451d86f8ff0a7a0aa20c3cfd00
Author: David Thompson <dthompson2@worcester.edu>
AuthorDate: Mon Jan 9 18:06:10 2023 -0500

    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 @@
   #: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 @@ to @code{cabal repl}).")
              ;; 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 @@ to @code{cabal repl}).")
            ghc-yesod-core
            ghc-yesod-form
            ghc-yesod-static
+           lsof
            rsync
            xdg-utils))
     (propagated-inputs