diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 96ef1037cf6..c7b9d930bd6 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,26 +1,25 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, result }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: let pname = "otfm"; - version = "0.3.0"; + version = "0.4.0"; webpage = "https://erratique.ch/software/${pname}"; in -assert lib.versionAtLeast ocaml.version "4.01.0"; - stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; + hash = "sha256-02U23mYTy0ZJgSObDoyygPTGEMC4/Zge5bux4wshaEE="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ uutf result ]; + propagatedBuildInputs = [ uutf ]; strictDeps = true; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 819112b53d3..d694a3cda0f 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -17,6 +17,7 @@ let rev = "v0.3.7+satysfi"; sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; }; + propagatedBuildInputs = o.propagatedBuildInputs ++ [ ocamlPackages.result ]; }); yojson-with-position = ocamlPackages.buildDunePackage { pname = "yojson-with-position";