From 806808d0d28af8092d6887af230525c372de9208 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Mon, 1 Nov 2021 10:36:47 -0700
Subject: [PATCH] Fix letsencrypt ca

---
 pkgs/backplane-dns-server.nix  | 12 ++++++++++--
 pkgs/cl-gemini.nix             |  3 +--
 pkgs/letsencrypt-ca.nix        |  8 ++++----
 pkgs/lisp/backplane-dns.nix    | 18 +++++++++---------
 pkgs/lisp/backplane-server.nix | 14 +++++++++++---
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/pkgs/backplane-dns-server.nix b/pkgs/backplane-dns-server.nix
index a040d5f..d946eb4 100644
--- a/pkgs/backplane-dns-server.nix
+++ b/pkgs/backplane-dns-server.nix
@@ -2,6 +2,8 @@
 
 with pkgs.lib;
 let
+  version = "20211031";
+
   launcher = pkgs.writeText "launch-backplane-dns.lisp" ''
     (require :asdf)
     (asdf:load-system :backplane-dns)
@@ -13,13 +15,19 @@ let
     ${pkgs.lispPackages.clwrapper}/bin/common-lisp.sh --load ${launcher}
   '';
 
+  sbcl-with-ssl = pkgs.sbcl.overrideAttrs (oldAttrs: rec {
+    buildInputs = oldAttrs.buildInputs ++ [
+      pkgs.openssl_1_1.dev
+    ];
+  });
+
 in pkgs.stdenv.mkDerivation {
   pname = "backplane-dns-server";
-  version = "0.1.0";
+  version = version;
 
   propagatedBuildInputs = with pkgs; [
     asdf
-    sbcl
+    sbcl-with-ssl
     lispPackages.clwrapper
     localLispPackages.backplane-dns
   ];
diff --git a/pkgs/cl-gemini.nix b/pkgs/cl-gemini.nix
index 560397a..330d338 100644
--- a/pkgs/cl-gemini.nix
+++ b/pkgs/cl-gemini.nix
@@ -2,8 +2,7 @@
 
 with pkgs.lib;
 let
-  url = "https://git.informis.land/informis/cl-gemini.git";
-  version = "0.1";
+  version = "20211031";
 
   server-launcher = pkgs.writeText "launch-cl-gemini.lisp" ''
     (defun getenv-or-fail (env-var &optional default)
diff --git a/pkgs/letsencrypt-ca.nix b/pkgs/letsencrypt-ca.nix
index c0957e5..0ad55b9 100644
--- a/pkgs/letsencrypt-ca.nix
+++ b/pkgs/letsencrypt-ca.nix
@@ -6,7 +6,7 @@ let
 
 in stdenv.mkDerivation {
 
-  name = "letsencrypt-ca";
+  name = "letsencrypt-ca-pem";
 
   src = fetchurl {
     name = "isrgrootx1.pem.txt";
@@ -17,12 +17,12 @@ in stdenv.mkDerivation {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    mkdir -pv $out/etc/ssl/letsencrypt
-    cp -v $src $out/etc/ssl/letsencrypt/ca.pem
+    mkdir -pv $out
+    cp -v $src $out/ca.pem
   '';
 
   meta = {
-    homepage = https://letsencrypt.com;
+    homepage = https://letsencrypt.com/certificates;
     description = "Certificate Authority (CA) certificate for LetsEncrypt";
   };
 }
diff --git a/pkgs/lisp/backplane-dns.nix b/pkgs/lisp/backplane-dns.nix
index b2e7d5f..3776775 100644
--- a/pkgs/lisp/backplane-dns.nix
+++ b/pkgs/lisp/backplane-dns.nix
@@ -1,4 +1,4 @@
-{ pkgs, backplane-server, arrows, ip-utils, ... }:
+{ pkgs, localLispPackages, ... }:
 
 pkgs.lispPackages.buildLispPackage {
   baseName = "backplane-dns";
@@ -7,7 +7,14 @@ pkgs.lispPackages.buildLispPackage {
 
   buildSystems = [ "backplane-dns" ];
 
-  deps = with pkgs.lispPackages; [
+  src = pkgs.fetchgit {
+    url = "https://git.fudo.org/fudo-public/backplane-dns.git";
+    rev = "3075453a8ccc8bf285bfc83d84317044590ae060";
+    sha256 = "1sdgr9zxqam4c8f7nlkgm77si45j0qvvgj6rav9kd6jz6vqgcbi5";
+    fetchSubmodules = false;
+  };
+
+  deps = with localLispPackages; [
     arrows
     alexandria
     backplane-server
@@ -18,12 +25,5 @@ pkgs.lispPackages.buildLispPackage {
     trivia
   ];
 
-  src = pkgs.fetchgit {
-    url = "https://git.fudo.org/fudo-public/backplane-dns.git";
-    rev = "3075453a8ccc8bf285bfc83d84317044590ae060";
-    sha256 = "1sdgr9zxqam4c8f7nlkgm77si45j0qvvgj6rav9kd6jz6vqgcbi5";
-    fetchSubmodules = false;
-  };
-
   asdFilesToKeep = [ "backplane-dns.asd" ];
 }
diff --git a/pkgs/lisp/backplane-server.nix b/pkgs/lisp/backplane-server.nix
index 096ea7e..24125cc 100644
--- a/pkgs/lisp/backplane-server.nix
+++ b/pkgs/lisp/backplane-server.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, arrows, cl-xmpp, ... }:
+{ pkgs, lib, localLispPackages, ... }:
 
 pkgs.lispPackages.buildLispPackage {
   baseName = "backplane-server";
@@ -7,8 +7,6 @@ pkgs.lispPackages.buildLispPackage {
 
   buildSystems = [ "backplane-server" ];
 
-  deps = with pkgs.lispPackages; [ alexandria arrows cl-json cl-xmpp prove ];
-
   src = pkgs.fetchgit {
     url = "https://git.fudo.org/fudo-public/backplane-server.git";
     rev = "5b50dd8badf5b5460e9cc7e76e191d274712a3bd";
@@ -16,5 +14,15 @@ pkgs.lispPackages.buildLispPackage {
     fetchSubmodules = false;
   };
 
+  deps = with localLispPackages; [
+    alexandria
+    arrows
+    asdf-package-system
+    asdf-system-connections
+    cl-json
+    cl-xmpp
+    prove
+  ];
+
   asdFilesToKeep = [ "backplane-server.asd" ];
 }