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

  • Done
  • quality assurance status badge
Details
2 participants
  • jgart
  • Christopher Baines
Owner
unassigned
Submitted by
jgart
Severity
normal
J
J
jgart wrote on 8 Dec 2022 06:59
(name . Guix Patches)(address . guix-patches@gnu.org)
20221207235958.GB22001@dismail.de
hi,

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

all best,

jgart
J
J
jgart wrote on 8 Dec 2022 07:03
[PATCH 1/2] gnu: mercury-minimal: Update to 22.01.4.
(address . 59895@debbugs.gnu.org)(name . jgart)(address . jgart@dismail.de)
20221208060320.5699-1-jgart@dismail.de
* 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(-)

Toggle diff (58 lines)
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
J
J
jgart wrote on 8 Dec 2022 07:03
[PATCH 2/2] gnu: mercury-minimal: Update to 22.01.4.
(address . 59895@debbugs.gnu.org)(name . jgart)(address . jgart@dismail.de)
20221208060320.5699-2-jgart@dismail.de
* 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(-)

Toggle diff (32 lines)
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
J
J
jgart wrote on 10 Dec 2022 01:00
[PATCH v2 1/2] gnu: mercury-minimal: Update to 22.01.4.
(address . 59895@debbugs.gnu.org)(name . jgart)(address . jgart@dismail.de)
20221210000045.19632-1-jgart@dismail.de
* 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(-)

Toggle diff (58 lines)
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
J
J
jgart wrote on 10 Dec 2022 01:00
[PATCH v2 2/2] gnu: mercury: Update to 22.01.4.
(address . 59895@debbugs.gnu.org)(name . jgart)(address . jgart@dismail.de)
20221210000045.19632-2-jgart@dismail.de
* 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(-)

Toggle diff (32 lines)
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
C
C
Christopher Baines wrote on 13 Dec 2022 14:53
Re: [bug#59895] [PATCH 1/2] gnu: mercury: Update to 22.01.4.
(name . jgart)(address . jgart@dismail.de)
87lenbo1et.fsf@cbaines.net
This seems good to me, I've pushed to master as
87638cdd48ccf9537e3e5bcc8156df7a38c1e54a.

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmOYg9pfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdoShAAgoT2HZuJg63HA0644aiNn2szJoq7dcp4
rQHWIjXzghfQb/UX766fxoSAhCEEXSrNmtaDYrapLjCXPonyaXeYpohItqgMJsZq
tuoMc70g5Ty4kjsKV11zB00uTm71AIagyr3UoturmB2Src2wn3Hw9r2U8BSeL1Cd
PPyxLoa+qJs13ck/we7WUzB7lqBbTOdQEZ57sN1JTe2ZrE7IBo7+Y0qIY5LhgarM
UU8dT5v482j9FIqxzsZJJP8nz+XL+IVfqi4XPYbJqLOAGppZq9bxdrYVsAV8rHpj
qHP0CDA8+UmAQW2Somkm3gJjaoAMREo7EHRz54+DX63i2lmcwJMfpI3em8+W36WA
j4/IomAw+BvOHy3nhwEaYROd7h2yiSNBmz69rI6m7z72Go//HYQ7LP4g1YvXwgep
yEGYqqVDhTv2Skt7uxeUz7IpZ9y1u0lpb2AX5wdxrEU52JEkDMDiBuIdwuGJfbWz
K8J+Tl5sUViWGsR1qL7e7FCLunNPb/4khff56e4Nyu3wHAYKYwxnvaezky0CGrOb
rz9KTOW216OW7dLuuuz/0MwQJc2lzgkUPOhkIbmFyJcifrajiewtQitGCdq1Ckac
FCVGJ96sdMMBRTUxS6RMTpKJFHc/+hPEzW+iB4w7zZUMXXwYaTGW6avKbwFY6SJG
OyGMTlSYgR4=
=3AnW
-----END PGP SIGNATURE-----

J
J
jgart wrote on 13 Dec 2022 17:24
(name . Christopher Baines)(address . mail@cbaines.net)
20221213102410.GD5135@dismail.de
On Tue, 13 Dec 2022 13:53:01 +0000 Christopher Baines <mail@cbaines.net> wrote:
Toggle quote (3 lines)
>
> This seems good to me, I've pushed to master as

Thanks!

all best,

jgart
?