From b5046855805e2d90d4ab4ae296f29cb5d142290a Mon Sep 17 00:00:00 2001 From: redianthus Date: Mon, 24 Nov 2025 22:54:29 +0100 Subject: [PATCH 1/3] ocamlPackages.logs: 0.9.0 -> 0.10.0 --- pkgs/development/ocaml-modules/logs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index bbe31bcb13a9..7d2a0f844ec8 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, ocaml, - version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.0" else "0.8.0", + version ? if lib.versionAtLeast ocaml.version "4.14" then "0.10.0" else "0.8.0", topkg, buildTopkgPackage, cmdlinerSupport ? true, @@ -22,9 +22,9 @@ let minimalOCamlVersion = "4.03"; sha512 = "c34c67b00d6a989a2660204ea70db8521736d6105f15d1ee0ec6287a662798fe5c4d47075c6e7c84f5d5372adb5af5c4c404f79db70d69140af5e0ebbea3b6a5"; }; - "0.9.0" = { + "0.10.0" = { minimalOCamlVersion = "4.14"; - sha512 = "b75fb28e83f33461b06b5c9b60972c4a9a9a1599d637b4a0c7b1e86a87f34fe5361e817cb31f42ad7e7cbb822473b28fab9f58a02870eb189ebe88dae8e045ff"; + sha512 = "122b7a77bd07aee1e0cb8e07e82b195a12528cf015e72fa0dd5afaae26ce04bad9b29f32a6d3bd3547fe522b8a036608785e8adb900e31580a0d555719bbb7e7"; }; } .${version}; From 66d99d6ded2daff76b0c250d9644a4a83da18e78 Mon Sep 17 00:00:00 2001 From: redianthus Date: Wed, 26 Nov 2025 11:46:31 +0100 Subject: [PATCH 2/3] ocamlPackages.logs: small cleaning --- pkgs/development/ocaml-modules/logs/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 7d2a0f844ec8..0f80db5c04e0 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -69,17 +69,15 @@ buildTopkgPackage { inherit (param) sha512; }; - buildInputs = [ topkg ] ++ optional_buildInputs; - - strictDeps = true; + buildInputs = optional_buildInputs; buildPhase = "${topkg.run} build ${lib.escapeShellArgs enable_flags}"; - meta = with lib; { + meta = { description = "Logging infrastructure for OCaml"; homepage = webpage; inherit (ocaml.meta) platforms; - maintainers = [ maintainers.sternenseemann ]; - license = licenses.isc; + maintainers = with lib.maintainers; [ sternenseemann ]; + license = lib.licenses.isc; }; } From 6d5bc274d44f2e21de2f0d040aea7648f005522e Mon Sep 17 00:00:00 2001 From: redianthus Date: Wed, 26 Nov 2025 11:55:54 +0100 Subject: [PATCH 3/3] ocamlPackages.logs: switch back to SRI hash --- pkgs/development/ocaml-modules/logs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 0f80db5c04e0..7ae7e5448537 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -20,11 +20,11 @@ let { "0.8.0" = { minimalOCamlVersion = "4.03"; - sha512 = "c34c67b00d6a989a2660204ea70db8521736d6105f15d1ee0ec6287a662798fe5c4d47075c6e7c84f5d5372adb5af5c4c404f79db70d69140af5e0ebbea3b6a5"; + hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg="; }; "0.10.0" = { minimalOCamlVersion = "4.14"; - sha512 = "122b7a77bd07aee1e0cb8e07e82b195a12528cf015e72fa0dd5afaae26ce04bad9b29f32a6d3bd3547fe522b8a036608785e8adb900e31580a0d555719bbb7e7"; + hash = "sha256-dg7CkcEo11t0gmCRM3dk+SW1ykFLAuLTNqCze/MN9Oo="; }; } .${version}; @@ -66,7 +66,7 @@ buildTopkgPackage { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - inherit (param) sha512; + inherit (param) hash; }; buildInputs = optional_buildInputs;