diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
commit | e08902d3cbb307e1523485becbbdaf9aed56ac4a (patch) | |
tree | ca79454c4146f37c0e0f4d354d434816928812ed /gnu/packages/serialization.scm | |
parent | 1714edc3d4e8d6da1b0cdef300ae882d0885f182 (diff) | |
parent | f58702465d0b2daab1775d29439b73b4486a108a (diff) | |
download | guix-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar.gz guix-e08902d3cbb307e1523485becbbdaf9aed56ac4a.zip |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/serialization.scm')
-rw-r--r-- | gnu/packages/serialization.scm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index b01886c775..ea016bc6c2 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com> ;;; Copyright © 2017 ng0 <ng0@n0.is> -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; ;;; This file is part of GNU Guix. @@ -138,14 +138,15 @@ serialization.") (package (name "libmpack") (version "1.0.5") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/tarruda/libmpack/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0ml922gv8y99lbldqb9ykpjndla0hlprdjyl79yskkhwv2ai7sac")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tarruda/libmpack.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -167,15 +168,15 @@ that implements both the msgpack and msgpack-rpc specifications.") (package (inherit libmpack) (name "lua-libmpack") (version "1.0.8") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libmpack/libmpack-lua") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libmpack/libmpack-lua.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. @@ -204,10 +205,9 @@ that implements both the msgpack and msgpack-rpc specifications.") ;; prerequisites are added to the inputs of the gcc invocation. (substitute* "Makefile" (("\\$\\(MPACK\\): mpack-src") "$(MPACK): ")) - (mkdir-p "mpack-src") - (zero? (system* "tar" "-C" "mpack-src" - "--strip-components=1" - "-xvf" (assoc-ref inputs "libmpack")))))))) + (copy-recursively (assoc-ref inputs "libmpack") + "mpack-src") + #t))))) (inputs `(("lua" ,lua))) (native-inputs |