diff mbox series

[bug#36142] racket: Update to 7.3.

Message ID 87h88zzdk2.fsf@dustycloud.org
State Accepted
Headers show
Series [bug#36142] racket: Update to 7.3. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Christine Lemmer-Webber June 9, 2019, 2:40 a.m. UTC

Comments

Ludovic Courtès June 10, 2019, 9:10 p.m. UTC | #1
Hi Chris,

Christopher Lemmer Webber <cwebber@dustycloud.org> skribis:

> From fb38fc34980e87f6b5e157ed93a188754b6a8b78 Mon Sep 17 00:00:00 2001
> From: Christopher Lemmer Webber <cwebber@dustycloud.org>
> Date: Sat, 8 Jun 2019 22:37:50 -0400
> Subject: [PATCH] gnu: racket: Update to 7.3.
>
> * gnu/packages/scheme.scm (racket): Update to 7.3.
> * gnu/packages/patches/racket-store-checksum-override.patch: Update for Racket
>   7.3.

Yay, go for it!  Thank you!

Ludo’.
Christine Lemmer-Webber June 11, 2019, 5:47 p.m. UTC | #2
Ludovic Courtès writes:

> Hi Chris,
>
> Christopher Lemmer Webber <cwebber@dustycloud.org> skribis:
>
>> From fb38fc34980e87f6b5e157ed93a188754b6a8b78 Mon Sep 17 00:00:00 2001
>> From: Christopher Lemmer Webber <cwebber@dustycloud.org>
>> Date: Sat, 8 Jun 2019 22:37:50 -0400
>> Subject: [PATCH] gnu: racket: Update to 7.3.
>>
>> * gnu/packages/scheme.scm (racket): Update to 7.3.
>> * gnu/packages/patches/racket-store-checksum-override.patch: Update for Racket
>>   7.3.
>
> Yay, go for it!  Thank you!
>
> Ludo’.

Pushed to master!
diff mbox series

Patch

From fb38fc34980e87f6b5e157ed93a188754b6a8b78 Mon Sep 17 00:00:00 2001
From: Christopher Lemmer Webber <cwebber@dustycloud.org>
Date: Sat, 8 Jun 2019 22:37:50 -0400
Subject: [PATCH] gnu: racket: Update to 7.3.

* gnu/packages/scheme.scm (racket): Update to 7.3.
* gnu/packages/patches/racket-store-checksum-override.patch: Update for Racket
  7.3.
---
 .../racket-store-checksum-override.patch      | 35 ++++++++-----------
 gnu/packages/scheme.scm                       |  4 +--
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/patches/racket-store-checksum-override.patch b/gnu/packages/patches/racket-store-checksum-override.patch
index 6c9cd5198a..236c843de1 100644
--- a/gnu/packages/patches/racket-store-checksum-override.patch
+++ b/gnu/packages/patches/racket-store-checksum-override.patch
@@ -7,12 +7,8 @@  because the store is immutable.  This patch makes Racket ignore
 checksums for files in the store.
 
 See <https://debbugs.gnu.org/30680> for details.
----
- collects/compiler/private/cm-minimal.rkt | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
 
-diff --git a/collects/compiler/private/cm-minimal.rkt b/collects/compiler/private/cm-minimal.rkt
-index a5a5407..15af6b8 100644
+---
 --- a/collects/compiler/private/cm-minimal.rkt
 +++ b/collects/compiler/private/cm-minimal.rkt
 @@ -7,6 +7,7 @@
@@ -20,10 +16,10 @@  index a5a5407..15af6b8 100644
           racket/path
           racket/promise
 +         racket/string
-          openssl/sha1
+          file/sha1
           setup/collects
-          compiler/compilation-path
-@@ -543,6 +544,10 @@
+          setup/cross-system
+@@ -940,6 +941,10 @@
        #f
        (list src-hash recorded-hash)))
  
@@ -34,16 +30,13 @@  index a5a5407..15af6b8 100644
  (define (rkt->ss p)
    (if (path-has-extension? p #".rkt")
        (path-replace-extension p #".ss")
-@@ -595,7 +600,8 @@
-               (trace-printf "newer src... ~a > ~a" path-time path-zo-time)
-               ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
-               (maybe-compile-zo sha1-only? deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen)]
--             [(different-source-sha1-and-dep-recorded path deps)
-+             [(and (not (store-reference? path))
-+                   (different-source-sha1-and-dep-recorded path deps))
-               => (lambda (difference)
-                    (trace-printf "different src hash... ~a" difference)
-                    ;; If `sha1-only?', then `maybe-compile-zo' returns a #f or thunk:
--- 
-2.18.0
-
+@@ -1015,6 +1020,7 @@
+                (trace-printf "newer src... ~a > ~a" path-time path-zo-time)
+                (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen
+                                  #:trying-sha1? sha1-only?)]
+-              [(different-source-sha1-and-dep-recorded path deps)
++              [(and (not (store-reference? path))
++                    (different-source-sha1-and-dep-recorded path deps))
+                => (lambda (difference)
+                     (trace-printf "different src hash ~a for ~a..." difference path)
+                     (maybe-compile-zo deps path->mode roots path orig-path read-src-syntax up-to-date collection-cache new-seen
\ No newline at end of file
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 3e5ab72f20..9962cbdcb5 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -437,7 +437,7 @@  implementation techniques and as an expository tool.")
 (define-public racket
   (package
     (name "racket")
-    (version "7.0")
+    (version "7.3")
     (source (origin
               (method url-fetch)
               (uri (list (string-append "http://mirror.racket-lang.org/installers/"
@@ -447,7 +447,7 @@  implementation techniques and as an expository tool.")
                           version "/racket-" version "-src.tgz")))
               (sha256
                (base32
-                "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"))
+                "0h6072njhb87rkz4arijvahxgjzn8r14s4wns0ijvxm89bg136yl"))
               (patches (search-patches
                         "racket-store-checksum-override.patch"))))
     (build-system gnu-build-system)
-- 
2.21.0