diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-22 09:21:40 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-22 09:21:40 +0200 |
commit | 99cfab07b9b27d559e9b1985f48c70e5fe94ea42 (patch) | |
tree | 04876430d9c56a573cc8952b792487ce045abb75 /pkgs/applications/science/logic/cvc4/default.nix | |
parent | b175feb8e141262b20f56d662d0b40f69df8e5c9 (diff) | |
parent | 64a924a96b56a4028840a921be67150fc0544116 (diff) | |
download | nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.tar nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.tar.gz nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.tar.bz2 nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.tar.lz nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.tar.xz nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.tar.zst nixpkgs-99cfab07b9b27d559e9b1985f48c70e5fe94ea42.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/applications/science/logic/cvc4/default.nix')
-rw-r--r-- | pkgs/applications/science/logic/cvc4/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 91ee4e41899..acde7f6ae43 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, cln, gmp, swig, pkgconfig, readline, libantlr3c, boost, jdk, autoreconfHook, python2 }: +{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c, +boost, jdk, autoreconfHook, python2, antlr3_4 }: stdenv.mkDerivation rec { - name = "cvc4-${version}"; - version = "1.5pre-smtcomp2016"; + name = "cvc4-unstable-${version}"; + version = "2017-05-18"; - src = fetchurl { - url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz"; - sha256 = "15wz0plfc9q8acrwq1ljgsgqmh8pyz5alzv5xpchvv9w76lvj2zf"; + src = fetchFromGitHub { + owner = "CVC4"; + repo = "CVC4"; + rev = "d77107cc56b0a089364c3d1512813701c155ea93"; + sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs"; }; - buildInputs = [ gmp cln pkgconfig readline swig libantlr3c boost jdk autoreconfHook python2 ]; + buildInputs = [ gmp cln pkgconfig readline swig libantlr3c antlr3_4 boost jdk autoreconfHook python2 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" |