guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/17: gnu: libmpack: Don't use unstable tarball.


From: guix-commits
Subject: 01/17: gnu: libmpack: Don't use unstable tarball.
Date: Sat, 5 Oct 2019 23:36:12 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit d7885bbf071e19c6faa2b3fc7c07822682ffc2d9
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Oct 6 00:01:01 2019 +0200

    gnu: libmpack: Don't use unstable tarball.
    
    * 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(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 9fefa5a..b2198d2 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2017 Gregor Giesen <address@hidden>
 ;;; Copyright © 2017 Frederick M. Muriithi <address@hidden>
 ;;; Copyright © 2017 ng0 <address@hidden>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]