nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.tls: 1.0.1 → 1.0.2 (#351819)

Browse Source
This commit is contained in:
Ulrik Strid 2024-10-28 09:14:21 +01:00 committed by GitHub
commit 793a1a8f58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/instant-messengers/jackline/default.nix
View File

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

30
pkgs/development/ocaml-modules/kdf/default.nix Normal file
View File

@ -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 ];
};
}

9
pkgs/development/ocaml-modules/tls/default.nix
View File

@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage { 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 , ipaddr
, alcotest, ounit2 , alcotest, ounit2
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "tls"; pname = "tls";
version = "1.0.1"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; 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"; minimalOCamlVersion = "4.08";
@ -19,12 +19,11 @@ buildDunePackage rec {
domain-name domain-name
fmt fmt
logs logs
hkdf kdf
mirage-crypto mirage-crypto
mirage-crypto-ec mirage-crypto-ec
mirage-crypto-pk mirage-crypto-pk
mirage-crypto-rng mirage-crypto-rng
ptime
x509 x509
ipaddr ipaddr
]; ];

2
pkgs/top-level/ocaml-packages.nix
View File

@ -913,6 +913,8 @@ let
kcas = callPackage ../development/ocaml-modules/kcas { }; kcas = callPackage ../development/ocaml-modules/kcas { };
kdf = callPackage ../development/ocaml-modules/kdf { };
ke = callPackage ../development/ocaml-modules/ke { }; ke = callPackage ../development/ocaml-modules/ke { };
kicadsch = callPackage ../development/ocaml-modules/kicadsch { }; kicadsch = callPackage ../development/ocaml-modules/kicadsch { };