alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #223540 from vbgl/ocaml-cstruct-6.2.0

Browse source 
ocamlPackages.cstruct: 6.1.1 → 6.2.0
This commit is contained in:
Ulrik Strid 2023-03-28 14:00:01 +02:00 committed by GitHub
parent 84dbdd4a16 cb68c76b8e
commit 03d63fa0ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/ocaml-modules/asn1-combinators/default.nix
View file

@ -4,6 +4,7 @@
buildDunePackage rec { buildDunePackage rec {
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
pname = "asn1-combinators"; pname = "asn1-combinators";
version = "0.2.6"; version = "0.2.6";

11
pkgs/development/ocaml-modules/callipyge/default.nix
View file

@ -1,8 +1,6 @@
{ lib { lib
, buildDunePackage , buildDunePackage
, fetchurl , fetchurl
, ocaml
, alcotest , alcotest
, eqaf , eqaf
, fmt , fmt
@ -14,17 +12,16 @@ buildDunePackage rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz"; url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; hash = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0=";
}; };
useDune2 = true; duneVersion = "3";
minimumOCamlVersion = "4.03"; minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ fmt eqaf ]; propagatedBuildInputs = [ fmt eqaf ];
# alcotest isn't available for OCaml < 4.08 due to fmt doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ]; checkInputs = [ alcotest ];
meta = { meta = {

2
pkgs/development/ocaml-modules/cstruct/async.nix
View file

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "cstruct-async"; pname = "cstruct-async";
inherit (cstruct) src version meta; inherit (cstruct) src version meta;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
async_unix async_unix
async async

5
pkgs/development/ocaml-modules/cstruct/default.nix
View file

@ -2,13 +2,14 @@
buildDunePackage rec { buildDunePackage rec {
pname = "cstruct"; pname = "cstruct";
version = "6.1.1"; version = "6.2.0";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";
sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0="; hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI=";
}; };
buildInputs = [ fmt ]; buildInputs = [ fmt ];

1
pkgs/development/ocaml-modules/cstruct/lwt.nix
View file

@ -9,6 +9,7 @@ else
inherit (cstruct) version src meta; inherit (cstruct) version src meta;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
propagatedBuildInputs = [ cstruct lwt ]; propagatedBuildInputs = [ cstruct lwt ];
} }

1
pkgs/development/ocaml-modules/cstruct/ppx.nix
View file

@ -11,6 +11,7 @@ else
inherit (cstruct) version src meta; inherit (cstruct) version src meta;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];

1
pkgs/development/ocaml-modules/cstruct/sexp.nix
View file

@ -9,6 +9,7 @@ buildDunePackage rec {
inherit (cstruct) version src meta; inherit (cstruct) version src meta;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
doCheck = true; doCheck = true;
checkInputs = [ alcotest ]; checkInputs = [ alcotest ];

1
pkgs/development/ocaml-modules/cstruct/unix.nix
View file

@ -9,6 +9,7 @@ else
inherit (cstruct) version src meta; inherit (cstruct) version src meta;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
} }

6
pkgs/development/ocaml-modules/dbf/default.nix
View file

@ -7,13 +7,13 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
useDune2 = true; duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pveber"; owner = "pveber";
repo = "dbf"; repo = "dbf";
rev = "${version}"; rev = version;
sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; hash = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g=";
}; };
buildInputs = [ ppx_cstruct ]; buildInputs = [ ppx_cstruct ];

3
pkgs/development/ocaml-modules/eqaf/default.nix
View file

@ -2,12 +2,13 @@
buildDunePackage rec { buildDunePackage rec {
minimalOCamlVersion = "4.07"; minimalOCamlVersion = "4.07";
duneVersion = "3";
pname = "eqaf"; pname = "eqaf";
version = "0.9"; version = "0.9";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz";
sha256 = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; hash = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A=";
}; };
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];

3
pkgs/development/ocaml-modules/io-page/default.nix
View file

@ -5,10 +5,11 @@ buildDunePackage rec {
version = "3.0.0"; version = "3.0.0";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; hash = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

3
pkgs/development/ocaml-modules/mirage-channel/default.nix
View file

@ -8,10 +8,11 @@ buildDunePackage rec {
version = "4.1.0"; version = "4.1.0";
minimalOCamlVersion = "4.07"; minimalOCamlVersion = "4.07";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-${version}.tbz"; url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-${version}.tbz";
sha256 = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; hash = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA=";
}; };
propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; propagatedBuildInputs = [ cstruct logs lwt mirage-flow ];

3
pkgs/development/ocaml-modules/mirage-console/default.nix
View file

