uhdm: 1.45 -> 1.57

Also no vendored dependencies anymore, capnproto is now directly
used from nix, no third_party/ submodules are needed anymore.

1 files changed, 7 insertions, 24 deletions

diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix
index a87b6fbf35fa6..2a667a8ac9d4e 100644
--- a/pkgs/applications/science/logic/uhdm/default.nix
+++ b/pkgs/applications/science/logic/uhdm/default.nix
@@ -3,56 +3,39 @@
 , fetchFromGitHub
 , cmake
 , python3
+, capnproto
 , gtest
-, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
   pname = "UHDM";
-  version = "1.45";
+  version = "1.57";
 
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-mxQRmI8yUUrSUYa4kUT9URgfqYvuz3V9e1IGjtiHyhc=";
-    fetchSubmodules = true;
+    hash = "sha256-z3vURlKXCW5W2naVwJjBXcn94u80JsBxlUOIy9ylsJw=";
   };
 
-  # Add ability to use local googletest provided from nix instead of
-  # the version from the submodule in third_party/. The third_party/ version
-  # is slightly older and does not work with our hydra Darwin builds that needs
-  # to set a particular temp directory.
-  # This patch allows to choose UHDM_USE_HOST_GTEST=On in the cflags.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/chipsalliance/UHDM/commit/ad60fdb65a7c49fdc8ee3fffdca791f9364af4f5.patch";
-      sha256 = "sha256-IkwnepWWmBychJ0mu+kaddUEc9jkldIRq+GyJkhrO8A=";
-      name = "allow-local-gtest.patch";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
+    (python3.withPackages (p: with p; [ orderedmultidict ]))
+    gtest
   ];
 
   buildInputs = [
-    (python3.withPackages (p: with p; [ orderedmultidict ]))
-    gtest
+    capnproto
   ];
 
   cmakeFlags = [
     "-DUHDM_USE_HOST_GTEST=On"
+    "-DUHDM_USE_HOST_CAPNP=On"
   ];
 
   doCheck = true;
   checkPhase = "make test";
 
-  postInstall = ''
-    mv $out/lib/uhdm/* $out/lib/
-    rm -rf $out/lib/uhdm
-  '';
-
   meta = {
     description = "Universal Hardware Data Model";
     homepage = "https://github.com/chipsalliance/UHDM";