From d5640c587f141ff60127848dc95528ca1a4f1b14 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 28 Mar 2019 09:33:34 +0100
Subject: gnu: googletest: Don't use unstable tarball.

* gnu/packages/check.scm (googletest)[source]: Download using git-fetch.
* gnu/packages/crypto.scm (encfs)[arguments]: Adjust accordingly.
* gnu/packages/gnucash.scm (gnucash)[arguments]: Same.
* gnu/packages/terminals.scm (eternalterminal)[arguments]: Same.
* gnu/packages/graphics.scm (ogre)[arguments]: Same. Remove now
unnecessary custom 'pre-build phase.
---
 gnu/packages/crypto.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crypto.scm')

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 038db8f488..2f7ea3ba8b 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -208,9 +208,9 @@ OpenBSD tool of the same name.")
          (add-after 'unpack 'unpack-googletest
            (lambda* (#:key inputs #:allow-other-keys)
              (mkdir-p "vendor/github.com/google/googletest")
-             (invoke "tar" "xvf" (assoc-ref inputs "googletest-source")
-                     "-C" "vendor/github.com/google/googletest"
-                     "--strip-components=1")))
+             (copy-recursively (assoc-ref inputs "googletest-source")
+                               "vendor/github.com/google/googletest")
+             #t))
          (add-before 'check 'make-unittests
            (lambda _
              (invoke "make" "unittests"))))))
-- 
cgit v1.2.3


From a5006ede7fe55f51e796e881d6b20d4922d49b17 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 1 May 2019 17:55:37 +0200
Subject: gnu: signify: Don't use unstable tarball.

* gnu/packages/crypto.scm (signify)[source]: Change to GIT-FETCH.
---
 gnu/packages/crypto.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crypto.scm')

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 2f7ea3ba8b..26d35a9e39 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -132,14 +132,15 @@ communication, encryption, decryption, signatures, etc.")
   (package
     (name "signify")
     (version "24")
+    (home-page "https://github.com/aperezdc/signify")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/aperezdc/signify/"
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference (url home-page)
+                                  (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0594vyvkq176xxzaz9xbq8qs0xdnr8s9gkd1prblwpdvnzmw0xvc"))))
+                "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w"))))
     (build-system gnu-build-system)
     ;; TODO Build with libwaive (described in README.md), to implement something
     ;; like OpenBSD's pledge().
@@ -159,7 +160,6 @@ communication, encryption, decryption, signatures, etc.")
     (description "The signify utility creates and verifies cryptographic
 signatures using the elliptic curve Ed25519.  This is a Linux port of the
 OpenBSD tool of the same name.")
-    (home-page "https://github.com/aperezdc/signify")
     ;; This package includes third-party code that was originally released under
     ;; various non-copyleft licenses. See the source files for clarification.
     (license (list license:bsd-3 license:bsd-4 license:expat license:isc
-- 
cgit v1.2.3


From 15ada26abb2424d05d50a3b2f7d50f8eaba263b7 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 1 May 2019 17:56:50 +0200
Subject: gnu: signify: Update to 25.

* gnu/packages/crypto.scm (signify): Update to 25.
---
 gnu/packages/crypto.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crypto.scm')

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 26d35a9e39..9302f00537 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -131,7 +131,7 @@ communication, encryption, decryption, signatures, etc.")
 (define-public signify
   (package
     (name "signify")
-    (version "24")
+    (version "25")
     (home-page "https://github.com/aperezdc/signify")
     (source (origin
               (method git-fetch)
@@ -140,7 +140,7 @@ communication, encryption, decryption, signatures, etc.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0grdlrpxcflzmzzc30r8rvsmamvbsgqyni59flzzk4w5hpjh464w"))))
+                "0zg0rffxwj2a71s1bllhrn491xsmirg9sshpq8f3vl25lv4c2cnq"))))
     (build-system gnu-build-system)
     ;; TODO Build with libwaive (described in README.md), to implement something
     ;; like OpenBSD's pledge().
-- 
cgit v1.2.3