diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-11-19 18:12:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 18:12:56 +0000 |
| commit | 20b2253b70bb86b98dfa8a7eda6ef0f8cb8df783 (patch) | |
| tree | 6fdbfb44ff42d9134f9aa61046f76019f3d4952c | |
| parent | 9434dc3dfba22d4293a4f55739115c0f37487edf (diff) | |
| parent | 0e8c8119072e1c205df65492f7e0542045d1643c (diff) | |
Merge pull request #50642 from bts/isl_0_20
isl: add 0.20
| -rw-r--r-- | pkgs/development/libraries/isl/0.12.2.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/libraries/isl/0.20.0.nix (renamed from pkgs/development/libraries/isl/0.15.0.nix) | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 5 insertions, 27 deletions
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix deleted file mode 100644 index 880f91fccedc..000000000000 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gmp }: - -stdenv.mkDerivation rec { - name = "isl-0.12.2"; # CLooG 0.16.3 fails to build with ISL 0.08. - - src = fetchurl { - url = "http://isl.gforge.inria.fr/${name}.tar.bz2"; - sha256 = "1d0zs64yw6fzs6b7kxq6nh9kvas16h8b43agwh30118jjzpdpczl"; - }; - - buildInputs = [ gmp ]; - - enableParallelBuilding = true; - - meta = { - homepage = https://www.kotnet.org/~skimo/isl/; - license = stdenv.lib.licenses.lgpl21; - description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index 8b6080c2880a..72ef581725b9 100644 --- a/pkgs/development/libraries/isl/0.15.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "isl-0.15"; + name = "isl-0.20"; src = fetchurl { url = "http://isl.gforge.inria.fr/${name}.tar.xz"; - sha256 = "1m922l5bz69lvkcxrib7lvjqwfqsr8rpbzgmb2aq07bp76460jhh"; + sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5"; }; buildInputs = [ gmp ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = http://isl.gforge.inria.fr/; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4095658a38ec..3b4730f35184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3484,12 +3484,11 @@ with pkgs; ised = callPackage ../tools/misc/ised {}; - isl = isl_0_17; + isl = isl_0_20; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; - isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; - isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { }; isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { }; + isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; ispike = callPackage ../development/libraries/science/robotics/ispike { }; |