[bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4.

unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

* [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4.
@ 2022-12-08  5:59 jgart via Guix-patches via
  2022-12-08  6:03 ` [bug#59895] [PATCH 1/2] gnu: mercury-minimal: " jgart via Guix-patches via
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: jgart via Guix-patches via @ 2022-12-08  5:59 UTC (permalink / raw)
  To: 59895

hi,

This patch updates mercury to the latest release version. This took a while to build.

all best,

jgart




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

* [bug#59895] [PATCH 1/2] gnu: mercury-minimal: Update to 22.01.4.
  2022-12-08  5:59 [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4 jgart via Guix-patches via
@ 2022-12-08  6:03 ` jgart via Guix-patches via
  2022-12-08  6:03   ` [bug#59895] [PATCH 2/2] " jgart via Guix-patches via
  2022-12-10  0:00 ` [bug#59895] [PATCH v2 1/2] " jgart via Guix-patches via
  2022-12-13 13:53 ` [bug#59895] [PATCH 1/2] " Christopher Baines
  2 siblings, 1 reply; 7+ messages in thread
From: jgart via Guix-patches via @ 2022-12-08  6:03 UTC (permalink / raw)
  To: 59895; +Cc: jgart

* gnu/packages/mercury.scm (mercury-minimal): Update to 22.01.4.
[arguments]: Remove obsolete file path, update libatomic-ops, and
update libgc-8.
---
 gnu/packages/mercury.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm
index 1c7f5c5f55..8653e3977f 100644
--- a/gnu/packages/mercury.scm
+++ b/gnu/packages/mercury.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,7 +57,7 @@ (define (gc-fork package-name package-url
 (define-public mercury-minimal
   (package
     (name "mercury-minimal")
-    (version "20.06.1")
+    (version "22.01.4")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -64,7 +65,7 @@ (define-public mercury-minimal
                     version ".tar.gz"))
               (sha256
                (base32
-                "07qwkk871yxd4q1sw5xv26g8jrpvnpprmzvfd7zg7i142kl3l2gg"))))
+                "1vakjg4rqpplkxw7k91qv8jvlasrr6iwrzrylwqllbq088qs0mbp"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
@@ -112,7 +113,6 @@ (define-public mercury-minimal
                        "scripts/Mmake.vars.in"
                        "scripts/mdb.in"
                        "scripts/rs6000_hack"
-                       "scripts/fullarch"
                        "scripts/mmc.in"
                        "scripts/canonical_grade"
                        "scripts/mprof.in"
@@ -143,14 +143,14 @@ (define-public mercury-minimal
                           (gc-fork
                            libatomic-ops
                            "https://github.com/Mercury-Language/libatomic_ops.git"
-                           "49b70d57f6922fd8be55a7dcb77955c8abfc9ae9"
-                           "1flvwscsa6b2b8a38vhhcgl10bbkb5nnihw7s7iia60cinf7wcqm")))
+                           "95809e50a5ff6e765f1af2f589796970a73e9c00"
+                           "0a1y795bvzwzk1v8d9g6wvifj7hvhmxlir1g581bq2slj16h95iz")))
        ("libgc" ,(package-source
                   (gc-fork
                    libgc-7
                    "https://github.com/Mercury-Language/bdwgc.git"
-                   "43ac2ea45261ba0a715534e9da41b2504904c46a"
-                   "0bmzmbs7id0ndyhy9xli6fhfad1shrim6vmy2k8m1nqr5wb31q76")))
+                   "def741752f55f9068d4f469a14c4b2c168829730"
+                   "07d94j5l9w6l2kjmcwblgn5lf77aw3r0zjn22pq4hbhknky6ny43")))
        ("pkg-config" ,pkg-config)))
     (synopsis "Pure logic programming language (used only for
 bootstrapping dependent Mercury)")
-- 
2.38.1





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

* [bug#59895] [PATCH 2/2] gnu: mercury-minimal: Update to 22.01.4.
  2022-12-08  6:03 ` [bug#59895] [PATCH 1/2] gnu: mercury-minimal: " jgart via Guix-patches via
@ 2022-12-08  6:03   ` jgart via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: jgart via Guix-patches via @ 2022-12-08  6:03 UTC (permalink / raw)
  To: 59895; +Cc: jgart

* gnu/packages/mercury.scm (mercury-minimal): Update to 22.01.4.
[arguments]: Remove obsolete and non-existent file from being patched.
---
 gnu/packages/mercury.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm
index 8653e3977f..875e957c9f 100644
--- a/gnu/packages/mercury.scm
+++ b/gnu/packages/mercury.scm
@@ -171,7 +171,7 @@ (define-public mercury-minimal
 (define-public mercury
   (package (inherit mercury-minimal)
            (name "mercury")
-           (version "20.06.1")
+           (version "22.01.4")
            (source
             (origin
               (method git-fetch)
@@ -183,7 +183,7 @@ (define-public mercury
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1b6rmdinw8mj6n9sc7c75kkf42gd2k254rf51x4snlrqckxj7aaz"))))
+                "0ycy1j9a4rdj6d37x02dj6kyr00mykvc5kykci11fim906d92gzh"))))
            (arguments
             (substitute-keyword-arguments
                 (package-arguments mercury-minimal)
@@ -205,7 +205,6 @@ (define-public mercury
                                 "scripts/Mmake.vars.in"
                                 "scripts/mdb.in"
                                 "scripts/rs6000_hack"
-                                "scripts/fullarch"
                                 "scripts/mmc.in"
                                 "scripts/mprof.in"
                                 "scripts/gud.el"
-- 
2.38.1





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

* [bug#59895] [PATCH v2 1/2] gnu: mercury-minimal: Update to 22.01.4.
  2022-12-08  5:59 [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4 jgart via Guix-patches via
  2022-12-08  6:03 ` [bug#59895] [PATCH 1/2] gnu: mercury-minimal: " jgart via Guix-patches via
@ 2022-12-10  0:00 ` jgart via Guix-patches via
  2022-12-10  0:00   ` [bug#59895] [PATCH v2 2/2] gnu: mercury: " jgart via Guix-patches via
  2022-12-13 13:53 ` [bug#59895] [PATCH 1/2] " Christopher Baines
  2 siblings, 1 reply; 7+ messages in thread
From: jgart via Guix-patches via @ 2022-12-10  0:00 UTC (permalink / raw)
  To: 59895; +Cc: jgart

* gnu/packages/mercury.scm (mercury-minimal): Update to 22.01.4.
[arguments]: Remove obsolete file path, update libatomic-ops, and
update libgc-8.

v2 fixes the commit message duplicate I had in v1.

all best,

jgart
---
 gnu/packages/mercury.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm
index 1c7f5c5f55..8653e3977f 100644
--- a/gnu/packages/mercury.scm
+++ b/gnu/packages/mercury.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -56,7 +57,7 @@ (define (gc-fork package-name package-url
 (define-public mercury-minimal
   (package
     (name "mercury-minimal")
-    (version "20.06.1")
+    (version "22.01.4")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -64,7 +65,7 @@ (define-public mercury-minimal
                     version ".tar.gz"))
               (sha256
                (base32
-                "07qwkk871yxd4q1sw5xv26g8jrpvnpprmzvfd7zg7i142kl3l2gg"))))
+                "1vakjg4rqpplkxw7k91qv8jvlasrr6iwrzrylwqllbq088qs0mbp"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
@@ -112,7 +113,6 @@ (define-public mercury-minimal
                        "scripts/Mmake.vars.in"
                        "scripts/mdb.in"
                        "scripts/rs6000_hack"
-                       "scripts/fullarch"
                        "scripts/mmc.in"
                        "scripts/canonical_grade"
                        "scripts/mprof.in"
@@ -143,14 +143,14 @@ (define-public mercury-minimal
                           (gc-fork
                            libatomic-ops
                            "https://github.com/Mercury-Language/libatomic_ops.git"
-                           "49b70d57f6922fd8be55a7dcb77955c8abfc9ae9"
-                           "1flvwscsa6b2b8a38vhhcgl10bbkb5nnihw7s7iia60cinf7wcqm")))
+                           "95809e50a5ff6e765f1af2f589796970a73e9c00"
+                           "0a1y795bvzwzk1v8d9g6wvifj7hvhmxlir1g581bq2slj16h95iz")))
        ("libgc" ,(package-source
                   (gc-fork
                    libgc-7
                    "https://github.com/Mercury-Language/bdwgc.git"
-                   "43ac2ea45261ba0a715534e9da41b2504904c46a"
-                   "0bmzmbs7id0ndyhy9xli6fhfad1shrim6vmy2k8m1nqr5wb31q76")))
+                   "def741752f55f9068d4f469a14c4b2c168829730"
+                   "07d94j5l9w6l2kjmcwblgn5lf77aw3r0zjn22pq4hbhknky6ny43")))
        ("pkg-config" ,pkg-config)))
     (synopsis "Pure logic programming language (used only for
 bootstrapping dependent Mercury)")
-- 
2.38.1





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

* [bug#59895] [PATCH v2 2/2] gnu: mercury: Update to 22.01.4.
  2022-12-10  0:00 ` [bug#59895] [PATCH v2 1/2] " jgart via Guix-patches via
@ 2022-12-10  0:00   ` jgart via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: jgart via Guix-patches via @ 2022-12-10  0:00 UTC (permalink / raw)
  To: 59895; +Cc: jgart

* gnu/packages/mercury.scm (mercury-minimal): Update to 22.01.4.
[arguments]: Remove obsolete and non-existent file from being patched.
---
 gnu/packages/mercury.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm
index 8653e3977f..875e957c9f 100644
--- a/gnu/packages/mercury.scm
+++ b/gnu/packages/mercury.scm
@@ -171,7 +171,7 @@ (define-public mercury-minimal
 (define-public mercury
   (package (inherit mercury-minimal)
            (name "mercury")
-           (version "20.06.1")
+           (version "22.01.4")
            (source
             (origin
               (method git-fetch)
@@ -183,7 +183,7 @@ (define-public mercury
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1b6rmdinw8mj6n9sc7c75kkf42gd2k254rf51x4snlrqckxj7aaz"))))
+                "0ycy1j9a4rdj6d37x02dj6kyr00mykvc5kykci11fim906d92gzh"))))
            (arguments
             (substitute-keyword-arguments
                 (package-arguments mercury-minimal)
@@ -205,7 +205,6 @@ (define-public mercury
                                 "scripts/Mmake.vars.in"
                                 "scripts/mdb.in"
                                 "scripts/rs6000_hack"
-                                "scripts/fullarch"
                                 "scripts/mmc.in"
                                 "scripts/mprof.in"
                                 "scripts/gud.el"
-- 
2.38.1





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

* [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4.
  2022-12-08  5:59 [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4 jgart via Guix-patches via
  2022-12-08  6:03 ` [bug#59895] [PATCH 1/2] gnu: mercury-minimal: " jgart via Guix-patches via
  2022-12-10  0:00 ` [bug#59895] [PATCH v2 1/2] " jgart via Guix-patches via
@ 2022-12-13 13:53 ` Christopher Baines
  2022-12-13 16:24   ` jgart via Guix-patches via
  2 siblings, 1 reply; 7+ messages in thread
From: Christopher Baines @ 2022-12-13 13:53 UTC (permalink / raw)
  To: jgart; +Cc: 59895-done, 59895

[-- Attachment #1: Type: text/plain, Size: 107 bytes --]


This seems good to me, I've pushed to master as
87638cdd48ccf9537e3e5bcc8156df7a38c1e54a.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

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

* [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4.
  2022-12-13 13:53 ` [bug#59895] [PATCH 1/2] " Christopher Baines
@ 2022-12-13 16:24   ` jgart via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: jgart via Guix-patches via @ 2022-12-13 16:24 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 59895-done, 59895

On Tue, 13 Dec 2022 13:53:01 +0000 Christopher Baines <mail@cbaines.net> wrote:
> 
> This seems good to me, I've pushed to master as

Thanks!

all best,

jgart




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

end of thread, other threads:[~2022-12-13 16:25 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-08  5:59 [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4 jgart via Guix-patches via
2022-12-08  6:03 ` [bug#59895] [PATCH 1/2] gnu: mercury-minimal: " jgart via Guix-patches via
2022-12-08  6:03   ` [bug#59895] [PATCH 2/2] " jgart via Guix-patches via
2022-12-10  0:00 ` [bug#59895] [PATCH v2 1/2] " jgart via Guix-patches via
2022-12-10  0:00   ` [bug#59895] [PATCH v2 2/2] gnu: mercury: " jgart via Guix-patches via
2022-12-13 13:53 ` [bug#59895] [PATCH 1/2] " Christopher Baines
2022-12-13 16:24   ` jgart via Guix-patches via

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