From 594829ddfcd4b93ebdafc3796936567aa7ad5e9d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 26 May 2017 18:14:20 -0400 Subject: msieve: update and enable on Darwin --- pkgs/applications/science/math/msieve/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/science/math/msieve/default.nix') diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 4c99b5081cc55..6e1926810df0d 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,29 +1,30 @@ {stdenv, fetchurl, zlib, gmp, ecm }: stdenv.mkDerivation { - name = "msieve-1.48"; + name = "msieve-1.53"; src = fetchurl { - url = mirror://sourceforge/msieve/msieve/Msieve%20v1.48/msieve148.tar.gz; - sha256 = "05cm23mpfsbwssqda243sbi8m31j783qx89x9gl7sy8a4dnv7h63"; - }; + url = mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz; + sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; + }; buildInputs = [ zlib gmp ecm ]; ECM = if ecm == null then "0" else "1"; - buildFlags = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else "generic"; + # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too + makeFlags = "CC=cc all"; - installPhase = ''mkdir -p $out/bin/ - cp msieve $out/bin/''; + installPhase = '' + mkdir -p $out/bin/ + cp msieve $out/bin/ + ''; meta = { description = "A C library implementing a suite of algorithms to factor large integers"; license = stdenv.lib.licenses.publicDomain; homepage = http://msieve.sourceforge.net/; maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin; }; } -- cgit 1.4.1