diff options
| author | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-01-11 14:22:50 -0800 |
| commit | 4adb40bffc0dda8871878283887a0e0cd88d9578 (patch) | |
| tree | 74d5fb686116002da72de4a1075d0ed8f307cec1 /gnu/packages/patches/guile-bytestructures-name-clash.patch | |
| parent | 4610ab7c9a5327df0d475262817bc081a5891aa8 (diff) | |
| parent | 138c08899ba73049de8afd2b74a8cf6845a1d9e1 (diff) | |
| download | guix-4adb40bffc0dda8871878283887a0e0cd88d9578.tar guix-4adb40bffc0dda8871878283887a0e0cd88d9578.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/guile-bytestructures-name-clash.patch')
| -rw-r--r-- | gnu/packages/patches/guile-bytestructures-name-clash.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gnu/packages/patches/guile-bytestructures-name-clash.patch b/gnu/packages/patches/guile-bytestructures-name-clash.patch deleted file mode 100644 index ac834dd504..0000000000 --- a/gnu/packages/patches/guile-bytestructures-name-clash.patch +++ /dev/null @@ -1,31 +0,0 @@ -This patch works around a name clash between the 'cstring-pointer' module and -the 'cstring-module' variable that occurs in Guile 2.0: - - ice-9/boot-9.scm:109:20: re-exporting local variable: cstring-pointer - ---- guile-bytestructures-20170402.91d042e-checkout/bytestructures/guile.scm 2017-07-25 17:04:32.858289986 +0200 -+++ guile-bytestructures-20170402.91d042e-checkout/bytestructures/guile.scm 2017-07-25 17:04:41.130244725 +0200 -@@ -1,6 +1,6 @@ - (define-module (bytestructures guile)) - --(import -+(use-modules - (bytestructures guile base) - (bytestructures guile vector) - (bytestructures guile struct) -@@ -8,7 +8,7 @@ - (bytestructures guile pointer) - (bytestructures guile numeric) - (bytestructures guile string) -- (bytestructures guile cstring-pointer)) -+ ((bytestructures guile cstring-pointer) #:prefix cstr:)) - (re-export - make-bytestructure-descriptor - bytestructure-descriptor? -@@ -75,5 +75,5 @@ - - bs:string - -- cstring-pointer -+ cstr:cstring-pointer - ) |