From d7885bbf071e19c6faa2b3fc7c07822682ffc2d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Oct 2019 00:01:01 +0200 Subject: gnu: libmpack: Don't use unstable tarball. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/serialization.scm (libmpack)[source]: Use GIT-FETCH and GIT-FILE-NAME. (lua-libmpack)[arguments]: Adjust ‘unpack-mpack-sources’ phase. --- gnu/packages/serialization.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages/serialization.scm') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 9fefa5a0c1..b2198d2bd0 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; ;;; This file is part of GNU Guix. @@ -141,14 +141,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" @@ -205,10 +206,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 -- cgit v1.2.3 From 9fde2268bcc8c28959e7d7146f6f6d7698f853e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Oct 2019 00:19:34 +0200 Subject: gnu: lua-libmpack: Don't use unstable tarball. * gnu/packages/serialization.scm (lua-libmpack)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/serialization.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages/serialization.scm') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index b2198d2bd0..eb8f6de791 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -170,14 +170,15 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public lua-libmpack (package (inherit libmpack) (name "lua-libmpack") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libmpack/libmpack-lua/" - "archive/" (package-version libmpack) ".tar.gz")) - (file-name (string-append name "-" (package-version libmpack) ".tar.gz")) - (sha256 - (base32 - "153zrrbyxhf71dgzjjhrk56rfwk3nisslpgcqyg44v8fnz1xpk6i")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libmpack/libmpack-lua.git") + (commit (package-version libmpack)))) + (file-name (git-file-name name (package-version libmpack))) + (sha256 + (base32 "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. -- cgit v1.2.3 From 3acd85ac3080f7c82b8ed9fe89f7c8227203fcf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Oct 2019 01:26:47 +0200 Subject: gnu: lua-libmpack: Update to 1.0.8. * gnu/packages/serialization.scm (lua-libmpack): Update to 1.0.8. --- gnu/packages/serialization.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/serialization.scm') diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index eb8f6de791..4f571243f4 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -170,15 +170,16 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public lua-libmpack (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.git") - (commit (package-version libmpack)))) - (file-name (git-file-name name (package-version libmpack))) + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92")))) + (base32 "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. -- cgit v1.2.3