summary refs log tree commit diff
path: root/pkgs/development/libraries/armadillo
diff options
context:
space:
mode:
authorndowens <ndowens04@gmail.com>2017-03-11 08:55:45 -0600
committerndowens <ndowens04@gmail.com>2017-03-13 16:38:47 -0500
commitf3dab1a1e9698d157163fb1e6916c1b7bbc775bb (patch)
tree8705c9ec5177a04b81204a6d9de700f172c83341 /pkgs/development/libraries/armadillo
parent798623fd2b0bb85c355f7d40c57a4fc10b2c36a0 (diff)
downloadnixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.tar
nixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.tar.gz
nixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.tar.bz2
nixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.tar.lz
nixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.tar.xz
nixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.tar.zst
nixpkgs-f3dab1a1e9698d157163fb1e6916c1b7bbc775bb.zip
armadillo: 7.700.0 -> 7.800.0
armadillo: Added forgotton version update
Diffstat (limited to 'pkgs/development/libraries/armadillo')
-rw-r--r--pkgs/development/libraries/armadillo/default.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 7f173b21156..bea592a6d20 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,24 +1,25 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "7.700.0";
+  version = "7.800.1";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr";
+    sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs";
   };
 
-  buildInputs = [ cmake openblasCompat superlu hdf5 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openblasCompat superlu hdf5 ];
 
   cmakeFlags = [ "-DDETECT_HDF5=ON" ];
 
-  patches = [ ./use-unix-config-on-OS-X.patch ];
+ patches = [ ./use-unix-config-on-OS-X.patch ];
   
   meta = with stdenv.lib; {
     description = "C++ linear algebra library";
     homepage = http://arma.sourceforge.net;
-    license = licenses.mpl20;
+    license = licenses.apl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ juliendehos knedlsepp ];
   };