From bcad28ebf442bf35fdc13405b3bb2765a526e647 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 17 Jun 2026 09:04:56 +0200 Subject: [PATCH 1/2] ocamlPackages.{camlpdf,cpdf}: 2.9 -> 2.9.1 - camlpdf: - diff: https://github.com/johnwhitington/camlpdf/compare/v2.9...v2.9.1 - changelog: https://github.com/johnwhitington/camlpdf/blob/refs/tags/v2.9.1/Changes.txt - cpdf: - diff: https://github.com/johnwhitington/cpdf-source/compare/v2.9...v2.9.1 - changelog: https://github.com/johnwhitington/cpdf-source/blob/refs/tags/v2.9.1/Changes.txt --- pkgs/development/ocaml-modules/camlpdf/default.nix | 4 ++-- pkgs/development/ocaml-modules/cpdf/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 1fcfcaffccdd..abd7e5714e06 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.9"; + version = "2.9.1"; pname = "ocaml${ocaml.version}-camlpdf"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; tag = "v${finalAttrs.version}"; - hash = "sha256-8xBna7GDFbFf48069/ct71uFxLJU0eBfKVRWDnyYocs="; + hash = "sha256-f3Bm64T27eiIzOY2nwdzMRH68VlyNp2jXpOPyBouSCs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 8c46a09ca583..53f483414091 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-cpdf"; - version = "2.9"; + version = "2.9.1"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; tag = "v${finalAttrs.version}"; - hash = "sha256-b6fGKFM9Q2YxW8FoyewGNTkF9XBtjdq0Bur6KgVi5T4="; + hash = "sha256-P3CQwYp23URVBDcdnrRAg7gAsOMIifwraIcFSJh8pd0="; }; nativeBuildInputs = [ From 25c1ae0ad91b05504bb3de7fcea27750d3eebaf4 Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 17 Jun 2026 08:42:48 +0200 Subject: [PATCH 2/2] ocamlPackages.{camlpdf,cpdf}: add ngi team, update script & changelog --- pkgs/development/ocaml-modules/camlpdf/default.nix | 5 +++++ pkgs/development/ocaml-modules/cpdf/default.nix | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index abd7e5714e06..3c7bc709e3ce 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, ocaml, findlib, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -28,11 +29,15 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "OCaml library for reading, writing and modifying PDF files"; homepage = "https://github.com/johnwhitington/camlpdf"; + changelog = "https://github.com/johnwhitington/camlpdf/blob/${finalAttrs.src.rev}/Changes.txt"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ vbgl ]; + teams = with lib.teams; [ ngi ]; broken = lib.versionOlder ocaml.version "4.10"; }; }) diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 53f483414091..7a311fe05718 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -5,6 +5,7 @@ ocaml, findlib, camlpdf, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -35,11 +36,15 @@ stdenv.mkDerivation (finalAttrs: { cp cpdfmanual.pdf $out/share/doc/cpdf/ ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "PDF Command Line Tools"; homepage = "https://www.coherentpdf.com/"; + changelog = "https://github.com/johnwhitington/cpdf-source/blob/${finalAttrs.src.rev}/Changes.txt"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; + teams = with lib.teams; [ ngi ]; mainProgram = "cpdf"; inherit (ocaml.meta) platforms; broken = lib.versionOlder ocaml.version "4.10";