@ -7,10 +7,11 @@ buildDunePackage rec {
version = "5.1.0"; version = "5.1.0";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz"; url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz";
sha256 = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; hash = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM=";
}; };
propagatedBuildInputs = [ lwt mirage-flow ]; propagatedBuildInputs = [ lwt mirage-flow ];

2
pkgs/development/ocaml-modules/mirage-console/unix.nix
View file

@ -5,6 +5,8 @@ buildDunePackage {
inherit (mirage-console) version src; inherit (mirage-console) version src;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
mirage-console mirage-console
cstruct cstruct

8
pkgs/development/ocaml-modules/mirage-flow/combinators.nix
View file

@ -1,11 +1,13 @@
{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: { buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }:
buildDunePackage { buildDunePackage {
pname = "mirage-flow-combinators"; pname = "mirage-flow-combinators";
inherit (mirage-flow) version useDune2 src; inherit (mirage-flow) version src;
propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; duneVersion = "3";
propagatedBuildInputs = [ lwt logs cstruct mirage-clock mirage-flow ];
meta = mirage-flow.meta // { meta = mirage-flow.meta // {
description = "Flow implementations and combinators for MirageOS specialized to lwt"; description = "Flow implementations and combinators for MirageOS specialized to lwt";

10
pkgs/development/ocaml-modules/mirage-flow/default.nix
View file

@ -1,18 +1,18 @@
{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: { lib, buildDunePackage, fetchurl, cstruct, fmt, lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "mirage-flow"; pname = "mirage-flow";
version = "3.0.0"; version = "3.0.0";
useDune2 = true; duneVersion = "3";
minimumOCamlVersion = "4.05"; minimalOCamlVersion = "4.05";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz";
sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw=";
}; };
propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; propagatedBuildInputs = [ cstruct fmt lwt ];
meta = { meta = {
description = "Flow implementations and combinators for MirageOS"; description = "Flow implementations and combinators for MirageOS";

4
pkgs/development/ocaml-modules/mirage-flow/unix.nix
View file

@ -5,7 +5,9 @@
buildDunePackage { buildDunePackage {
pname = "mirage-flow-unix"; pname = "mirage-flow-unix";
inherit (mirage-flow) version useDune2 src; inherit (mirage-flow) version src;
duneVersion = "3";
# Make tests compatible with alcotest 1.4.0 # Make tests compatible with alcotest 1.4.0
postPatch = '' postPatch = ''

5
pkgs/development/ocaml-modules/mirage-random-test/default.nix
View file

@ -6,10 +6,9 @@ buildDunePackage rec {
pname = "mirage-random-test"; pname = "mirage-random-test";
version = "0.1.0"; version = "0.1.0";
minimumOCamlVersion = "4.06"; minimalOCamlVersion = "4.06";
# due to cstruct duneVersion = "3";
useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";

2
pkgs/development/ocaml-modules/mirage-random/default.nix
View file

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "mirage-random"; pname = "mirage-random";
version = "3.0.0"; version = "3.0.0";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz";
sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8="; sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8=";

2
pkgs/development/ocaml-modules/randomconv/default.nix
View file

@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "randomconv"; pname = "randomconv";
version = "0.1.3"; version = "0.1.3";
useDune2 = true; duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz";

3
pkgs/development/ocaml-modules/vchan/default.nix
View file

@ -9,10 +9,11 @@ buildDunePackage rec {
version = "6.0.1"; version = "6.0.1";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz";
sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; hash = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

1
pkgs/development/ocaml-modules/wayland/default.nix
View file

@ -15,6 +15,7 @@ buildDunePackage rec {
version = "1.1"; version = "1.1";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz";

2
pkgs/development/ocaml-modules/xenstore-tool/default.nix
View file

@ -5,6 +5,8 @@ buildDunePackage {
inherit (xenstore_transport) src version; inherit (xenstore_transport) src version;
duneVersion = "3";
buildInputs = [ xenstore_transport xenstore lwt ]; buildInputs = [ xenstore_transport xenstore lwt ];
meta = xenstore_transport.meta // { meta = xenstore_transport.meta // {

1
pkgs/development/ocaml-modules/xenstore/default.nix
View file

@ -7,6 +7,7 @@ buildDunePackage rec {
version = "2.2.0"; version = "2.2.0";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz";

1
pkgs/development/ocaml-modules/xenstore_transport/default.nix
View file

@ -5,6 +5,7 @@ buildDunePackage rec {
version = "1.3.0"; version = "1.3.0";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xapi-project"; owner = "xapi-project";

2
pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
View file

@ -22,8 +22,8 @@ ocamlPackages.buildDunePackage rec {
''; '';
minimalOCamlVersion = "4.12"; minimalOCamlVersion = "4.12";
duneVersion = "3";
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];