From b51612ef4cf8acc6b816688cf6ea0b263cd9ed90 Mon Sep 17 00:00:00 2001
From: Thomas Letan <lthms@soap.coffee>
Date: Fri, 20 Aug 2021 11:28:48 +0200
Subject: Update various dependencies used by this website

---
 .gitignore                      |  1 -
 site/cleopatra/dependencies.org | 20 +++++++++++++-------
 site/cleopatra/soupault.org     | 19 ++++---------------
 site/cleopatra/theme.org        |  2 +-
 site/posts/CoqffiIntro.org      | 10 +++++-----
 5 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 847359c..bcc4632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *~
-_opam
 
 # begin generated files
 .cleopatra
diff --git a/site/cleopatra/dependencies.org b/site/cleopatra/dependencies.org
index 5a79741..6cce498 100644
--- a/site/cleopatra/dependencies.org
+++ b/site/cleopatra/dependencies.org
@@ -9,22 +9,22 @@
   #+name: coq-deps
   | Package      | Version |
   |--------------+---------|
-  | coq          |  8.13.1 |
+  | coq          |  8.13.2 |
   | coq-compcert |     3.8 |
 
   #+caption: Dependencies for the ~coqffi~ series
   #+name: lp-deps
   | Package       |     Version |
   |---------------+-------------|
-  | dune          |       2.8.4 |
-  | coq-coqffi    | 1.0.0~beta5 |
+  | dune          |       2.9.0 |
+  | coq-coqffi    | 1.0.0~beta7 |
   | coq-simple-io |       1.5.0 |
 
   #+caption: Soupault
   #+name: soupault-deps
   | Package  | Version |
   |----------+---------|
-  | soupault |   2.5.0 |
+  | soupault |   3.1.0 |
 
   #+name: deps-listing
   #+begin_src emacs-lisp :noweb yes :var coq-deps=coq-deps :var lp-deps=lp-deps :var soupault-deps=soupault-deps :results value raw :exports none
@@ -41,7 +41,7 @@
   #+end_src
 
   #+begin_src makefile :tangle dependencies.mk :noweb yes
-OCAML_VERSION := 4.11.2
+OCAML_VERSION := 4.12.0
 OCAML := ocaml-base-compiler.${OCAML_VERSION}
 
 _opam/init :
@@ -60,8 +60,8 @@ CONFIGURE += _opam
   #+name: frontend-deps
   | Package       | Version |
   |---------------+---------|
-  | katex         |  0.13.0 |
-  | minify        |   7.0.1 |
+  | katex         | 0.13.13 |
+  | minify        |   7.0.2 |
   | normalize.css |   8.0.1 |
 
   #+name: frontend-listing
@@ -86,4 +86,10 @@ CONFIGURE += _opam
 package-lock.json : package.json
 	@cleopatra echo "Installing" "frontend dependencies"
 	@npm install
+
+CONFIGURE += package-lock.json
+  #+end_src
+
+  #+begin_src makefile :tangle dependencies.mk :noweb yes
+dependencies-prebuild : _opam/init package-lock.json
   #+end_src
diff --git a/site/cleopatra/soupault.org b/site/cleopatra/soupault.org
index 3cbb7a0..13c90b8 100644
--- a/site/cleopatra/soupault.org
+++ b/site/cleopatra/soupault.org
@@ -19,9 +19,6 @@ generation. You should definitely [[https://soupault.app][check out their websit
   created during a previous invocation of *~cleopatra~*.
 
   #+begin_src makefile :tangle soupault.mk
-OCAML_VERSION := 4.11.2
-OCAML := ocaml-base-compiler.${OCAML_VERSION}
-
 CONFIGURE += _opam rss.json
 ARTIFACTS += out
 
@@ -32,7 +29,7 @@ soupault-prebuild : _opam/init
   command-line arguments.
 
   #+begin_src makefile :tangle soupault.mk
-soupault-build : package-lock.json style.min.css
+soupault-build : dependencies-prebuild style.min.css
 	@cleopatra echo "Executing" "soupault"
 	@soupault
   #+end_src
@@ -579,17 +576,9 @@ dump_json = "rss.json"
 extract_after_widgets = ["urls-rewriting"]
 
 [index.fields]
-title = {
-  selector = ["h1"]
-}
-
-modified-at = {
-  selector = ["#modified-at"]
-}
-
-created-at = {
-  selector = ["#created-at"]
-}
+title = { selector = ["h1"] }
+modified-at = { selector = ["#modified-at"] }
+created-at = { selector = ["#created-at"] }
    #+end_src
 
 ** Series Navigation
diff --git a/site/cleopatra/theme.org b/site/cleopatra/theme.org
index 9041be8..71d144b 100644
--- a/site/cleopatra/theme.org
+++ b/site/cleopatra/theme.org
@@ -424,7 +424,7 @@ $(cat ${style})
    #+end_src
 
    #+begin_src makefile :tangle theme.mk
-style.min.css : style.css
+style.min.css : style.css dependencies-prebuild
 	@cleopatra echo "Minifying" "CSS"
 	@scripts/css.sh
 
diff --git a/site/posts/CoqffiIntro.org b/site/posts/CoqffiIntro.org
index 411f3cf..e85f4b4 100644
--- a/site/posts/CoqffiIntro.org
+++ b/site/posts/CoqffiIntro.org
@@ -20,11 +20,11 @@ generates. They are of no concern for users of ~coqffi~.
 
 ** Requirements
 
-The latest version of ~coqffi~ (~1.0.0~beta4~ at the time of writing)
-is compatible with OCaml ~4.08~ up to ~4.11~, and Coq ~8.12~.  If you
-want to use ~coqffi~, but have incompatible requirements of your own,
-feel free to [[https://github.com/coq-community/coqffi/issues][submit
-an issue]].
+The latest version of ~coqffi~ (~1.0.0~beta7~ at the time of writing)
+is compatible with OCaml ~4.08~ up to ~4.12~, and Coq ~8.12~ up top
+~8.13~.  If you want to use ~coqffi~, but have incompatible
+requirements of your own, feel free to
+[[https://github.com/coq-community/coqffi/issues][submit an issue]].
 
 ** Installing ~coqffi~
 
-- 
cgit v1.2.3