diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-25 14:25:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-25 14:25:10 +0100 |
| commit | df3443b573518c0c2eda2af1609da02476f7a283 (patch) | |
| tree | aa1d465e8d483daccabb45d0af050de436b0946c /pkgs | |
| parent | 6704d9eeab5c24b098dbf8560748bb593429fe6e (diff) | |
| parent | a082c256ae3b8e2c1ecc5832f5f1224ffc2d6340 (diff) | |
| download | nixlib-df3443b573518c0c2eda2af1609da02476f7a283.tar nixlib-df3443b573518c0c2eda2af1609da02476f7a283.tar.gz nixlib-df3443b573518c0c2eda2af1609da02476f7a283.tar.bz2 nixlib-df3443b573518c0c2eda2af1609da02476f7a283.tar.lz nixlib-df3443b573518c0c2eda2af1609da02476f7a283.tar.xz nixlib-df3443b573518c0c2eda2af1609da02476f7a283.tar.zst nixlib-df3443b573518c0c2eda2af1609da02476f7a283.zip | |
Merge pull request #283678 from a-n-n-a-l-e-e/hobbes-update-llvm
hobbes: unpin stdenv llvm
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/hobbes/default.nix | 20 |
1 files 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 = '' |