@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages
1+{ stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages
22, ipaexfont, junicode, lmodern, lmmath
33}:
44let
@@ -6,8 +6,8 @@ let
66 src = fetchFromGitHub {
77 owner = "gfngfn";
88 repo = "camlpdf";
9− rev = "v2.2.2+satysfi";
10− sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k";
9+ rev = "v2.3.1+satysfi";
10+ sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k";
1111 };
1212 });
1313 otfm = ocamlPackages.otfm.overrideAttrs (o: {
@@ -18,23 +18,29 @@ let
1818 sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p";
1919 };
2020 });
21− yojson = ocamlPackages.yojson.overrideAttrs (o: {
21+ yojson-with-position = ocamlPackages.buildDunePackage {
22+ pname = "yojson-with-position";
23+ version = "1.4.2";
2224 src = fetchFromGitHub {
2325 owner = "gfngfn";
24− repo = "yojson";
25− rev = "v1.4.1+satysfi";
26− sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp";
26+ repo = "yojson-with-position";
27+ rev = "v1.4.2+satysfi";
28+ sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl";
2729 };
28− });
30+ useDune2 = true;
31+ nativeBuildInputs = [ ocamlPackages.cppo ];
32+ propagatedBuildInputs = [ ocamlPackages.biniou ];
33+ inherit (ocamlPackages.yojson) meta;
34+ };
2935in
3036 stdenv.mkDerivation rec {
3137 pname = "satysfi";
32− version = "0.0.4";
38+ version = "0.0.5";
3339 src = fetchFromGitHub {
3440 owner = "gfngfn";
3541 repo = "SATySFi";
3642 rev = "v${version}";
37− sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv";
43+ sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n";
3844 fetchSubmodules = true;
3945 };
4046
@@ -44,11 +50,11 @@ in
4450 $out/share/satysfi
4551 '';
4652
47− nativeBuildInputs = [ ruby dune ];
53+ nativeBuildInputs = [ ruby dune_2 ];
4854
49− buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [
55+ buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [
5056 ocaml findlib menhir
51− batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re
57+ batteries camlimages core_kernel ppx_deriving uutf omd cppo re
5258 ]);
5359
5460 installPhase = ''