guix
/
guix
mirror of git://git.savannah.gnu.org/guix.git
3
4
Fork 0
Code Issues Releases Wiki Activity

gnu: racket: Update to 8.11.1. 

* gnu/packages/patches/racket-backport-8.10-rktboot.patch: Delete file.
* gnu/packages/patches/racket-backport-8.11-layered-docs.patch: New file.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
* gnu/packages/racket/scm (%racket-origin)[patches]: Likewise.
(%racket-version): Update to 8.11.1.
(%zuo-version): Update to 1.7.
(racket)[inputs]<deinprogramm, draw, drracket, games, gui, htdp>
<parser-tools, plot, rackunit, redex, scribble, slideshow, typed-racket>
<srfi, string-constants, syntax-color, web-server, xrepl>: Update hashes.
<quickscript>: Likewise, and add snippet.
* gnu/packages/chez.scm (chez-scheme-for-racket): Update to
9.9.9-pre-release.18.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Philip McGrath 2023-12-01 10:35:38 -05:00 committed by Ludovic Courtès
parent eb1f019f77
commit 1b2505217c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
5 changed files with 64 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/local.mk
View File

@ -1942,7 +1942,7 @@ dist_patch_DATA = \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
%D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \
%D%/packages/patches/racket-backport-8.10-rktboot.patch \
%D%/packages/patches/racket-backport-8.11-layered-docs.patch \
%D%/packages/patches/racket-rktio-bin-sh.patch \
%D%/packages/patches/racket-zuo-bin-sh.patch \
%D%/packages/patches/remake-impure-dirs.patch \

2
gnu/packages/chez.scm
View File

