From patchwork Wed Jun 28 15:20:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51391 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 F411D27BBEA; Wed, 28 Jun 2023 16:21:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 44C9127BBE2 for ; Wed, 28 Jun 2023 16:21:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEWyd-0001GR-Vt; Wed, 28 Jun 2023 11:21:04 -0400 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 1qEWyc-0001FN-8m for guix-patches@gnu.org; Wed, 28 Jun 2023 11:21:02 -0400 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 1qEWyc-00020i-03 for guix-patches@gnu.org; Wed, 28 Jun 2023 11:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEWyb-0001yF-Mz for guix-patches@gnu.org; Wed, 28 Jun 2023 11:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64327] [PATCH 1/2] gnu: Add perl-json-parse. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Jun 2023 15:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64327@debbugs.gnu.org Cc: gemmaro Received: via spool by 64327-submit@debbugs.gnu.org id=B64327.16879656547529 (code B ref 64327); Wed, 28 Jun 2023 15:21:01 +0000 Received: (at 64327) by debbugs.gnu.org; 28 Jun 2023 15:20:54 +0000 Received: from localhost ([127.0.0.1]:51440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEWyU-0001xM-74 for submit@debbugs.gnu.org; Wed, 28 Jun 2023 11:20:54 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:52399) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEWyR-0001x8-Kv for 64327@debbugs.gnu.org; Wed, 28 Jun 2023 11:20:52 -0400 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1b80b514fb7so216045ad.0 for <64327@debbugs.gnu.org>; Wed, 28 Jun 2023 08:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687965646; x=1690557646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MWlPev7p0nkfFwGlf7psbi/0o7uVeMkDJc3jeckPYvM=; b=Iw5jqg6pGgijXiN2/JcoOUJNrwdiG5BlyLhUvCe+0JORVtufxKMSXO2UvNS6jE0aIA 1Mk8edlr8AVbQiNskvSbqOYT11LJsARA3g0ibXE4EHbG++asu/TBlCpZI5jtKlVMSs28 07NyY8Emv02ecfiOM+gBc82ov2heS+xepdBDST1WSTjClbbk5HU8MGwvFxLKP0KYSAI6 dLA6rFQLZM6IfvYMSBRPB20RU8gFCzSLH1chAedDraiy0OfXRYf1qNvMswq+eDZy/n+d kMRRabsEVZ6LoUqTYhw6HelV3DPuv9SYeE6UPbuKCH0QXqIaOwL17zLj5kkYU0k3MAwt SNdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687965646; x=1690557646; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MWlPev7p0nkfFwGlf7psbi/0o7uVeMkDJc3jeckPYvM=; b=h6nMzPDc/tqzxINmbDE/rwNjHe6Vsowm8mE6372DasBAuVpo8AoNz0kokw/C36YDx9 YLyy+JhEkEXMnpQDLyJFMKPWyNm4Mw4CASjslR5fnqngj6LhOudQm3vPS7Dw10dq7OrM cCXWTEw/fdBgjHEFwShvr0KqnDKfo+Y/nPv0YEYg2h3niS0zUtxGEFpCmfwhaQjjS+xU StdX5SvP3eFzAh/YXxZWrFK08swpOqnamc74jacTZsshg6Htl2WvDa23LZytFwszHzjj yhbklAcrvZ3p/0CL9WDUty5MxzMYL75lp3qeGbMakfy3V3WekE/hSNnAC2fkLiOBU9Sa UWSQ== X-Gm-Message-State: AC+VfDzhBJ67YG1cyrVMCxWV7ZKbadGW+CeEsFQO2GxtUqo+TK3CxU3D /rAKGuruGTT9ZORnjR/UCw0bmYNjV1O2PQ== X-Google-Smtp-Source: ACHHUZ4XsYSAjftJR34PJ+1cp07Me9CKNHKOaykyjBjzgavSt4aI2H/uEUBZbBUASWYKGYzjJXoJtQ== X-Received: by 2002:a17:902:8681:b0:1b7:dde5:fa24 with SMTP id g1-20020a170902868100b001b7dde5fa24mr8880722plo.33.1687965645675; Wed, 28 Jun 2023 08:20:45 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id s14-20020a170902b18e00b001b03c225c0asm7784593plr.221.2023.06.28.08.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 08:20:45 -0700 (PDT) From: gemmaro Date: Thu, 29 Jun 2023 00:20:21 +0900 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/perl.scm (perl-json-parse): New variable. --- gnu/packages/perl.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 15d4f3a9bc0..13bf3fa84cd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022, 2023 Evgeny Pisemsky -;;; Copyright © 2022 gemmaro +;;; Copyright © 2022, 2023 gemmaro ;;; Copyright © 2023 Mădălin Ionel Patrașcu ;;; Copyright © 2023 Andreas Enge ;;; Copyright © 2023 Jake Leporte @@ -6036,6 +6036,28 @@ (define-public perl-json-maybexs either uses the first module it finds or throws an error.") (license (package-license perl)))) +(define-public perl-json-parse + (package + (name "perl-json-parse") + (version "0.62") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-" version + ".tar.gz")) + (sha256 + (base32 + "1nb6zxf6p42dmdmdv4c8x0dnra2sdxq21n6nvl0p8jcjjc7ihwv2")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/JSON-Parse") + (synopsis "Perl Module for parsing JSON") + (description "@code{JSON::Parse} is a module for parsing JSON. It offers +@code{parse_json} which takes a string containing JSON and returns an +equivalent Perl structure, @code{valid_json} which returns true or false +depending on whether the JSON is correct or not, @code{assert_valid_json} +which produces a descriptive fatal error if the JSON is invalid, and so on.") + (license (package-license perl)))) + (define-public perl-json-xs (package (name "perl-json-xs") From patchwork Wed Jun 28 15:20:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 51392 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 159FD27BBEA; Wed, 28 Jun 2023 16:21:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 1872C27BBE2 for ; Wed, 28 Jun 2023 16:21:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEWye-0001GT-6x; Wed, 28 Jun 2023 11:21:04 -0400 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 1qEWyc-0001FU-Fv for guix-patches@gnu.org; Wed, 28 Jun 2023 11:21:02 -0400 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 1qEWyc-00023F-6R for guix-patches@gnu.org; Wed, 28 Jun 2023 11:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEWyc-0001yM-2p for guix-patches@gnu.org; Wed, 28 Jun 2023 11:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64327] [PATCH 2/2] gnu: gnucash: Update to 5.3. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Jun 2023 15:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64327@debbugs.gnu.org Cc: gemmaro Received: via spool by 64327-submit@debbugs.gnu.org id=B64327.16879656607546 (code B ref 64327); Wed, 28 Jun 2023 15:21:02 +0000 Received: (at 64327) by debbugs.gnu.org; 28 Jun 2023 15:21:00 +0000 Received: from localhost ([127.0.0.1]:51443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEWyZ-0001xe-NY for submit@debbugs.gnu.org; Wed, 28 Jun 2023 11:21:00 -0400 Received: from mail-pl1-f182.google.com ([209.85.214.182]:53358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEWyY-0001xK-Gb for 64327@debbugs.gnu.org; Wed, 28 Jun 2023 11:20:59 -0400 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1b80bce2592so3145ad.2 for <64327@debbugs.gnu.org>; Wed, 28 Jun 2023 08:20:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687965653; x=1690557653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=knX9Lj7H6EZBZNWD1NJYOPdZfI5L5k6JABWBot+MUp4=; b=c/01NZadCf1CIZXtg2qFyKHVhJB9rJAUDpR0dKjZV/VTJvOnUXedkOhpaI8N+zl+HD PO3hJQiIIS42qTBN76F3Y3eG8n82ThuQ1ED64nuGt+5zb2WaO9JdoYCrURRN2L2Kp4gr /nNivbapyu4KU7/y8IQAJtCpDHUZ9dfUZI+qt5qW/GmvONl2ccM+DwIZMXUnsf6xNeGH mCHS2tBcBU1eTl1ajTF+4+1UbTne1vBZrMUO1TjGHC67nkoT3FC9UAEN60jZrs1M7trW pZ7UfP5r53xe2oG3/uPO1OxH9XkuYZ1mgMCUEH1nsWQAOXpRCxXjbPcxj36OBu/IE7yW ggxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687965653; x=1690557653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=knX9Lj7H6EZBZNWD1NJYOPdZfI5L5k6JABWBot+MUp4=; b=a9ccoj6rQogXNiIP34gNHOa2H6MIFjS/RJEOUZ+FrcLNKkg+dszsrmBfjtDAkjJ88M CZEGRhz9rLT2ERI8xdl1QOoX5G7aJRfCrWNXTOlHkehPnbmKGfwKjlXY3H8F5KSsiSUo p1dEyLJd1nRRc7+lU8PJsfGr2HU0+JnYf4rba5eO46JavL9EF6GFfuWv6dfM19MencfR MGD9CkSjx3SOeS8sGdLS2X9uAYMAhXw4l3Xng6zZW0M0g3q3hGRLY/lN2reUPnt3xh6j Hzk6eaI6X8WQPn4iuSDpkwOxYHGgM/NognjmPuzcIcr7HtWWE6AQKa3HXwk/FLB4xHJO lq8Q== X-Gm-Message-State: AC+VfDw0j6Yan1Yp/esPd37BIxszmiZUrnDsVhPDdK+N83CGJJ1o5ahm 3JLXxwZmpVnijAwG00LTwnu0O3atQ7rP9w== X-Google-Smtp-Source: ACHHUZ4a1Yu8+SKkcKaFpBeExYWf9nlBgDH8JoGjTvxJ/JvZmwtfBFxKk5pRiAYxy51xC2dy7TGhfw== X-Received: by 2002:a17:902:e5c3:b0:1b6:bced:1dd6 with SMTP id u3-20020a170902e5c300b001b6bced1dd6mr11031816plf.35.1687965652830; Wed, 28 Jun 2023 08:20:52 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id s14-20020a170902b18e00b001b03c225c0asm7784593plr.221.2023.06.28.08.20.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 08:20:52 -0700 (PDT) From: gemmaro Date: Thu, 29 Jun 2023 00:20:22 +0900 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/gnucash.scm (gnucash): Update to 5.3 [arguments]: Replace disable-unsupported-test phase with disable-online-test, which enables all tests but online_wiggle. [inputs]: Add perl-json-parse and bash-minimal. * gnu/packages/gnucash.scm (gnucash-doc): Update to 5.3. --- gnu/packages/gnucash.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index aa033c0b9ab..bfc323da333 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Prafulla Giri ;;; Copyright © 2020 Christopher Lam +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ (define-module (gnu packages gnucash) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -64,14 +66,14 @@ (define-public gnucash ;; directory. (package (name "gnucash") - (version "5.0") + (version "5.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-" version ".tar.bz2")) (sha256 - (base32 "09482f1w4yawrdw5c2wi0jb8hwlp1x9mdvq552bf9n5f66mkphfg")))) + (base32 "0npilq0spalpg1ma956j7vlbn0yc5f0z5imy4kbyksl5ql4cnn0l")))) (outputs '("out" "doc" "debug" "python")) (build-system cmake-build-system) (arguments @@ -87,13 +89,11 @@ (define-public gnucash (guix build utils)) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-unsupported-test - ;; test test-gnc-quotes neeeds perl JSON::Parse - ;; not packaged in Guix yet + (add-after 'unpack 'disable-online-test (lambda _ - (substitute* "libgnucash/app-utils/test/CMakeLists.txt" - (("gnc_add_test\\(test-gnc-quotes") - "#gnc_add_test\\(test-gnc-quotes")))) + (call-with-output-file "libgnucash/app-utils/test/CMakeLists.txt" + (lambda (port) + (display "set(CTEST_CUSTOM_TESTS_IGNORE online_wiggle)" port))))) (add-after 'unpack 'set-env-vars (lambda* (#:key inputs #:allow-other-keys) ;; At least one test is time-related and requires this @@ -171,6 +171,7 @@ (define-public gnucash swig)) (inputs (list aqbanking + bash-minimal boost glib gtk+ @@ -183,6 +184,7 @@ (define-public gnucash libxslt perl-date-manip perl-finance-quote + perl-json-parse python tzdata-for-tests webkitgtk-with-libsoup2)) @@ -212,11 +214,13 @@ (define gnucash-docs (source (origin (method url-fetch) + ;; The filename for version 5.3 is gnucash-docs-5.2.tar.gz, not + ;; gnucash-docs-5.3.tar.gz. (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" - version "/gnucash-docs-" version revision ".tar.gz")) + version "/gnucash-docs-5.2" revision ".tar.gz")) (sha256 - (base32 "1cgdb5qrwrx6yf6dsc8zlhi67lbyjs1g82i0n53sw6n6v38dd882")))) + (base32 "16xlxwdgc0w4cg9kxg4w2f1y974cb16wq2c9icq5qrh3nj0nbsxr")))) (build-system cmake-build-system) ;; These are native-inputs because they are only required for building the ;; documentation.