From fc8420f3793e9b43f0906a35d7aea87e33f23653 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 Mar 2023 17:18:00 +0100 Subject: [PATCH 1/3] ocamlPackages.shared-memory-ring: use Dune 3 --- .../ocaml-modules/shared-memory-ring/default.nix | 10 +++++----- .../ocaml-modules/shared-memory-ring/lwt.nix | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 0b4974f910c9..17dee792007b 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -2,19 +2,20 @@ , buildDunePackage , fetchurl , ppx_cstruct -, mirage-profile , cstruct +, lwt , ounit -, stdlib-shims }: buildDunePackage rec { pname = "shared-memory-ring"; version = "3.1.1"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz"; - sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; + hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; }; buildInputs = [ @@ -22,13 +23,12 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - mirage-profile cstruct - stdlib-shims ]; doCheck = true; checkInputs = [ + lwt ounit ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index e3ae1ef2e3dc..dc34be8ed746 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -14,6 +14,8 @@ buildDunePackage { inherit (shared-memory-ring) version src; + duneVersion = "3"; + buildInputs = [ ppx_cstruct ]; From 580bb886228f454ffaec89025cba75d284445649 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 Mar 2023 17:18:05 +0100 Subject: [PATCH 2/3] =?UTF-8?q?ocamlPackages.mirage-logs:=201.2.0=20?= =?UTF-8?q?=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/mirage-logs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index 7aabd51b819a..e54a8bc1b3e2 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,20 +1,20 @@ { lib, fetchurl, buildDunePackage -, logs, lwt, mirage-clock, mirage-profile, ptime -, alcotest, stdlib-shims +, logs, lwt, mirage-clock, ptime +, alcotest }: buildDunePackage rec { pname = "mirage-logs"; - version = "1.2.0"; + version = "1.3.0"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz"; - sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; + url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz"; + hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA="; }; - propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; + propagatedBuildInputs = [ logs lwt mirage-clock ptime ]; doCheck = true; checkInputs = [ alcotest ]; From fa448b51e0034926d70ea13dd7fcb9c25b3a1aab Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 Mar 2023 17:18:08 +0100 Subject: [PATCH 3/3] ocamlPackages.mirage-profile: use Dune 3 --- pkgs/development/ocaml-modules/mirage-profile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix index ef856e021273..2aba97944e17 100644 --- a/pkgs/development/ocaml-modules/mirage-profile/default.nix +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { pname = "mirage-profile"; version = "0.9.1"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz";