diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix index 87a64beaa50d..f826b03f6aa1 100644 --- a/pkgs/development/ocaml-modules/ringo/default.nix +++ b/pkgs/development/ocaml-modules/ringo/default.nix @@ -2,22 +2,18 @@ buildDunePackage rec { pname = "ringo"; - version = "0.9"; - + version = "1.0.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ringo"; rev = "v${version}"; - sha256 = "sha256-lPb+WrRsmtOow9BX9FW4HoILlsTuuMrVlK0XPcXWZ9U="; + sha256 = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU="; }; minimalOCamlVersion = "4.05"; doCheck = true; - # If we just run the test as is it will try to test ringo-lwt - checkPhase = "dune build @test/runtest"; - meta = { description = "Caches (bounded-size key-value stores) and other bounded-size stores"; license = lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/ringo/lwt.nix b/pkgs/development/ocaml-modules/ringo/lwt.nix deleted file mode 100644 index 7fb8fb7054e1..000000000000 --- a/pkgs/development/ocaml-modules/ringo/lwt.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildDunePackage, ringo, lwt }: - -buildDunePackage { - pname = "ringo-lwt"; - inherit (ringo) version src doCheck; - - minimalOCamlVersion = "4.08"; - - propagatedBuildInputs = [ - ringo - lwt - ]; - - meta = ringo.meta // { - description = "Lwt-wrappers for Ringo caches"; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 06c982d7e5d7..50965dc0ebee 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1452,7 +1452,6 @@ let rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; ringo = callPackage ../development/ocaml-modules/ringo { }; - ringo-lwt = callPackage ../development/ocaml-modules/ringo/lwt.nix { }; rock = callPackage ../development/ocaml-modules/rock { };