diff options
Diffstat (limited to 'pkgs/tools/typesetting/satysfi/default.nix')
| -rw-r--r-- | pkgs/tools/typesetting/satysfi/default.nix | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 7284e2cc2fdc6..1478da2d7675a 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -10,15 +10,6 @@ let sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; }; - otfm = ocamlPackages.otfm.overrideAttrs (o: { - src = fetchFromGitHub { - owner = "gfngfn"; - repo = "otfm"; - rev = "v0.3.7+satysfi"; - sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; - }; - propagatedBuildInputs = o.propagatedBuildInputs ++ [ ocamlPackages.result ]; - }); yojson-with-position = ocamlPackages.buildDunePackage { pname = "yojson-with-position"; version = "1.4.2"; @@ -28,7 +19,6 @@ let rev = "v1.4.2+satysfi"; sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; }; - duneVersion = "3"; nativeBuildInputs = [ ocamlPackages.cppo ]; propagatedBuildInputs = [ ocamlPackages.biniou ]; inherit (ocamlPackages.yojson) meta; @@ -36,12 +26,12 @@ let in ocamlPackages.buildDunePackage rec { pname = "satysfi"; - version = "0.0.8"; + version = "0.0.10"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "sha256-cVGe1N3qMlEGAE/jPUji/X3zlijadayka1OL6iFioY4="; + hash = "sha256-qgVM7ExsKtzNQkZO+I+rcWLj4LSvKL5uyitH7Jg+ns0="; fetchSubmodules = true; }; @@ -51,13 +41,12 @@ in $out/share/satysfi ''; - duneVersion = "3"; - nativeBuildInputs = with ocamlPackages; [ menhir cppo ]; - buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ + buildInputs = [ camlpdf yojson-with-position ] ++ (with ocamlPackages; [ menhirLib batteries camlimages core_kernel ppx_deriving uutf omd re + otfed ]); postInstall = '' |