From a8d1e46e750abb9256955682cd257d2344f9a444 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 26 May 2026 07:29:40 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.tar:=203.3.0=20=E2=86=92=203.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tar/default.nix | 14 +++++--------- pkgs/development/ocaml-modules/tar/eio.nix | 8 +++++--- pkgs/development/ocaml-modules/tar/unix.nix | 4 ++++ pkgs/top-level/ocaml-packages.nix | 4 +--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 712579e067f4..f0559a19d126 100644 --- a/pkgs/development/ocaml-modules/tar/default.nix +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -2,22 +2,18 @@ lib, fetchurl, buildDunePackage, - camlp-streams, decompress, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "tar"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; - hash = "sha256-89aw1nf9QP0euAvMxgu2EyIDWL5Y9mxfqL8CV/Pl65Y="; + url = "https://github.com/mirage/ocaml-tar/releases/download/v${finalAttrs.version}/tar-${finalAttrs.version}.tbz"; + hash = "sha256-haKmHTDu+B5L+B4LQp0hPOtd1urtzWDJeeHLuRFJ+Qw="; }; - minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ - camlp-streams decompress ]; @@ -29,4 +25,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/tar/eio.nix b/pkgs/development/ocaml-modules/tar/eio.nix index dbdf250447a0..afd379b3448f 100644 --- a/pkgs/development/ocaml-modules/tar/eio.nix +++ b/pkgs/development/ocaml-modules/tar/eio.nix @@ -2,7 +2,8 @@ buildDunePackage, tar, eio, - git, + alcotest, + eio_main, }: buildDunePackage { @@ -16,8 +17,9 @@ buildDunePackage { eio ]; - nativeCheckInputs = [ - git + checkInputs = [ + alcotest + eio_main ]; meta = tar.meta // { diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index c109b0e7a177..5ab0194fc330 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -1,6 +1,8 @@ { buildDunePackage, tar, + fpath, + logs, lwt, git, }: @@ -11,6 +13,8 @@ buildDunePackage { propagatedBuildInputs = [ tar + fpath + logs lwt ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9e4950454a7e..c9c9f327a0f7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2093,9 +2093,7 @@ let inherit (pkgs) git; }; - tar-eio = callPackage ../development/ocaml-modules/tar/eio.nix { - inherit (pkgs) git; - }; + tar-eio = callPackage ../development/ocaml-modules/tar/eio.nix { }; tcpip = callPackage ../development/ocaml-modules/tcpip { };