JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocamlPackages.hpack: 0.9.0 → 0.10.0 (#225270)

Browse Source 
* ocamlPackages.hpack: 0.9.0 → 0.10.0

ocamlPackages.paf: 0.4.0 → 0.5.0

ocamlPackages.http-mirage-client: 0.0.2 → 0.0.3

* ocamlPackages.httpaf: use Dune 3
This commit is contained in:
Vincent Laporte 2023-04-09 12:08:42 +02:00 committed by GitHub
parent 11c129c16f
commit f9adb56670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/hpack/default.nix
View File

@ -7,14 +7,15 @@
buildDunePackage rec {
pname = "hpack";
version = "0.9.0";
version = "0.10.0";
src = fetchurl {
url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
sha256 = "sha256-7gjRhJs2mufQbImAXiKFT9mZ1kHGSHHwjCVZM5f0C14=";
hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE=";
};
minimalOCamlVersion = "4.04";
duneVersion = "3";
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [
angstrom

13
pkgs/development/ocaml-modules/http-mirage-client/default.nix
View File

@ -1,6 +1,5 @@
{ lib
, fetchurl
, fetchpatch
, buildDunePackage
, h2
, httpaf
@ -17,24 +16,16 @@
buildDunePackage rec {
pname = "http-mirage-client";
version = "0.0.2";
version = "0.0.3";
duneVersion = "3";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
hash = "sha256-stom13t3Kn1ehkeURem39mxhd3Lmlz8z9m3tHGcp5vY=";
hash = "sha256-6PMxZQfPiDTFbj9gOO2tW5FHF0MUP5tOySjkYg+QwGA=";
};
# Make tests use mirage-crypto
patches = lib.lists.map fetchpatch [
{ url = "https://github.com/roburio/http-mirage-client/commit/c6cd38db9c23ac23e7c3e4cf2d41420f58034e8d.patch";
hash = "sha256-b3rurqF0DxLpVQEhVfROwc7qyul0Fjfl3zhD8AkzemU="; }
{ url = "https://github.com/roburio/http-mirage-client/commit/0a5367e7c6d9b7f45c88493f7a596f7a83e8c7d5.patch";
hash = "sha256-Q6YlfuiAfsyhty9EvoBetvekuU25KjrH5wwGwYTAAiA="; }
];
propagatedBuildInputs = [
h2
httpaf

7
pkgs/development/ocaml-modules/httpaf/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
, angstrom, faraday, alcotest
}:
@ -6,7 +6,8 @@ buildDunePackage rec {
pname = "httpaf";
version = "0.7.1";
useDune2 = true;
duneVersion = "3";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "inhabitedtype";
@ -17,7 +18,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
propagatedBuildInputs = [ angstrom faraday ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
meta = {
description = "A high-performance, memory-efficient, and scalable web server for OCaml";

1
pkgs/development/ocaml-modules/paf/cohttp.nix
View File

@ -22,7 +22,6 @@ buildDunePackage {
inherit (paf)
version
src
patches
;
duneVersion = "3";

13
pkgs/development/ocaml-modules/paf/default.nix
View File

@ -1,7 +1,6 @@
{ buildDunePackage
, lib
, fetchurl
, fetchpatch
, mirage-stack
, mirage-time
, h2
@ -25,21 +24,13 @@
buildDunePackage rec {
pname = "paf";
version = "0.4.0";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
hash = "sha256-ux8fk4XDdih4Ua9NGOJVSuPseJBPv6+6ND/esHrluQE=";
hash = "sha256-oWRvwb8DhtF3ltWaZ6moKmgadFUngruo1UOIaGNV/oM=";
};
patches = [
# Compatibility with mirage-crypto 0.11.0
(fetchpatch {
url = "https://github.com/dinosaure/paf-le-chien/commit/2f308c1c4d3ff49d42136f8ff86a4385661e4d1b.patch";
hash = "sha256-jmSeUpoRoUMPUNEH3Av2LxgRZs+eAectK+CpoH+SdpY=";
})
];
minimalOCamlVersion = "4.08";
duneVersion = "3";

44
pkgs/development/ocaml-modules/paf/le.nix
View File

@ -1,44 +0,0 @@
{ lib
, buildDunePackage
, paf
, dns-client-mirage
, duration
, emile
, httpaf
, letsencrypt
, mirage-stack
, mirage-time
, tls-mirage
, x509
}:
buildDunePackage {
pname = "paf-le";
inherit (paf)
version
src
patches
;
duneVersion = "3";
propagatedBuildInputs = [
paf
dns-client-mirage
duration
emile
httpaf
letsencrypt
mirage-stack
mirage-time
tls-mirage
x509
];
doCheck = true;
meta = paf.meta // {
description = "A CoHTTP client with its HTTP/AF implementation";
};
}

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

@ -1259,8 +1259,6 @@ let
paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { };
paf-le = callPackage ../development/ocaml-modules/paf/le.nix { };
parany = callPackage ../development/ocaml-modules/parany { };
parmap = callPackage ../development/ocaml-modules/parmap { };