unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#64327] [PATCH 0/2] gnu: gnucash: Update to 5.3.
@ 2023-06-28 15:14 gemmaro
  2023-06-28 15:20 ` [bug#64327] [PATCH 1/2] gnu: Add perl-json-parse gemmaro
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: gemmaro @ 2023-06-28 15:14 UTC (permalink / raw)
  To: 64327; +Cc: gemmaro

gemmaro (2):
  gnu: Add perl-json-parse.
  gnu: gnucash: Update to 5.3.

 gnu/packages/gnucash.scm | 24 ++++++++++++++----------
 gnu/packages/perl.scm    | 24 +++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 11 deletions(-)


base-commit: a98126e604b666d08a4c9d838bf9c341acea7f17
-- 
2.40.1





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#64327] [PATCH 1/2] gnu: Add perl-json-parse.
  2023-06-28 15:14 [bug#64327] [PATCH 0/2] gnu: gnucash: Update to 5.3 gemmaro
@ 2023-06-28 15:20 ` gemmaro
  2023-06-28 15:20 ` [bug#64327] [PATCH 2/2] gnu: gnucash: Update to 5.3 gemmaro
  2023-07-17 22:40 ` bug#64327: [PATCH 0/2] " Ludovic Courtès
  2 siblings, 0 replies; 4+ messages in thread
From: gemmaro @ 2023-06-28 15:20 UTC (permalink / raw)
  To: 64327; +Cc: gemmaro

* 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 <rg@raghavgururajan.name>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
-;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2022, 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
 ;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
@@ -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")
-- 
2.40.1





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#64327] [PATCH 2/2] gnu: gnucash: Update to 5.3.
  2023-06-28 15:14 [bug#64327] [PATCH 0/2] gnu: gnucash: Update to 5.3 gemmaro
  2023-06-28 15:20 ` [bug#64327] [PATCH 1/2] gnu: Add perl-json-parse gemmaro
@ 2023-06-28 15:20 ` gemmaro
  2023-07-17 22:40 ` bug#64327: [PATCH 0/2] " Ludovic Courtès
  2 siblings, 0 replies; 4+ messages in thread
From: gemmaro @ 2023-06-28 15:20 UTC (permalink / raw)
  To: 64327; +Cc: gemmaro

* gnu/packages/gnucash.scm (gnucash): Update to 5.3
  [arguments]<phase>: 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 <glv@posteo.net>
 ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
 ;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com>
+;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
 ;;;
 ;;; 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.
-- 
2.40.1





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#64327: [PATCH 0/2] gnu: gnucash: Update to 5.3.
  2023-06-28 15:14 [bug#64327] [PATCH 0/2] gnu: gnucash: Update to 5.3 gemmaro
  2023-06-28 15:20 ` [bug#64327] [PATCH 1/2] gnu: Add perl-json-parse gemmaro
  2023-06-28 15:20 ` [bug#64327] [PATCH 2/2] gnu: gnucash: Update to 5.3 gemmaro
@ 2023-07-17 22:40 ` Ludovic Courtès
  2 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2023-07-17 22:40 UTC (permalink / raw)
  To: gemmaro; +Cc: 64327-done

gemmaro <gemmaro.dev@gmail.com> skribis:

>   gnu: Add perl-json-parse.
>   gnu: gnucash: Update to 5.3.

Applied, thanks!




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-07-17 22:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-28 15:14 [bug#64327] [PATCH 0/2] gnu: gnucash: Update to 5.3 gemmaro
2023-06-28 15:20 ` [bug#64327] [PATCH 1/2] gnu: Add perl-json-parse gemmaro
2023-06-28 15:20 ` [bug#64327] [PATCH 2/2] gnu: gnucash: Update to 5.3 gemmaro
2023-07-17 22:40 ` bug#64327: [PATCH 0/2] " Ludovic Courtès

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).