From e3fc9bcce2cfc26a60747c58f5c8c59cc8400785 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 12 Aug 2018 11:12:38 -0400 Subject: gnu: racket: Ignore bytecode checksums in the store. Fixes . * gnu/packages/patches/racket-store-checksum-override.patch: New file. * gnu/packages/scheme.scm (racket)[sources]: Add it. --- gnu/packages/scheme.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/scheme.scm') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 4178a45a89..b30245ccea 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -421,7 +421,8 @@ implementation techniques and as an expository tool.") (patches (search-patches ;; See: https://github.com/racket/racket/issues/1962 ;; This can be removed in whatever Racket release comes after 6.12 - "racket-fix-xform-issue.patch")))) + "racket-fix-xform-issue.patch" + "racket-store-checksum-override.patch")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From e0b49c785b6fe577fbf07e5d74b8544e9d336209 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Thu, 2 Aug 2018 16:23:11 +0200 Subject: gnu: racket: Update to 7.0. * gnu/packages/scheme.scm (racket): Update to 7.0. [inputs]: Add libedit. [arguments]: Update the list of FFI library references to patch. [source]: Remove 'racket-fix-xform-issue.patch'. * gnu/packages/patches/racket-store-checksum-override.patch: Adjust. * gnu/packages/patches/racket-fix-xform-issue.patch: Delete file. * gnu/local.mk: Adjust accordingly. Signed-off-by: Leo Famulari --- gnu/packages/scheme.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'gnu/packages/scheme.scm') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index b30245ccea..1e045a27fd 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages tls) #:use-module (gnu packages gl) + #:use-module (gnu packages libedit) #:use-module (ice-9 match)) (define (mit-scheme-source-directory system version) @@ -407,22 +408,19 @@ implementation techniques and as an expository tool.") (define-public racket (package (name "racket") - (version "6.12") + (version "7.0") (source (origin - (method url-fetch) - (uri (list (string-append "http://mirror.racket-lang.org/installers/" - version "/racket-" version "-src.tgz") - (string-append - "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" - version "/racket-" version "-src.tgz"))) - (sha256 - (base32 - "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5")) - (patches (search-patches - ;; See: https://github.com/racket/racket/issues/1962 - ;; This can be removed in whatever Racket release comes after 6.12 - "racket-fix-xform-issue.patch" - "racket-store-checksum-override.patch")))) + (method url-fetch) + (uri (list (string-append "http://mirror.racket-lang.org/installers/" + version "/racket-" version "-src.tgz") + (string-append + "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" + version "/racket-" version "-src.tgz"))) + (sha256 + (base32 + "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a")) + (patches (search-patches + "racket-store-checksum-override.patch")))) (build-system gnu-build-system) (arguments '(#:phases @@ -485,7 +483,9 @@ implementation techniques and as an expository tool.") ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt" ("libGL")) ("share/pkgs/sgl/gl.rkt" - ("libGL" "libGLU"))))) + ("libGL" "libGLU")) + ("share/pkgs/readline-lib/readline/rktrl.rkt" + ("libedit"))))) (chdir "src") #t)) (add-after 'unpack 'patch-/bin/sh @@ -493,7 +493,7 @@ implementation techniques and as an expository tool.") (substitute* "collects/racket/system.rkt" (("/bin/sh") (which "sh"))) #t))) - #:tests? #f ; XXX: how to run them? + #:tests? #f ; XXX: how to run them? )) (inputs `(("libffi" ,libffi) @@ -504,7 +504,7 @@ implementation techniques and as an expository tool.") ("glib" ,glib) ("glu" ,glu) ("gmp" ,gmp) - ("gtk+" ,gtk+) ; propagates gdk-pixbuf+svg + ("gtk+" ,gtk+) ; propagates gdk-pixbuf+svg ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libx11" ,libx11) @@ -513,7 +513,8 @@ implementation techniques and as an expository tool.") ("openssl" ,openssl) ("pango" ,pango) ("sqlite" ,sqlite) - ("unixodbc" ,unixodbc))) + ("unixodbc" ,unixodbc) + ("libedit" ,libedit))) (home-page "http://racket-lang.org") (synopsis "Implementation of Scheme and related languages") (description -- cgit v1.2.3 From 9b02a79bb079f2746ef5e6eb2ff47d7d44e335a9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 13 Aug 2018 18:04:42 +0200 Subject: gnu: mit-scheme: Use minimal texlive-union. * gnu/packages/scheme.scm (mit-scheme)[native-inputs]: Replace texlive with texlive-union. --- gnu/packages/scheme.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/scheme.scm') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 1e045a27fd..926169ce18 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -105,6 +105,10 @@ (find-files "src/compiler" "^make\\."))) (chdir "src") #t)) + ;; FIXME: the texlive-union insists on regenerating fonts. It stores + ;; them in HOME, so it needs to be writeable. + (add-before 'build 'set-HOME + (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'build (lambda* (#:key system outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -151,7 +155,7 @@ (delete-file-recursively old-doc-dir) #t)))))) (native-inputs - `(("texlive" ,texlive) + `(("texlive" ,(texlive-union (list texlive-tex-texinfo))) ("texinfo" ,texinfo) ("m4" ,m4))) (inputs -- cgit v1.2.3