ocamlPackages.cpdf: 2.7.1 → 2.8 (#376363)

pkgs/by-name/sa/satysfi/package.nix

@@ -6,16 +6,18 @@
   junicode,
   lmodern,
   lmmath,
+  which,
 }:
 let
-  camlpdf = ocamlPackages.camlpdf.overrideAttrs {
+  camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: {
     src = fetchFromGitHub {
       owner = "gfngfn";
       repo = "camlpdf";
       rev = "v2.3.1+satysfi";
       sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k";
     };
-  };
+    nativeBuildInputs = [ which ] ++ o.nativeBuildInputs;
+  });
   yojson-with-position = ocamlPackages.buildDunePackage {
     pname = "yojson-with-position";
     version = "1.4.2";

pkgs/development/ocaml-modules/camlpdf/default.nix

@@ -1,21 +1,21 @@
-{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
 
 if lib.versionOlder ocaml.version "4.10"
 then throw "camlpdf is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
-  version = "2.7.1";
+  version = "2.8";
   pname = "ocaml${ocaml.version}-camlpdf";
 
   src = fetchFromGitHub {
     owner = "johnwhitington";
     repo = "camlpdf";
     rev = "v${version}";
-    hash = "sha256-/ZKL80HqLZ9ObOvgfg+ZHFZ8m2CRe0zWT8zHIf9CXes=";
+    hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
   };
 
-  nativeBuildInputs = [ which ocaml findlib ];
+  nativeBuildInputs = [ ocaml findlib ];
 
   strictDeps = true;
 

pkgs/development/ocaml-modules/cpdf/default.nix

@@ -5,7 +5,6 @@
   ocaml,
   findlib,
   camlpdf,
-  ncurses,
 }:
 
 if lib.versionOlder ocaml.version "4.10" then
@@ -14,20 +13,19 @@ else
 
   stdenv.mkDerivation rec {
     pname = "ocaml${ocaml.version}-cpdf";
-    version = "2.7.1";
+    version = "2.8";
 
     src = fetchFromGitHub {
       owner = "johnwhitington";
       repo = "cpdf-source";
       rev = "v${version}";
-      hash = "sha256-lFI7f1t70Pw0LJjDrhaB7yQKR1N5906xNYB+fnrz55M=";
+      hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
     };
 
     nativeBuildInputs = [
       ocaml
       findlib
     ];
-    buildInputs = [ ncurses ];
     propagatedBuildInputs = [ camlpdf ];
 
     strictDeps = true;