Unverified Commit 793a1a8f authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

ocamlPackages.tls: 1.0.1 → 1.0.2 (#351819)

parents c6667b33 ad7da5d0

pkgs/applications/networking/instant-messengers/jackline/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -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

  };

}

pkgs/development/ocaml-modules/kdf/default.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/development/ocaml-modules/tls/default.nix

+4 −5
Original line number Diff line number Diff line 
{ 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

  ];

pkgs/top-level/ocaml-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 { };