From 94f852b9e60fc6bd0e8f28dc408b55f014b02859 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Jan 2023 20:58:38 +0100 Subject: [PATCH] ocamlPackages.wodan: remove broken (at 2020-11-20) --- .../ocaml-modules/wodan/default.nix | 41 ------------------- .../development/ocaml-modules/wodan/irmin.nix | 25 ----------- pkgs/development/ocaml-modules/wodan/unix.nix | 31 -------------- pkgs/top-level/ocaml-packages.nix | 6 --- 4 files changed, 103 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/wodan/default.nix delete mode 100644 pkgs/development/ocaml-modules/wodan/irmin.nix delete mode 100644 pkgs/development/ocaml-modules/wodan/unix.nix diff --git a/pkgs/development/ocaml-modules/wodan/default.nix b/pkgs/development/ocaml-modules/wodan/default.nix deleted file mode 100644 index f33d7b9861f6..000000000000 --- a/pkgs/development/ocaml-modules/wodan/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint -, checkseum, diet, bitv, logs, lru, io-page, mirage-block }: - -buildDunePackage rec { - pname = "wodan"; - version = "unstable-2020-11-20"; - - useDune2 = true; - - src = fetchFromGitHub { - owner = "mirage"; - repo = pname; - rev = "cc08fe25888051c207f1009bcd2d39f8c514484f"; - sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im"; - fetchSubmodules = true; - }; - - minimumOCamlVersion = "4.08"; - - propagatedBuildInputs = [ - lwt_ppx - ppx_cstruct - optint - checkseum - diet - bitv - /* nocrypto */ - logs - lru - io-page - mirage-block - ]; - - meta = with lib; { - broken = true; # nocrypto is no longer available in nixpkgs - inherit (src.meta) homepage; - description = "A flash-friendly, safe and flexible filesystem library"; - license = licenses.isc; - maintainers = with maintainers; [ ehmry ]; - }; -} diff --git a/pkgs/development/ocaml-modules/wodan/irmin.nix b/pkgs/development/ocaml-modules/wodan/irmin.nix deleted file mode 100644 index 6389b47b6179..000000000000 --- a/pkgs/development/ocaml-modules/wodan/irmin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildDunePackage, irmin-chunk, irmin-git -, mirage-block-ramdisk, mirage-block-unix, wodan }: - -buildDunePackage rec { - pname = "wodan-irmin"; - inherit (wodan) version src useDune2; - - propagatedBuildInputs = [ - /* io-page-unix */ # No longer available in nixpkgs - irmin-chunk - irmin-git - mirage-block-ramdisk - mirage-block-unix - wodan - ]; - - meta = wodan.meta // { - # wodan is currently incompatible with irmin 2.3.0. - # additionally upgrading to current master (unclear - # if the issue is fixed there) is not possible as it - # depends on a custom fork of mirage-block - broken = true; - description = "Wodan as an Irmin store"; - }; -} diff --git a/pkgs/development/ocaml-modules/wodan/unix.nix b/pkgs/development/ocaml-modules/wodan/unix.nix deleted file mode 100644 index bd694bce801b..000000000000 --- a/pkgs/development/ocaml-modules/wodan/unix.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent -, mirage-block-ramdisk, mirage-block-unix }: - -buildDunePackage rec { - outputs = [ "bin" "out" ]; - pname = "wodan-unix"; - inherit (wodan) version src useDune2; - - propagatedBuildInputs = [ - afl-persistent - base64 - benchmark - cmdliner - csv - /* io-page-unix */ - mirage-block-ramdisk - mirage-block-unix - wodan - ]; - - postInstall = '' - moveToOutput bin "''${!outputBin}" - ''; - - meta = wodan.meta // { - broken = true; # io-page-unix is no longer available - description = "Wodan clients with Unix integration"; - mainProgram = "wodanc"; - }; - -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1ac15512d76d..10bb18908ca6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1517,12 +1517,6 @@ let webmachine = callPackage ../development/ocaml-modules/webmachine { }; - wodan = callPackage ../development/ocaml-modules/wodan { }; - - wodan-irmin = callPackage ../development/ocaml-modules/wodan/irmin.nix { }; - - wodan-unix = callPackage ../development/ocaml-modules/wodan/unix.nix { }; - wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; x509 = callPackage ../development/ocaml-modules/x509 { };