From 8af39c1cf725be2f42b8d104cf39f2cd74840cac Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Mar 2015 23:12:00 -0700 Subject: [PATCH] isl: 0.11.1 -> 0.14 --- pkgs/development/libraries/isl/default.nix | 9 +++++---- pkgs/development/libraries/isl/fix-gcc-build.diff | 12 ------------ 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/isl/fix-gcc-build.diff diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 931ee831b73..5fa009277e1 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. + name = "isl-0.14"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; - sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; + url = "http://isl.gforge.inria.fr/${name}.tar.bz2"; + sha256 = "0dlg4b85nw4w534525h0fvb7yhb8i4am8kskhmm0ym7qabzh4g3y"; }; buildInputs = [ gmp ]; - patches = [ ./fix-gcc-build.diff ]; enableParallelBuilding = true; + doCheck = true; + meta = { homepage = http://www.kotnet.org/~skimo/isl/; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff deleted file mode 100644 index 6fbd1f9d478..00000000000 --- a/pkgs/development/libraries/isl/fix-gcc-build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h ---- isl-0.11.1/include/isl/int.h 2012-11-29 09:47:32.000000000 +0100 -+++ isl-0.11.1.new/include/isl/int.h 2013-10-27 15:35:31.348553812 +0100 -@@ -14,7 +14,7 @@ - #include - #include - #if defined(__cplusplus) --#include -+#include - #endif - - #if defined(__cplusplus)