From 67c7685280a15a4fb00489ffdff9486b3c743644 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Nov 2018 09:30:11 -0800 Subject: [PATCH 1/2] armadillo: 9.100.5 -> 9.200.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/armadillo/versions --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 16ba6b32382a..7685a0d9eb4f 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.100.5"; + version = "9.200.4"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"; + sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h"; }; nativeBuildInputs = [ cmake ]; From 0528001141170ef49ef37de41a40e7d2c7e0a49d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 11 Nov 2018 00:53:53 +0100 Subject: [PATCH 2/2] gnss-sdr: turn off unit tests explicitly --- pkgs/applications/misc/gnss-sdr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix index 0bb0926f048a..6cbdea8c6867 100644 --- a/pkgs/applications/misc/gnss-sdr/default.nix +++ b/pkgs/applications/misc/gnss-sdr/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGFlags_ROOT_DIR=${google-gflags}/lib" "-DGLOG_INCLUDE_DIR=${glog}/include" + "-DENABLE_UNIT_TESTING=OFF" # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them.