pari: Make pthread optional, remove unstable

This commit is contained in:
Timo Kaufmann 2018-04-23 19:46:12 +02:00
parent 62529a693b
commit 75b0866d0c
3 changed files with 16 additions and 36 deletions

View file

@ -1,5 +1,9 @@
{ stdenv, fetchurl
, gmp, readline, libX11, libpthreadstubs, tex, perl }:
, gmp, readline, libX11, tex, perl
, withThread ? true, libpthreadstubs
}:
assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
@ -11,14 +15,22 @@ stdenv.mkDerivation rec {
sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
};
buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
buildInputs = [
gmp
readline
libX11
tex
perl
] ++ stdenv.lib.optionals withThread [
libpthreadstubs
];
configureScript = "./Configure";
configureFlags = [
"--mt=pthread"
"--with-gmp=${gmp.dev}"
"--with-readline=${readline.dev}"
] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin";
] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin"
++ stdenv.lib.optional withThread "--mt=pthread";
preConfigure = ''
export LD=$CC

View file

@ -1,31 +0,0 @@
{ stdenv, fetchurl, gmp, readline, perl }:
stdenv.mkDerivation rec {
version = "2.9.3";
name = "pari-unstable-${version}";
src = fetchurl {
url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz";
sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
};
buildInputs = [gmp readline];
nativeBuildInputs = [perl];
configureScript = "./Configure";
configureFlags =
"--with-gmp=${gmp.dev} " +
"--with-readline=${readline.dev}";
meta = with stdenv.lib; {
description = "Computer algebra system for high-performance number theory computations";
homepage = "http://pari.math.u-bordeaux.fr/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes raskin ];
platforms = platforms.linux;
inherit version;
downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
updateWalker = true;
};
}

View file

@ -20279,7 +20279,6 @@ with pkgs;
pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; };
gp2c = callPackage ../applications/science/math/pari/gp2c.nix { };
pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {};
palp = callPackage ../applications/science/math/palp { };