b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libisl: Make derivations generic, add 0.24 (#146693)

Browse source 
* libisl: Make derivation generic

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

* libisl: add 0.24

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

* isl: remove unused args

* isl: remove dead homepages

* isl: fix configureFlags

* isl: fix nested callPackage

use import to remove callPackage-inside-callPackage, which breaks overriding

* isl: pname/version -> name

pname/version is preferred, but causes rebuilds here.
let's do the cleanup separately from the mass rebuild,
to use the 0-rebuild-count as a 'nothing up my sleeve' gesture

* isl_0_24: fix sha256

* isl_0_11: add missing patch

Co-authored-by: Ryan Burns <rtburns@protonmail.com>
This commit is contained in:
Matthias Beyer 2021-11-21 11:43:19 +01:00 committed by GitHub
parent 129223ac31
commit f1e8640c54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 71 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/libraries/isl/0.11.1.nix
View file

@ -1,22 +1,8 @@
{ lib, stdenv, fetchurl, gmp }:
stdenv.mkDerivation {
name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08.
src = fetchurl {
url = "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2";
sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
};
buildInputs = [ gmp ];
import ./generic.nix {
version = "0.11.1";
urls = [
"https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"
];
sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9";
patches = [ ./fix-gcc-build.diff ];
enableParallelBuilding = true;
meta = {
homepage = "https://www.kotnet.org/~skimo/isl/";
license = lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
platforms = lib.platforms.all;
};
}

30
pkgs/development/libraries/isl/0.14.1.nix
View file

@ -1,24 +1,8 @@
{ lib, stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
name = "isl-0.14.1";
src = fetchurl {
urls = [
"mirror://sourceforge/libisl/${name}.tar.xz"
"https://libisl.sourceforge.io/${name}.tar.xz"
];
sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";
};
buildInputs = [ gmp ];
enableParallelBuilding = true;
meta = {
homepage = "https://www.kotnet.org/~skimo/isl/";
license = lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
platforms = lib.platforms.all;
};
import ./generic.nix rec {
version = "0.14.1";
urls = [
"mirror://sourceforge/libisl/isl-${version}.tar.xz"
"https://libisl.sourceforge.io/isl-${version}.tar.xz"
];
sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8";
}

30
pkgs/development/libraries/isl/0.17.1.nix
View file

@ -1,24 +1,8 @@
{ lib, stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
name = "isl-0.17.1";
src = fetchurl {
urls = [
"mirror://sourceforge/libisl/${name}.tar.xz"
"https://libisl.sourceforge.io/${name}.tar.xz"
];
sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";
};
buildInputs = [ gmp ];
enableParallelBuilding = true;
meta = {
homepage = "https://www.kotnet.org/~skimo/isl/";
license = lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
platforms = lib.platforms.all;
};
import ./generic.nix rec {
version = "0.17.1";
urls = [
"mirror://sourceforge/libisl/isl-${version}.tar.xz"
"https://libisl.sourceforge.io/isl-${version}.tar.xz"
];
sha256 = "be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647";
}

32
pkgs/development/libraries/isl/0.20.0.nix
View file

@ -1,29 +1,11 @@
{ lib, stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
name = "isl-0.20";
src = fetchurl {
urls = [
"mirror://sourceforge/libisl/${name}.tar.xz"
"https://libisl.sourceforge.io/${name}.tar.xz"
];
sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";
};
buildInputs = [ gmp ];
import ./generic.nix rec {
version = "0.20";
urls = [
"mirror://sourceforge/libisl/isl-${version}.tar.xz"
"https://libisl.sourceforge.io/isl-${version}.tar.xz"
];
sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";
configureFlags = [
"--with-gcc-arch=generic" # don't guess -march=/mtune=
];
enableParallelBuilding = true;
meta = {
homepage = "http://isl.gforge.inria.fr/";
license = lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
platforms = lib.platforms.all;
};
}

11
pkgs/development/libraries/isl/0.24.0.nix Normal file
View file

@ -0,0 +1,11 @@
import ./generic.nix rec {
version = "0.24";
urls = [
"mirror://sourceforge/libisl/isl-${version}.tar.xz"
"https://libisl.sourceforge.io/isl-${version}.tar.xz"
];
sha256 = "1bgbk6n93qqn7w8v21kxf4x6dc3z0ypqrzvgfd46nhagak60ac84";
configureFlags = [
"--with-gcc-arch=generic" # don't guess -march=/mtune=
];
}

32
pkgs/development/libraries/isl/generic.nix Normal file
View file

@ -0,0 +1,32 @@
{ version
, urls
, sha256
, configureFlags ? []
, patches ? []
}:
{ lib, stdenv, fetchurl, gmp
}:
stdenv.mkDerivation {
name = "isl-${version}";
src = fetchurl {
inherit urls sha256;
};
inherit patches;
buildInputs = [ gmp ];
inherit configureFlags;
enableParallelBuilding = true;
meta = {
homepage = "https://libisl.sourceforge.io/";
license = lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
platforms = lib.platforms.all;
};
}

1
pkgs/top-level/all-packages.nix
View file

@ -6535,6 +6535,7 @@ with pkgs;
isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };
isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { };
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
ispike = callPackage ../development/libraries/science/robotics/ispike { };