Depend on guile-gnutls with hashes.

1 files changed, 95 insertions, 1 deletions

diff --git a/vkraus/packages/blog.scm b/vkraus/packages/blog.scm
index da10724..9d2c067 100644
--- a/vkraus/packages/blog.scm
+++ b/vkraus/packages/blog.scm
@@ -7,7 +7,13 @@
   #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages lisp)
+  #:use-module (gnu packages version-control)
   #:use-module (guix gexp)
+  #:use-module (guix git)
   #:use-module (guix modules)
   #:use-module (guix records)
   #:use-module (guix packages)
@@ -15,6 +21,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system ruby)
+  #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (ice-9 match)
   #:use-module (ice-9 optargs))
@@ -39,6 +46,92 @@
     (home-page "https://github.com/jekyll/minima")
     (license license:expat)))
 
+(define gnulib-latest
+  (package
+    (name "gnulib-latest")
+    (version "latest")
+    (source
+     (git-checkout
+      (url "https://git.savannah.gnu.org/git/gnulib.git")))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'configure)
+          (replace 'install
+            (lambda _
+              (install-file "gnulib-tool"
+                            (string-append #$output "/bin"))
+              (copy-recursively "."
+                                (string-append #$output "/share/gnulib-srcdir")))))
+      #:tests? #f)) ;; Tests are syntax and indentation checks for the
+                    ;; maintainer.
+    (inputs ;; Shebangs for some auxiliary build files.
+     (list python perl clisp))
+    (home-page "https://www.gnu.org/software/gnulib/")
+    (synopsis "GNU portability library")
+    (description
+     "Gnulib is a library that provides common functions from the glibc to your
+programs, in order to enhance portability across operating systems. It also
+provides common maintainer tools for gnu packages. This package always tracks
+the latest commit in gnulib. @strong{For packages dependencies, please use the
+@code{gnulib} package instead.} The latter provides a recent enough snapshot.")
+    (native-search-paths
+     (list
+      (search-path-specification
+       (variable "GNULIB_SRCDIR")
+       (files (list "share/gnulib-srcdir")))))
+    (license
+     (list license:lgpl2.0+ license:gpl3+))))
+
+(define gnulib
+  (package
+    (inherit gnulib-latest)
+    (name "gnulib")
+    (version "2022-12-27")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.savannah.gnu.org/git/gnulib.git")
+             (commit "fde75446490e18d2539817ca418ab8adf73b02d3")))
+       (sha256
+        (base32
+         "0fjbdhwi9025wyq39rwc2j6aazfmagx056kkbvxx6bs97i80dcim"))))
+    (synopsis "GNU portability library")
+    (description
+     "Gnulib is a library that provides common functions from the glibc to your
+programs, in order to enhance portability across operating systems. It also
+provides common maintainer tools for gnu packages. This package provides a
+recent snapshot of gnulib.")))
+
+(define guile-gnutls-with-hashes
+  (package
+    (inherit guile-gnutls)
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url (package-home-page guile-gnutls))
+         (commit "fdc6f6504e5b7815f888a40565c14568fb75b789")))
+       (sha256
+        (base32
+         "08a3i1836f1gall33f4g8b4a6mjz8q5z0q2j2cilngls4zmycsmv"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments guile-gnutls)
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'patch-more-shebangs
+              (lambda _
+                (for-each patch-shebang
+                          '("autopull.sh" "autogen.sh"))))))))
+    (native-inputs
+     (modify-inputs (package-native-inputs guile-gnutls)
+       (prepend git)
+       (prepend gnulib)))))
+
 (define-public blog
   (package
    (name "blog")
@@ -83,7 +176,8 @@
                         "-f" "org-babel-tangle")
                 (invoke bash-in "../build"))))))))
    (native-inputs
-    (list emacs bash jekyll emacs-org emacs-htmlize ruby-minima))
+    (list emacs bash jekyll emacs-org emacs-htmlize ruby-minima
+          guile-gnutls-with-hashes))
    (synopsis "La vie trépidante d’un chat au foyer — blog personnel")
    (description "Ceci est mon blog personnel.")
    (home-page "https://vivien.planete-kraus.eu")