From e46ca1b95f4d91791c180346c8f78e1496b83499 Mon Sep 17 00:00:00 2001 From: marcnnn Date: Sat, 20 May 2017 15:00:39 +0200 Subject: [PATCH] cvc4: 1.5pre-smtcomp2016 -> unstable-2017-05-18 (#25808) * cvc4: 1.5pre-smtcomp2016 -> 1.5pre-20170514 * cvc4: use stable url upstream delete their tarballs --- .../applications/science/logic/cvc4/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 91ee4e418995..acde7f6ae43b 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"