From e8e62357978f564ee96cc1a59cedaf47d2424f3a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 Oct 2024 07:16:35 +0100
Subject: [PATCH 1/3] ocamlPackages.kdf: init at 1.0.0

---
 .../development/ocaml-modules/kdf/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/kdf/default.nix

diff --git a/pkgs/development/ocaml-modules/kdf/default.nix b/pkgs/development/ocaml-modules/kdf/default.nix
new file mode 100644
index 000000000000..8bd7f3bf306f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/kdf/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildDunePackage
+, fetchurl
+, digestif
+, mirage-crypto
+, alcotest
+, ohex
+}:
+
+buildDunePackage rec {
+  pname = "kdf";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/robur-coop/kdf/releases/download/v${version}/kdf-${version}.tbz";
+    hash = "sha256-0WFYKw7+ZtlY3WuMnCEGjp9kVM4hg3fWz4eCPexi4M4=";
+  };
+
+  propagatedBuildInputs = [ digestif mirage-crypto ];
+
+  checkInputs = [ alcotest ohex ];
+  doCheck = true;
+
+  meta = {
+    description = "Key Derivation Functions: HKDF RFC 5869, PBKDF RFC 2898, SCRYPT RFC 7914";
+    homepage = "https://github.com/robur-coop/kdf";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ef556b0f52e3..2f0ce2558934 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -913,6 +913,8 @@ let
 
     kcas = callPackage ../development/ocaml-modules/kcas { };
 
+    kdf = callPackage ../development/ocaml-modules/kdf { };
+
     ke = callPackage ../development/ocaml-modules/ke { };
 
     kicadsch = callPackage ../development/ocaml-modules/kicadsch { };

From 28f03c1e830fa2a8a9e3a6630f185e5b8dfa05a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 Oct 2024 07:16:41 +0100
Subject: [PATCH 2/3] =?UTF-8?q?ocamlPackages.tls:=201.0.1=20=E2=86=92=201.?=
 =?UTF-8?q?0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/tls/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 9fc0656be162..7953e817e245 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -1,16 +1,16 @@
 { lib, fetchurl, buildDunePackage
-, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ptime, x509
+, domain-name, fmt, logs, kdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, x509
 , ipaddr
 , alcotest, ounit2
 }:
 
 buildDunePackage rec {
   pname = "tls";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz";
-    hash = "sha256-2uS1/8gD6ILphIBCWP+KrKe4N9hVbeaEABldpccKjYM=";
+    hash = "sha256-ohdRIAyzFG/+FUf11t4Ye1FH6O5r7RKwnVLAAtQrP+s=";
   };
 
   minimalOCamlVersion = "4.08";
@@ -19,12 +19,11 @@ buildDunePackage rec {
     domain-name
     fmt
     logs
-    hkdf
+    kdf
     mirage-crypto
     mirage-crypto-ec
     mirage-crypto-pk
     mirage-crypto-rng
-    ptime
     x509
     ipaddr
   ];

From ad7da5d0408cd5b9b211057935114d322826722c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 Oct 2024 07:16:46 +0100
Subject: [PATCH 3/3] =?UTF-8?q?jackline:=202024-02-28=20=E2=86=92=202024-1?=
 =?UTF-8?q?0-21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/instant-messengers/jackline/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index c015c9ac06f6..fd830858ea7b 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -4,15 +4,15 @@ with ocamlPackages;
 
 buildDunePackage rec {
   pname = "jackline";
-  version = "unstable-2024-02-28";
+  version = "unstable-2024-10-21";
 
-  minimalOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.13";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev  = "31b90275a5f848cfc8c4f5b75e7d1933bec37852";
-    hash = "sha256-G2jjsc/i9Qgo0TP+ZE4gB/1cjuZ9l8R7e59K2DGD5GY=";
+    rev  = "cf6b26e37e37b0b48be9fd2e74fc563375f757f0";
+    hash = "sha256-6QZZ77C1G3x/GOJsUEQMrCatVsyyxNjq36ez/TgeHSY=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,6 @@ buildDunePackage rec {
     uuseg
     uutf
     dns-client
-    cstruct
     base64
     happy-eyeballs-lwt
     ppx_sexp_conv
@@ -51,6 +50,5 @@ buildDunePackage rec {
     mainProgram = "jackline";
     license = licenses.bsd2;
     maintainers = with maintainers; [ sternenseemann ];
-    broken = true; # Not compatible with mirage-crypto ≥ 1.0
   };
 }