From patchwork Fri Jan 6 21:30:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Thompson, David" X-Patchwork-Id: 45889 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 5348327BBEB; Fri, 6 Jan 2023 21:32:24 +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=unavailable 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 03D4E27BBE9 for ; Fri, 6 Jan 2023 21:32:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDuJs-0004Uu-E0; Fri, 06 Jan 2023 16:32:09 -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 1pDuJm-0004UT-F3 for guix-patches@gnu.org; Fri, 06 Jan 2023 16:32:02 -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 1pDuJm-0002uf-3y for guix-patches@gnu.org; Fri, 06 Jan 2023 16:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDuJl-0004Ez-Oi for guix-patches@gnu.org; Fri, 06 Jan 2023 16:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60609] [PATCH] gnu: git-annex: Patch 'git-annex webapp' to use hardcoded xdg-open. Resent-From: "Thompson, David" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Jan 2023 21:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60609 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60609@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167304067416233 (code B ref -1); Fri, 06 Jan 2023 21:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2023 21:31:14 +0000 Received: from localhost ([127.0.0.1]:55953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDuJ0-0004Dl-0P for submit@debbugs.gnu.org; Fri, 06 Jan 2023 16:31:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:51530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDuIy-0004Dc-2g for submit@debbugs.gnu.org; Fri, 06 Jan 2023 16:31:13 -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 1pDuIu-0004KR-C0 for guix-patches@gnu.org; Fri, 06 Jan 2023 16:31:08 -0500 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDuIo-0002hk-Fm for guix-patches@gnu.org; Fri, 06 Jan 2023 16:31:07 -0500 Received: by mail-qt1-x834.google.com with SMTP id c11so3151652qtn.11 for ; Fri, 06 Jan 2023 13:31:01 -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=ImN87f4cV1YKKZ04JOsY18neMIg4EMkNKNIEIerzSBo=; b=XsSPHR16wtgHhN1/lvkvtYIHIRArXnTGThkbCb/+E7e4QsDGm4hEjwOGSirgmiE2Iu PMdIRG4J5N5Av020P3dNU9XhX6xVALP+jDvRCEJewsebfiFxr70riblKRTLIw/+El6En eblsgqVx/KystIc7oczJvILvRy1x61CBnX1LrXDtbHJnacwE8jJnEmELb5BaIsi09Fu0 fIff/zoAZumubv/SZOVqpwCJx0hUwKkF+sWw/s1BsbSooTnqsLoMhwyW3Ael15k7vJdF lhuvd8w0g9KgIBN+4qqGR/KsuEpD/2ByxLEn7/OeFW34G2Q+FRy5qDb15N9RJKuKlTM3 jyPg== 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=ImN87f4cV1YKKZ04JOsY18neMIg4EMkNKNIEIerzSBo=; b=KMyd8hAs4Z0OliLthWMW9mzDznHdRgjVEHWGdQYhCepJ2+tIAjctkGGuOGtdqS7HTm tXMxu+WjWYCBQ2Jdb6mXwPJ3HPFg/uPXKQSBQeoxyy3QT8ZyghM1Ooex263kfMPPnIN8 dxjw+n8RGDREoMjYO7B05uz3K0PfI3mIdVnc5IwS+82K2meEJFohoK1CFPPKr+R3vSdG e5ZSh4DHHI6V/FhfULZTktfz8oPpyoRWRfNcv3hrw5vEocICiyBeYKTLA9d+Tcb5pdZT LWBxxh+dNQFuL535r6dTEQXCPTy/xO76a+2uywJI/1Bpi551rfWtL9cMxBISTvKYDmYz E0Mg== X-Gm-Message-State: AFqh2kpQE++fzTdjiiTV6Sk0kcAMLFIyvn7rEpCkO0tT3l5k//vFP/wX b8bX8snNjVtx043WNSe8QK0gSq3lHknZWkQyKZ98F+q6UNBwDuci X-Google-Smtp-Source: AMrXdXt+ADBkRjjY1S0mL4YApFwPWzXA3zRJOMyRVQGoL45kU5EcSqf2aB60zjHWTlufqDwzuAph97yW9ojyfa4B+RU= X-Received: by 2002:ac8:75c3:0:b0:3a9:8068:cd5a with SMTP id z3-20020ac875c3000000b003a98068cd5amr2615879qtq.463.1673040660499; Fri, 06 Jan 2023 13:31:00 -0800 (PST) MIME-Version: 1.0 From: "Thompson, David" Date: Fri, 6 Jan 2023 16:30:49 -0500 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::834; envelope-from=dthompson2@worcester.edu; helo=mail-qt1-x834.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 was using git-annex for the very first time today and when I tried to run 'git-annex webapp' I got this error: Launching web browser on file:///tmp/webapp3975-0.html git-annex: xdg-open: createProcess: posix_spawnp: does not exist (No such file or directory) WebApp crashed: xdg-open: createProcess: posix_spawnp: does not exist (No such file or directory) I think this should just work so I wrote a patch to replace a couple of loose references to xdg-open with a hardcoded store path. How does it look? Thanks, - Dave From 6013aa4bf4336e06ca35ee070d090c88e34e898d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 6 Jan 2023 16:06:47 -0500 Subject: [PATCH] gnu: git-annex: Patch 'git-annex webapp' to use hardcoded xdg-open. * gnu/packages/haskell-apps.scm (git-annex)[arguments]: Add 'patch-webapp' phase. [inputs]: Add xdg-utils. --- gnu/packages/haskell-apps.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index a2405796ca..4ac486eeb6 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2021 EuAndreh ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Morgan Smith +;;; Copyright © 2022 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ (define-module (gnu packages haskell-apps) #:use-module (guix build-system haskell) #:use-module (gnu packages) #:use-module (gnu packages curl) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) @@ -327,6 +329,13 @@ (define-public git-annex (copy-file "Utility/Shell.hs" "/tmp/Shell.hs") (substitute* "Utility/Shell.hs" (("/bin/sh") (which "sh"))))) + (add-before 'configure 'patch-webapp + (lambda _ + ;; Replace loose references to xdg-open so that '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"))))) (add-before 'configure 'factor-setup (lambda _ ;; Factor out necessary build logic from the provided @@ -471,7 +480,8 @@ (define-public git-annex ghc-yesod-core ghc-yesod-form ghc-yesod-static - rsync)) + rsync + xdg-utils)) (propagated-inputs (list git)) (native-inputs -- 2.38.1