summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2017-05-26 18:14:20 -0400
committerDan Peebles <pumpkin@me.com>2017-05-26 18:18:39 -0400
commit594829ddfcd4b93ebdafc3796936567aa7ad5e9d (patch)
tree0ae0a2e90084fac385a195d75c2acd15b8822483 /pkgs/applications/science
parent1df505fc3612a98b79984e176eeabb13669b2338 (diff)
downloadnixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.tar
nixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.tar.gz
nixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.tar.bz2
nixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.tar.lz
nixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.tar.xz
nixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.tar.zst
nixpkgs-594829ddfcd4b93ebdafc3796936567aa7ad5e9d.zip
msieve: update and enable on Darwin
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/math/msieve/default.nix21
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix
index 4c99b5081cc..6e1926810df 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;
   };
 }