pyrox.dev
Merge pull request #84883 from vbgl/ocaml-fmt-0.8.6
ocamlPackages.fmt: 0.8.5 → 0.8.6
authored by
Benjamin Hipple
and committed by
GitHub
dde4574c
14507404
+4
-4
pkgs/development/ocaml-modules/cstruct/sexp.nix
+4
-4
pkgs/development/ocaml-modules/cstruct/sexp.nix
···
1
-
{ lib, buildDunePackage, alcotest, cstruct, sexplib }:
1
+
{ lib, buildDunePackage, ocaml, alcotest, cstruct, sexplib }:
2
2
3
3
if !lib.versionAtLeast (cstruct.version or "1") "3"
4
4
then cstruct
5
5
else
6
6
7
-
buildDunePackage {
7
+
buildDunePackage rec {
8
8
pname = "cstruct-sexp";
9
9
inherit (cstruct) version src meta;
10
10
11
-
doCheck = true;
12
-
buildInputs = [ alcotest ];
11
+
doCheck = lib.versionAtLeast ocaml.version "4.03";
12
+
checkInputs = lib.optional doCheck alcotest;
13
13
14
14
propagatedBuildInputs = [ cstruct sexplib ];
15
15
}
+11
-6
pkgs/development/ocaml-modules/fmt/default.nix
+11
-6
pkgs/development/ocaml-modules/fmt/default.nix
···
1
-
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, result, uchar }:
1
+
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:
2
+
3
+
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
4
+
then throw "fmt is not available for OCaml ${ocaml.version}"
5
+
else
2
6
3
-
stdenv.mkDerivation {
4
-
name = "ocaml${ocaml.version}-fmt-0.8.5";
7
+
stdenv.mkDerivation rec {
8
+
version = "0.8.6";
9
+
pname = "ocaml${ocaml.version}-fmt";
5
10
6
11
src = fetchurl {
7
-
url = "https://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz";
8
-
sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060";
12
+
url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
13
+
sha256 = "1jlw5izgvqw1adzqi87rp0383j0vj52wmacy3rqw87vxkf7a3xin";
9
14
};
10
15
11
16
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
12
17
buildInputs = [ findlib topkg cmdliner ];
13
-
propagatedBuildInputs = [ result uchar ];
18
+
propagatedBuildInputs = [ seq stdlib-shims ];
14
19
15
20
inherit (topkg) buildPhase installPhase;
16
21
+5
-4
pkgs/development/ocaml-modules/ppx_blob/default.nix
+5
-4
pkgs/development/ocaml-modules/ppx_blob/default.nix
···
1
-
{ stdenv, fetchurl, buildDunePackage, alcotest, ocaml-migrate-parsetree }:
1
+
{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ocaml-migrate-parsetree }:
2
2
3
3
buildDunePackage rec {
4
4
pname = "ppx_blob";
···
9
9
sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16";
10
10
};
11
11
12
-
buildInputs = [ alcotest ocaml-migrate-parsetree ];
13
-
doCheck = true;
12
+
checkInputs = lib.optional doCheck alcotest;
13
+
buildInputs = [ ocaml-migrate-parsetree ];
14
+
doCheck = lib.versionAtLeast ocaml.version "4.03";
14
15
15
-
meta = with stdenv.lib; {
16
+
meta = with lib; {
16
17
homepage = "https://github.com/johnwhitington/ppx_blob";
17
18
description = "OCaml ppx to include binary data from a file as a string";
18
19
license = licenses.unlicense;