From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mB9NKHXcXF9sXAAA0tVLHw (envelope-from ) for ; Sat, 12 Sep 2020 14:34:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MF2vInXcXF8yKgAA1q6Kng (envelope-from ) for ; Sat, 12 Sep 2020 14:34:29 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 625D09408DB for ; Sat, 12 Sep 2020 14:34:29 +0000 (UTC) Received: from localhost ([::1]:34176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH6bk-0001YJ-Bw for larch@yhetil.org; Sat, 12 Sep 2020 10:34:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kH6bO-0000xd-2G for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kH6bN-0006A2-Lc for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kH6bN-0004E9-Iy for guix-patches@gnu.org; Sat, 12 Sep 2020 10:34:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43354] [PATCH 55/55] gnu: patchwork: Update to 2.2.2. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Sep 2020 14:34:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43354@debbugs.gnu.org Received: via spool by 43354-submit@debbugs.gnu.org id=B43354.159992124316212 (code B ref 43354); Sat, 12 Sep 2020 14:34:05 +0000 Received: (at 43354) by debbugs.gnu.org; 12 Sep 2020 14:34:03 +0000 Received: from localhost ([127.0.0.1]:48791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH6bK-0004DF-QE for submit@debbugs.gnu.org; Sat, 12 Sep 2020 10:34:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kH6bK-0004CR-3q for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:34:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36511) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH6bE-00067g-R4 for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:56 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:54078 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kH6bB-0001vu-68 for 43354@debbugs.gnu.org; Sat, 12 Sep 2020 10:33:54 -0400 From: Marius Bakke Date: Sat, 12 Sep 2020 16:29:11 +0200 Message-Id: <20200912142911.6231-55-marius@gnu.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200912142911.6231-1-marius@gnu.org> References: <20200912142911.6231-1-marius@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: wK85GlIuQ3vb * gnu/packages/patchutils.scm (patchwork): Update to 2.2.2. [arguments]: Remove references to 'pwclient' which is now distributed separately. --- gnu/packages/patchutils.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 335d251e74..12dd472c68 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -321,7 +321,7 @@ you to figure out what is going on in that merge you keep avoiding.") (define-public patchwork (package (name "patchwork") - (version "2.1.5") + (version "2.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -330,7 +330,7 @@ you to figure out what is going on in that merge you keep avoiding.") (file-name (git-file-name name version)) (sha256 (base32 - "1n4hfwlgmw6mj5kp261zfx47mgb0l7g2yzl1rf0rnm8x69lr3as6")))) + "1cr3lhm589zhvcgfm8gni036866k2livq1rcxbnigjxlw9p5znaf")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database @@ -395,24 +395,11 @@ application = get_wsgi_application()\n") port))))) (for-each (lambda (file) (install-file file (string-append out "/bin"))) (list - (string-append out-site-packages - "patchwork/bin/pwclient") (string-append out-site-packages "patchwork/bin/parsemail.sh") (string-append out-site-packages "patchwork/bin/parsemail-batch.sh"))) - ;; Delete the symlink to pwclient, and replace it with the - ;; actual file, as this can cause issues when serving the file - ;; from a webserver. - (let ((template-pwclient (string-append - out-site-packages - "patchwork/templates/patchwork/pwclient"))) - (delete-file template-pwclient) - (copy-file (string-append out-site-packages - "patchwork/bin/pwclient") - template-pwclient)) - ;; Collect the static assets, this includes JavaScript, CSS and ;; fonts. This is a standard Django process when running a ;; Django application for regular use, and includes assets for -- 2.28.0