diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-26 00:09:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-26 00:09:11 +0000 |
commit | 947012b992faa88e9d5b0d168c8f81c8e7cf995e (patch) | |
tree | 3b5f923312bb65436d1ffe6134af9ba8c9e9f0f2 /pkgs/development/tools/hobbes/default.nix | |
parent | 4966eff42cf9976319ac34fa28f3af224723a771 (diff) | |
parent | f15360e6a41e77aa479dd47896e709fd77214e4f (diff) | |
download | nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.gz nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.bz2 nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.lz nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.xz nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.tar.zst nixpkgs-947012b992faa88e9d5b0d168c8f81c8e7cf995e.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/hobbes/default.nix')
-rw-r--r-- | pkgs/development/tools/hobbes/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index f4741a390ed..1dd28af3bf4 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib, libxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, llvm_12, ncurses, readline, zlib, libxml2 }: stdenv.mkDerivation { - name = "hobbes"; - version = "unstable-2020-05-19"; + pname = "hobbes"; + version = "unstable-2021-04-28"; src = fetchFromGitHub { owner = "morgan-stanley"; repo = "hobbes"; - rev = "3d80a46b44a362a97a6b963a2bf788fd1f67ade1"; - sha256 = "03m915g3283z2nfdr03dj5k76wn917knfqxb0xj3qinbl4cka2p1"; + rev = "737c7ca63516f6b3dca0e659c3de75d4325472d6"; + sha256 = "0fjsmz1sbrp6464mrb9ha7p615w2l2pdldsc2ayvcrvxfyi1r4gj"; }; + # 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 = '' + rm test/Python.C + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ - llvm_6 # LLVM 6 is latest currently supported. See https://git.io/JvK6w. + llvm_12 ncurses readline zlib libxml2 ]; - doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R. + doCheck = true; checkTarget = "test"; meta = with lib; { @@ -32,7 +38,7 @@ stdenv.mkDerivation { Hobbes is a a language, embedded compiler, and runtime for efficient dynamic expression evaluation, data storage and analysis. ''; - homepage = "https://github.com/Morgan-Stanley/hobbes"; + homepage = "https://github.com/morganstanley/hobbes"; license = licenses.asl20; maintainers = with maintainers; [ kthielen thmzlt ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; |