From 6839095af7f6c8a8d5ad481db22cd4ece0a1b5e3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 21 Jan 2020 16:44:18 +0100 Subject: gnu: mrustc: Update to 0.8.1. * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/rust.scm (mrustc): Update to 0.8.1. [source](patches): Remove it. [native-inputs]: Add zlib. --- ...ustc-0.8.0-fix-variable-length-integer-receiving.patch | 15 --------------- gnu/packages/rust.scm | 9 ++++----- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch deleted file mode 100644 index 9e76653a07..0000000000 --- a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/thepowersgang/mrustc/issues/109 -From: Danny Milosavljevic -Date: Fri, 3 Jan 2019 13:00:00 +0100 - ---- mrustc/src/expand/proc_macro.cpp.orig 2019-02-01 14:16:54.208486062 +0100 -+++ mrustc/src/expand/proc_macro.cpp 2019-02-01 14:17:14.350925705 +0100 -@@ -977,7 +977,7 @@ - for(;;) - { - auto b = recv_u8(); -- v |= static_cast(b) << ofs; -+ v |= static_cast(b & 0x7F) << ofs; - if( (b & 0x80) == 0 ) - break; - ofs += 7; diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cec565bbc8..70e8d0a814 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -91,7 +91,7 @@ (let ((rustc-version "1.19.0")) (package (name "mrustc") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -100,9 +100,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")) - (patches - (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch")))) + "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc")))) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -111,7 +109,8 @@ `(("bison" ,bison) ("flex" ,flex) ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)))) + ("rustc" ,(package-source rust-1.19)) + ("zlib" ,zlib))) (arguments `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" -- cgit 1.4.1