From e32ba6294781691846c3ab19281fe977350b4d0f Mon Sep 17 00:00:00 2001 From: Marcos Magueta Date: Sat, 26 Sep 2026 15:30:53 -0300 Subject: preparation cleanup for RNT integration --- deps/merklecpp.nix | 19 ------------------- deps/plebeia.nix | 38 -------------------------------------- deps/relational_engine_lib.nix | 28 ---------------------------- 3 files changed, 85 deletions(-) delete mode 100644 deps/merklecpp.nix delete mode 100644 deps/plebeia.nix delete mode 100644 deps/relational_engine_lib.nix (limited to 'deps') diff --git a/deps/merklecpp.nix b/deps/merklecpp.nix deleted file mode 100644 index d130be6..0000000 --- a/deps/merklecpp.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: -pkgs.stdenv.mkDerivation rec { - name = "merklecpp"; - - src = pkgs.fetchFromGitHub { - owner = "microsoft"; - repo = "merklecpp"; - rev = "master"; - sha256 = "jJJ6FEn+AkMknqun0GkXh5DSXsJnFbdE7U8BQ7Dd/Fw="; - }; - - prePatch = ""; - configurePhase = ""; - buildPhase = ""; - installPhase = '' - mkdir -p $out/include - mv merklecpp.h $out/include/merklecpp.h - ''; -} diff --git a/deps/plebeia.nix b/deps/plebeia.nix deleted file mode 100644 index 559d8bc..0000000 --- a/deps/plebeia.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, ocamlPackages, fetchFromGitLab, blake2 }: -ocamlPackages.buildDunePackage { - duneVersion = "3"; - - pname = "plebeia"; - version = "2.2.0"; - - minimalOCamlVersion = "4.08"; - - src = fetchFromGitLab { - owner = "dailambda"; - repo = "plebeia"; - rev = "2.2.0"; - sha256 = "sha256-F1/FcCR0gn2kGNps3P4KRrqJlr4skHcuMytIRp4QRac="; - }; - - buildInputs = [ blake2 ] ++ (with ocamlPackages; [ - cstruct - stdint - res - lwt - ]); - - propagatedBuildInputs = [ blake2 ] ++ (with ocamlPackages; [ - cstruct - stdint - res - lwt - ]); - - doCheck = false; - - meta = { - description = "Functional Merkle Patricia tree with disk storage"; - license = lib.licenses.mit; - homepage = "https://github.com/camlspotter/plebeia"; - }; -} diff --git a/deps/relational_engine_lib.nix b/deps/relational_engine_lib.nix deleted file mode 100644 index 475ce00..0000000 --- a/deps/relational_engine_lib.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, libressl ? pkgs.callPackage ./libressl.nix { } -# , merklecpp ? pkgs.callPackage ./merklecpp.nix { } -, ... }: -let shared_lib_extension = if pkgs.stdenv.isDarwin then "dylib" else "so"; -in pkgs.stdenv.mkDerivation { - name = "librelational_engine"; - src = ../shared/librelational_engine; - nativeBuildInputs = [ pkgs.cmake pkgs.gcc ]; - buildInputs = [ - libressl - # merklecpp - ]; - env = { - # MERKLECPP_INCLUDE_PATH = "${merklecpp}/include"; - LIBRESSL_INCLUDE_PATH = "${libressl}/include"; - LIBRESSL_LIB_PATH = "${libressl}/lib"; - OS_LIB_EXTENSION = shared_lib_extension; - }; - buildPhase = '' - mkdir -p $out/lib - mkdir -p $out/include - cmake --build . --target relational_engine - ''; - installPhase = '' - mv librelational_engine.${shared_lib_extension} $out/lib/librelational_engine.${shared_lib_extension} - cp $src/library.h $out/include/library.h - ''; -} -- cgit v1.2.3