diff options
| author | Chris Jefferson <caj21@st-andrews.ac.uk> | 2016-06-02 22:53:39 +0100 |
|---|---|---|
| committer | Chris Jefferson <caj21@st-andrews.ac.uk> | 2016-06-03 19:01:12 +0100 |
| commit | 75f793bbb27c1d73858e419851a7b0b6728ac32d (patch) | |
| tree | 3f784b603c2fae24f4671825f68877f749f7594d | |
| parent | c544cbca42beb5b33e174127f82bc3caf50906a9 (diff) | |
gap : 4.4.12 -> 4.8.3
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/science/math/gap/default.nix | 34 |
2 files changed, 17 insertions, 18 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 198bb93c6be3..07f458f8a456 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -74,6 +74,7 @@ chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; chattered = "Phil Scott <me@philscotted.com>"; choochootrain = "Hurshal Patel <hurshal@imap.cc>"; + chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>"; christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>"; cleverca22 = "Michael Bishop <cleverca22@gmail.com>"; cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>"; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index dcd0734d85d9..3d9e06527c9d 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,36 +1,34 @@ -{ stdenv, fetchurl, pari ? null }: +{ stdenv, fetchurl, m4, gmp }: let baseName = "gap"; - version = "4r4p12"; + version = "4r8p3"; - pkgVer = "2012_01_12-10_47_UTC"; - pkgSrc = fetchurl { - url = "ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages-${pkgVer}.tar.bz2"; - sha256 = "0z9ncy1m5gvv4llkclxd1vpcgpb0b81a2pfmnhzvw8x708frhmnb"; - }; + pkgVer = "2016_03_19-22_17"; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { - url = "ftp://ftp.gap-system.org/pub/gap/gap4/tar.gz/${baseName}${version}.tar.gz"; - sha256 = "0flap5lbkvpms3zznq1zwxyxyj0ax3fk7m24f3bvhvr37vyxnf40"; + url = "ftp://ftp.gap-system.org/pub/gap/gap48/tar.gz/${baseName}${version}_${pkgVer}.tar.gz"; + sha256 = "1rmb0lj43avv456sjwb7ia3y0wwk5shlqylpkdwnnqpjnvjbnzv6"; }; - buildInputs = [ pari ]; - + configureFlags = [ "--with-gmp=system" ]; + buildInputs = [ m4 gmp ]; + + postBuild = '' + pushd pkg + bash ../bin/BuildPackages.sh + popd + ''; + installPhase = '' mkdir -p "$out/bin" "$out/share/gap/" cp -r . "$out/share/gap/build-dir" - tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg" - - ${if pari != null then - ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' - else ""} sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" @@ -41,10 +39,10 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin + chrisjefferson ]; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl2; homepage = http://gap-system.org/; - broken = true; }; } |