Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocamlPackages.logs: 0.7.0 → 0.8.0 #391377

Merged
merged 1 commit into from
Mar 22, 2025
Merged

ocamlPackages.logs: 0.7.0 → 0.8.0 #391377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/by-name/ac/acgtk/package.nix
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,12 @@ stdenv.mkDerivation {
hash = "sha256-XuPcubt1lvnQio+km6MhmDu41NXNVXKKpzGd/Y1XzLo=";
};

# Compatibility with logs 0.8.0
postPatch = ''
substituteInPlace src/utils/dune \
--replace-warn 'logs mtime' 'logs logs.fmt mtime'
'';

strictDeps = true;

nativeBuildInputs = with ocamlPackages; [
5 changes: 5 additions & 0 deletions pkgs/development/ocaml-modules/index/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,11 @@ buildDunePackage rec {
hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA=";
};

# Compatibility with logs 0.8.0
postPatch = ''
substituteInPlace test/unix/dune --replace-warn logs.fmt 'logs.fmt logs.threaded'
'';

minimalOCamlVersion = "4.08";

buildInputs = [
10 changes: 5 additions & 5 deletions pkgs/development/ocaml-modules/logs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
cmdliner,
fmt,
fmtSupport ? lib.versionAtLeast ocaml.version "4.08",
js_of_ocaml,
js_of_ocaml-compiler,
jsooSupport ? true,
lwtSupport ? true,
cmdlinerSupport ? true,
@@ -22,8 +22,8 @@ let

optional_deps = [
{
pkg = js_of_ocaml;
enable_flag = "--with-js_of_ocaml";
pkg = js_of_ocaml-compiler;
enable_flag = "--with-js_of_ocaml-compiler";
enabled = jsooSupport;
}
{
@@ -55,11 +55,11 @@ else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "0.7.0";
version = "0.8.0";

src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46";
hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg=";
};

nativeBuildInputs = [