From a082c256ae3b8e2c1ecc5832f5f1224ffc2d6340 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Thu, 25 Jan 2024 06:04:26 +0000 Subject: [PATCH] hobbes: unpin stdenv llvm --- pkgs/development/tools/hobbes/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index 5c3eb84b2d5a..851d64545d8f 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -1,7 +1,8 @@ { lib , stdenv -, llvmPackages_10 +, llvmPackages , fetchFromGitHub +, fetchpatch , cmake , llvm_12 , ncurses @@ -10,9 +11,9 @@ , libxml2 , python3 }: -llvmPackages_10.stdenv.mkDerivation { +llvmPackages.stdenv.mkDerivation { pname = "hobbes"; - version = "unstable-2023-06-03"; + version = "0-unstable-2023-06-03"; src = fetchFromGitHub { owner = "morganstanley"; @@ -21,6 +22,19 @@ llvmPackages_10.stdenv.mkDerivation { hash = "sha256-2v0yk35/cLKTjX0Qbc8cjc7Y6bamRSa9GpPvGoxL2Cw="; }; + patches = [ + # fix build for LLVM-12+ + # https://github.com/morganstanley/hobbes/pull/452 + (fetchpatch { + name = "include-cstdint.patch"; + url = "https://github.com/morganstanley/hobbes/commit/924b71fca06c61e606792cc8db8521fb499d4237.patch"; + hash = "sha256-/VsWtTYc3LBOnm4Obgx/MOqaaWZhUc8yzmkygtNz+mY="; + }) + ]; + + # only one warning generated. try to remove on next update + env.CXXFLAGS = "-Wno-error=deprecated-copy"; + # TODO: re-enable Python tests once they work on Python 3 # currently failing with "I don't know how to decode the primitive type: b'bool'" postPatch = ''