Unverified Commit df3443b5 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #283678 from a-n-n-a-l-e-e/hobbes-update-llvm 

hobbes: unpin stdenv llvm
parents 6704d9ee a082c256

pkgs/development/tools/hobbes/default.nix

+17 −3
Original line number Diff line number Diff line 
{ 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 = ''