summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-02-17 23:05:20 +0100
committerLudovic Courtès <ludo@gnu.org>2020-02-17 23:06:46 +0100
commitac83dc82ea9f458a4040d4449de993d373fa0fdf (patch)
tree4b1f7dd6966d4bd174d6eead04c1141fa2c1627e
parenteb07edabaf11e39b25f5cf40967afd3dadcb14eb (diff)
downloadguix-ac83dc82ea9f458a4040d4449de993d373fa0fdf.tar.gz
gnu: gnutls: Add dependency on datefudge.
* gnu/packages/time.scm (datefudge)[source]: Use 'url-fetch' instead of
'git-fetch'.
* gnu/packages/tls.scm (gnutls)[native-inputs]: Add DATEFUDGE.
-rw-r--r--gnu/packages/time.scm18
-rw-r--r--gnu/packages/tls.scm5
2 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index b9ce791827..d4c0f7efc6 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2013, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2017, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name>
@@ -36,7 +36,6 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
@@ -423,14 +422,17 @@ datetime type.")
     (name "datefudge")
     (version "1.23")
     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://salsa.debian.org/debian/datefudge.git")
-                    (commit (string-append "debian/" version))))
-              (file-name (git-file-name name version))
+              ;; Source code is available from
+              ;; <https://salsa.debian.org/debian/datefudge.git>.  However,
+              ;; for bootstrapping reasons, we do not rely on 'git-fetch' here
+              ;; (since Git -> GnuTLS -> datefudge).
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://debian/pool/main/d/datefudge/datefudge_"
+                    version ".tar.xz"))
               (sha256
                (base32
-                "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv"))
+                "0ifnlb0mc8qc2kb5042pbz0ns6rwcb7201di8wyrsphl0yhnhxiv"))
               (patches (search-patches "datefudge-gettimeofday.patch"))))
     (build-system gnu-build-system)
     (arguments
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f1d3f94458..d8a767f73f 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
@@ -225,7 +225,8 @@ living in the same process.")
     (native-inputs
      `(("net-tools" ,net-tools)
        ("pkg-config" ,pkg-config)
-       ("which" ,which)))
+       ("which" ,which)
+       ("datefudge" ,datefudge)))                 ;tests rely on 'datefudge'
     (inputs
      `(("guile" ,guile-2.2)))
     (propagated-inputs