diff options
| author | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
| commit | 5c3cb22c9b2810669999e044b2de5e9331011a83 (patch) | |
| tree | 3276e19cc1a0af3cece6ce4f2bfa930901888bb4 /gnu/packages/patches/racket-minimal-backport-1629887.patch | |
| parent | c896287ce5eff968a0b323f3a069653a64b96b4c (diff) | |
| parent | 2a054d29dcfd4b68ed3914886b637f93ac7a0a72 (diff) | |
| download | guix-patches-5c3cb22c9b2810669999e044b2de5e9331011a83.tar guix-patches-5c3cb22c9b2810669999e044b2de5e9331011a83.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/chez.scm
gnu/packages/docbook.scm
gnu/packages/ebook.scm
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/networking.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/tex.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/dune.scm
guix/build-system/go.scm
guix/build-system/linux-module.scm
guix/packages.scm
Diffstat (limited to 'gnu/packages/patches/racket-minimal-backport-1629887.patch')
| -rw-r--r-- | gnu/packages/patches/racket-minimal-backport-1629887.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/racket-minimal-backport-1629887.patch b/gnu/packages/patches/racket-minimal-backport-1629887.patch new file mode 100644 index 0000000000..aa060ef5aa --- /dev/null +++ b/gnu/packages/patches/racket-minimal-backport-1629887.patch @@ -0,0 +1,28 @@ +From fb1a6ab205fd63a46669a463931af473e2ac0c87 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Sat, 21 Aug 2021 15:29:59 -0600 +Subject: [PATCH] setup/variant: recognize starter executables + +Related to #3969 + +(cherry picked from commit 1629887071fe3cc8fe8af0a7aa0d3912509cb058) +--- + racket/collects/setup/variant.rkt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/racket/collects/setup/variant.rkt b/racket/collects/setup/variant.rkt +index 81da6f5701..b23131e481 100644 +--- a/racket/collects/setup/variant.rkt ++++ b/racket/collects/setup/variant.rkt +@@ -25,7 +25,7 @@ + (and (file-exists? f) + (with-input-from-file f + (lambda () +- (define m (regexp-match #rx#"bINARy tYPe:..(.)" ++ (define m (regexp-match #rx#"bINARy tYPe:e?..(.)" + (current-input-port))) + (cond + [(not m) '3m] +-- +2.30.2 + |