From ce1a3e3242f9d00d68c1c973ba902a3b6cda6218 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Thu, 9 Feb 2017 20:38:05 +0100 Subject: [PATCH] armadillo: 7.200.2 -> 7.700.0 This release fixes compatibility with cmake 3.7.1. Additionally I found out that armadillo only needs the hdf5-C library and not the C++ layer. --- pkgs/development/libraries/armadillo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 62b5ddf8011a..7f173b211565 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.200.2"; + version = "7.700.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; + sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; }; - buildInputs = [ cmake openblasCompat superlu hdf5-cpp ]; + buildInputs = [ cmake openblasCompat superlu hdf5 ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://arma.sourceforge.net; license = licenses.mpl20; platforms = platforms.unix; - maintainers = [ maintainers.juliendehos ]; + maintainers = with maintainers; [ juliendehos knedlsepp ]; }; }