@ -466,7 +466,7 @@ and 32-bit PowerPC architectures.")
(package
(inherit chez-scheme)
(name "chez-scheme-for-racket")
(version "9.9.9-pre-release.17")
(version "9.9.9-pre-release.18")
;; The version should match `scheme-version`.
;; See racket/src/ChezScheme/s/cmacros.ss c. line 360.
;; It will always be different than the upstream version!

130
gnu/packages/patches/racket-backport-8.10-rktboot.patch
View File

@ -1,130 +0,0 @@
From 5446e36e0685ec5c7b4f812dec5bf7959db4f906 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 20 Jul 2023 15:56:21 +0300
Subject: [PATCH 1/2] rktboot: Add support for riscv64.
(cherry picked from commit f80c5d001d5235556ae9cde617b1e3a1322d0505)
---
racket/src/rktboot/machine-def.rkt | 1 +
1 file changed, 1 insertion(+)
diff --git a/racket/src/rktboot/machine-def.rkt b/racket/src/rktboot/machine-def.rkt
index 8ff0688652..59ebfc88d8 100644
--- a/racket/src/rktboot/machine-def.rkt
+++ b/racket/src/rktboot/machine-def.rkt
@@ -25,6 +25,7 @@
[(regexp-match? #rx"^t?arm32" target-machine) "arm32"]
[(regexp-match? #rx"^t?arm64" target-machine) "arm64"]
[(regexp-match? #rx"^t?ppc32" target-machine) "ppc32"]
+ [(regexp-match? #rx"^t?rv64" target-machine) "rv64"]
[(regexp-match? #rx"^t?pb" target-machine) "pb"]
[else (error "machine.def: cannot infer architecture")]))]
[s (regexp-replace* #rx"[$][(]Mend[)]" s
base-commit: b10ecfb8311fca2d42636eea2ca12aff0b76b208
--
2.41.0
From 6261c3582c386e770d654ca6a36f112834f35aef Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Sun, 16 Jul 2023 15:47:14 -0400
Subject: [PATCH 2/2] rktboot: improve machene type inference
Related to https://issues.guix.gnu.org/62231
Related to https://github.com/racket/racket/issues/3948
(cherry picked from commit 005488491cee89e7db38109de4c9dcf2d8d5aef0)
---
racket/src/rktboot/config.rkt | 73 +++++++++++++++++++++++++++++------
1 file changed, 61 insertions(+), 12 deletions(-)
diff --git a/racket/src/rktboot/config.rkt b/racket/src/rktboot/config.rkt
index 7a969017ed..2b411e002c 100644
--- a/racket/src/rktboot/config.rkt
+++ b/racket/src/rktboot/config.rkt
@@ -15,20 +15,69 @@
(path->complete-path scheme-dir))))))
(hash-set! ht 'make-boot-scheme-dir scheme-dir)
+(define (infer-target-machine)
+ ;; Compute a native or pbarch machine string for the current platform.
+ ;; Some caveats:
+ ;; 1. A pbarch Racket will always infer a pbarch machine,
+ ;; even if a native machine exists. Hopefully this is an
+ ;; unlikely scenario: if you're running Racket CS, you've
+ ;; bootstrapped Chez somehow, so you could use `re.boot`.
+ ;; 2. A `tpb` or `pb` Racket on a 32-bit platform would still return
+ ;; 64 from `(system-type 'word)`, but, in addition to the above,
+ ;; it is not currently possible or desired to build Racket as
+ ;; `tpb` or `pb` (as opposed to pbarch variants):
+ ;; see <https://github.com/racket/racket/issues/4692>.
+ ;; 3. On a hypothetical platform where Chez supported both the
+ ;; architecture and the OS, but not the combination of the two,
+ ;; (e.g. riscv64 Windows) this code would currently return a
+ ;; non-existent native machine (e.g. trv64nt) instead of a
+ ;; working pbarch machine. Presumably this could be fixed if
+ ;; such a platform came into existence.
+ (define s (path->string (system-library-subpath #f)))
+ (define arch+os
+ (cond
+ [(regexp-match #rx"^([^\\]+)\\\\([^\\]+)$" s)
+ => (λ (m)
+ (reverse (cdr m)))]
+ [(regexp-match #rx"^([^-]+)-(.+)$" s)
+ => cdr]
+ [else
+ (error 'infer-target-machine "unknown format for system library subpath"
+ "produced" (system-library-subpath #f))]))
+ (define arch
+ (case (car arch+os)
+ [("x86_64" "amd64") "a6"] ; https://github.com/racket/racket/issues/4691
+ [("i386") "i3"]
+ [("aarch64") "arm64"]
+ [("arm") "arm32"]
+ [("ppc") "ppc32"]
+ [("riscv64") "rv64"]
+ [("unknown") #f] ; pb machine types
+ [else #f]))
+ (define os
+ (case (cadr arch+os)
+ [("macosx" "darwin" "ios") "osx"]
+ [("win32" "cygwin") "nt"]
+ [("linux" "android") "le"]
+ [("gnu-hurd") "gnu"]
+ [("freebsd") "fb"]
+ [("openbsd") "ob"]
+ [("netbsd") "nb"]
+ [("solaris") "s2"] ; NOT "sunos4" (I think)
+ [("qnx") "qnx"]
+ [("unknown") #f] ; pb machine types
+ [else #f]))
+ (if (and arch os)
+ (string-append "t" arch os)
+ (format "tpb~a~a"
+ (system-type 'word)
+ (if (system-big-endian?)
+ "b"
+ "l"))))
+
(define target-machine (or (hash-ref ht 'make-boot-targate-machine #f)
(getenv "MACH")
- (case (system-type)
- [(macosx) (if (eqv? 64 (system-type 'word))
- "ta6osx"
- "ti3osx")]
- [(windows) (if (eqv? 64 (system-type 'word))
- "ta6nt"
- "ti3nt")]
- [else
- (case (path->string (system-library-subpath #f))
- [("x86_64-linux") "ta6le"]
- [("i386-linux") "ti3le"]
- [else #f])])))
+ (infer-target-machine)))
(hash-set! ht 'make-boot-targate-machine target-machine)
(define optimize-level-init 3)
--
2.41.0

36
gnu/packages/patches/racket-backport-8.11-layered-docs.patch Normal file
View File

@ -0,0 +1,36 @@
From 1d8dbdf408db9e99f1382323477561d5148cd451 Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Fri, 20 Oct 2023 17:19:50 -0400
Subject: [PATCH] racket-index: fix release.scrbl for layered installations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Configure the release notes page to be rendered separately at every
installation layer. Otherwise, rendering documentation for packages
installed in a new layer might try to write to `release/in.sxref`
in the parent layer’s docs directory.
Related to https://github.com/videolang/video/issues/67
Related to https://issues.guix.gnu.org/56534
(cherry picked from commit 85f21854c0a41564b755fbe180fe6b85de6c4730)
---
pkgs/racket-index/scribblings/main/info.rkt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/racket-index/scribblings/main/info.rkt b/pkgs/racket-index/scribblings/main/info.rkt
index 75c507848a..a6a3798f7c 100644
--- a/pkgs/racket-index/scribblings/main/info.rkt
+++ b/pkgs/racket-index/scribblings/main/info.rkt
@@ -6,4 +6,4 @@
("local-redirect.scrbl" (depends-all-main no-depend-on every-main-layer) (omit) "local-redirect" 1 10)
("license.scrbl" () (omit))
("acks.scrbl" () (omit))
- ("release.scrbl" (depends-all-main no-depend-on) (omit))))
+ ("release.scrbl" (depends-all-main no-depend-on every-main-layer) (omit))))
base-commit: c3a502c0ae9f4d615bfd85fc7d88b781826bbb09
--
2.41.0

49
gnu/packages/racket.scm
View File

@ -191,8 +191,8 @@
;;
;; CODE:
(define %racket-version "8.10") ; Remember to update chez-scheme-for-racket!
(define %zuo-version "1.6") ; defined in racket/src/zuo/zuo.c
(define %racket-version "8.11.1") ; Remember to update chez-scheme-for-racket!
(define %zuo-version "1.7") ; defined in racket/src/zuo/zuo.c
(define %racket-commit
(string-append "v" %racket-version))
(define %racket-origin
@ -202,10 +202,10 @@
(url "https://github.com/racket/racket")
(commit %racket-commit)))
(sha256
(base32 "0xhra47lnz5aq2shvsil4vcravai4n86r4v1lza7r07n6s1pb9s5"))
(base32 "1iny1mn1lw07lj6h704ch5g2q1nsf0h88dgwqrlxhf8pwj4i76gl"))
(file-name (git-file-name "racket" %racket-version))
(patches (search-patches "racket-chez-scheme-bin-sh.patch"
"racket-backport-8.10-rktboot.patch"
"racket-backport-8.11-layered-docs.patch"
"racket-rktio-bin-sh.patch"
"racket-zuo-bin-sh.patch"))
(modules '((guix build utils)))
@ -710,16 +710,16 @@ DrRacket IDE, are not included.")
"db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5")
'("db" "db-doc" "db-lib"))
(simple-racket-origin
"deinprogramm" (base32 "0889154ssw56aq6iqxnzgjram9x6c64sscjzrhr4077vnv4h1c93")
"deinprogramm" (base32 "0ijngjyg2i528a4xv20db4adirvx5rj4m86fd70l33lgwv53w3s0")
'("deinprogramm" "deinprogramm-signature"))
(simple-racket-origin
"distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0")
'("distributed-places" "distributed-places-doc" "distributed-places-lib"))
(simple-racket-origin
"draw" (base32 "0vf40hp6h14zgs0gx40jzdzxm4ai1vxwpmg65y00lwmdxc97b2ji")
"draw" (base32 "1h7mckay8yjcgmj3r0jkf1csn430gn43n8jl1l956q9gcprlmncl")
'("draw" "draw-doc" "draw-lib"))
(simple-racket-origin
"drracket" (base32 "0haban4fysr8i2w071nra9s97zkrrx5f5c874r9pr2k9bhqcp4jq")
"drracket" (base32 "00ay3pwl648wq8nnaap665c38clr39k0g1wslh2wclar32wjpgdc")
'("drracket"
"drracket-plugin-lib"
"drracket-tool"
@ -750,16 +750,16 @@ DrRacket IDE, are not included.")
"future-visualizer-pict"
"future-visualizer-typed"))
(simple-racket-origin
"games" (base32 "0kpn3izlx1ccd0pj0dnvmnrhny51b85xy418a7psj70lz8j8415d")
"games" (base32 "13z7fnbr48s98lmfxc0nbfhbqkd4hphymy2r63hqm783xzn6ylzi")
'(("games" ".")))
(simple-racket-origin
"gui" (base32 "1s2a8qgm7dqpxyi9plshdbaxzd8klc80i8ppjpc5i5xyhcfmzyvf")
"gui" (base32 "10mlajn5xqgdwi7gf9lgszfv609pjp8m24lm97b8xh6fmjlkqi4b")
'("gui" "gui-doc" "gui-lib" "tex-table"))
(simple-racket-origin
"gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5")
'("gui-pkg-manager-lib"))
(simple-racket-origin
"htdp" (base32 "0kd92rg8m8my11pq1dxvv6dyban77j6kvs368xsl6fr52jd7zbkl")
"htdp" (base32 "04p2xp4hnnsnmrmvw05fg4fv18k3g2rz5gmgs89sc6g8y886m6zz")
'("htdp" "htdp-doc" "htdp-lib"))
(simple-racket-origin
"html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x")
@ -821,7 +821,7 @@ DrRacket IDE, are not included.")
"option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww")
'("option-contract" "option-contract-doc" "option-contract-lib"))
(simple-racket-origin
"parser-tools" (base32 "11m1x8q0cqb4b082423iv19s86xgkshv29cb4hp8yx84lb0vpwx3")
"parser-tools" (base32 "1lp7wixmxcnha7cz834xfqqr48c2nldjbn9lng69bihpw01h9zms")
'("parser-tools" "parser-tools-doc" "parser-tools-lib"))
(simple-racket-origin
"pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1")
@ -842,7 +842,7 @@ DrRacket IDE, are not included.")
"planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9")
'("planet" "planet-doc" "planet-lib"))
(simple-racket-origin
"plot" (base32 "1p0jxrwdwkb7z6ppp2ccpdzmizjimfpkdgilvbgv8x6mmqf0bf6q")
"plot" (base32 "17fhsymy884xr4jqk585rm5kwdgkgz0635916gh5y0fsnp5pir70")
'("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib"))
(simple-racket-origin
"preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg")
@ -856,8 +856,11 @@ DrRacket IDE, are not included.")
(uri (git-reference
(url "https://github.com/Metaxal/quickscript")
(commit %racket-commit)))
(snippet
;; See https://github.com/Metaxal/quickscript/issues/73
#~(delete-file "register.rkt"))
(sha256 (base32
"00sf5nw09aacd0l4a4cknnffvcs95p596im3blsdvfz5ck6jdwl8"))
"0v27qknghfi0058vk8xwwlwqgqwdsxxmprrmag64cyygdz95sxym"))
(file-name (git-file-name "Metaxal-quickscript" %racket-version)))
'(("quickscript" ".")))
(simple-racket-origin
@ -881,7 +884,7 @@ DrRacket IDE, are not included.")
"racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032")
'(("racklog" ".")))
(simple-racket-origin
"rackunit" (base32 "03v1yvqgk3f65caqiwnadq00sjbg813ic949hys29f4c8mxz6gic")
"rackunit" (base32 "0axcy8283qqmcrhwwn0q0sfjznc8gkwbx06j41anayi5v9xp4698")
'("rackunit"
"rackunit-doc"
"rackunit-gui"
@ -897,7 +900,7 @@ DrRacket IDE, are not included.")
"realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g")
'(("realm" ".")))
(simple-racket-origin
"redex" (base32 "00pm0pj3h19a9dar4pzdn8q5l7bvl92q9gkh04k1ddlcx4af1m10")
"redex" (base32 "016m2fvfxjnx7l0ai6jlcmz4s8xipbq9k58fq7109akj9mvczgp9")
'("redex"
"redex-benchmark"
"redex-doc"
@ -912,7 +915,7 @@ DrRacket IDE, are not included.")
"scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x")
'(("scheme-lib" ".")))
(simple-racket-origin
"scribble" (base32 "1jnbvl98yn8dhblcx411jybd879g4aj6d136xi23i4zwwrbsiy6m")
"scribble" (base32 "0igcjgmpzbzzn1jfpa4jq18lqyhr6dsdwnbv6zv87x8cib9rwqrh")
'("scribble"
"scribble-doc"
"scribble-html-lib"
@ -938,13 +941,13 @@ DrRacket IDE, are not included.")
"slatex" (base32 "0pkm2isbbdk63slrbsxcql7rr0wdrw5kapw1xq4ps5k8dhlzv8x0")
'(("slatex" ".")))
(simple-racket-origin
"slideshow" (base32 "0hmg5184cpxjb0ni6v2zkf4l29j8yyzm9pzv1gvmw2fm1rlrry4f")
"slideshow" (base32 "147s7si6lxx6hm84wk2rfplk6wprladl9zni9pdvaxfa25chrabf")
'("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin"))
(simple-racket-origin
"snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d")
'("snip" "snip-lib"))
(simple-racket-origin
"typed-racket" (base32 "1721qgk1fplzwcgidg342anvykr88prvl1jag4vg8qxz8m28wi08")
"typed-racket" (base32 "17mz7zqrialxfzkynj7h3kfhawdd6cgs24ns437gz087g2pmwi1x")
'("source-syntax"
"typed-racket"
"typed-racket-compatibility"
@ -952,16 +955,16 @@ DrRacket IDE, are not included.")
"typed-racket-lib"
"typed-racket-more"))
(simple-racket-origin
"srfi" (base32 "0rvx49ni1v8ikbx1a6qg97pprpkxmy7cgl918f52hq7jlx91b71x")
"srfi" (base32 "1l3nr3a8mlp505aaxlyp4i8jfijmpyl9h1wwv8hzm4kzzjv4sl8p")
'("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib"))
(simple-racket-origin
"string-constants" (base32 "1jxbh91x1r65lahjlix61rmkjikcam2k5w97xj8r7p7z05240dih")
"string-constants" (base32 "1djbjhsimikk18dkrajrlgjhlqfyvna4nz64ha4wjcaj5cfgcvdx")
'("string-constants" "string-constants-doc" "string-constants-lib"))
(simple-racket-origin
"swindle" (base32 "1q8vdxpzczzwdw2mys2caab45yvadmqkixsr29k8pl03n8dsg8j9")
'(("swindle" ".")))
(simple-racket-origin
"syntax-color" (base32 "0lcv6glhsx27lkz7wwalzgfr0nb0hdqjic54z3rcfxhag4p6sg8i")
"syntax-color" (base32 "1cs0wry7qwv6j690lsjiw86xw0vl10v4i98sk6j8ggrk7irkw48r")
'("syntax-color" "syntax-color-doc" "syntax-color-lib"))
(simple-racket-origin
"trace" (base32 "070ihla5j796hdarn5wxdwn4xj0xnkm50shgh49jy994mribvhia")
@ -970,13 +973,13 @@ DrRacket IDE, are not included.")
"unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y")
'("unix-socket" "unix-socket-doc" "unix-socket-lib"))
(simple-racket-origin
"web-server" (base32 "0sizb50rbnqmdx8igpqshj0hzsqyg30faf7wb9fs08sjs0lqkgsf")
"web-server" (base32 "0vhw1hwdcv1ham086dy0nkl4r0a5qvsimw8048zjakvax7q4shsg")
'("web-server" "web-server-doc" "web-server-lib"))
(simple-racket-origin
"wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b")
'("wxme" "wxme-lib"))
(simple-racket-origin
"xrepl" (base32 "19svg0jfs656bld5ikqipz3a5szk5k02zq5fh43209qw527dnfbk")
"xrepl" (base32 "0sw531zvd8xqckmrh5da4fiq0sfjyg1nj5d508l7bl3azn35khil")
'("xrepl" "xrepl-doc" "xrepl-lib"))))
(build-system gnu-build-system)
(arguments