From fd7ae52d5383ee9666e31799d38691ced3d22363 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 14 Jan 2020 00:40:13 -0500 Subject: blitz: remove package This is very out of date, is pinned to an old version of boost, and the last update was 2.5 years ago marking it as broken. Since no one has fixed it or upgraded to the least version, it seems a strong indication it's no longer used/wanted/maintained and should be removed. --- pkgs/development/libraries/blitz/blitz-gcc47.patch | 33 --------- .../blitz/blitz-testsuite-stencil-et.patch | 13 ---- pkgs/development/libraries/blitz/default.nix | 81 ---------------------- 3 files changed, 127 deletions(-) delete mode 100644 pkgs/development/libraries/blitz/blitz-gcc47.patch delete mode 100644 pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch delete mode 100644 pkgs/development/libraries/blitz/default.nix (limited to 'pkgs/development/libraries/blitz') diff --git a/pkgs/development/libraries/blitz/blitz-gcc47.patch b/pkgs/development/libraries/blitz/blitz-gcc47.patch deleted file mode 100644 index d0b35665567..00000000000 --- a/pkgs/development/libraries/blitz/blitz-gcc47.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h ---- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200 -+++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200 -@@ -117,15 +117,15 @@ - } - } - -- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__) -- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__) -- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__) -- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__) -+ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__) -+ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) -+ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) -+ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__) - #define BZPRECHECK(X,Y) \ - { \ - if ((assertFailMode == false) && (!(X))) \ - BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \ -- checkAssert(X, __FILE__, __LINE__); \ -+ blitz::checkAssert(X, __FILE__, __LINE__); \ - } - - #define BZ_DEBUG_MESSAGE(X) \ -@@ -138,7 +138,7 @@ - } - - #define BZ_DEBUG_PARAM(X) X -- #define BZ_PRE_FAIL checkAssert(0) -+ #define BZ_PRE_FAIL blitz::checkAssert(0) - #define BZ_ASM_DEBUG_MARKER - - #elif defined(BZ_DEBUG) diff --git a/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch b/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch deleted file mode 100644 index fcff8685a08..00000000000 --- a/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testsuite/stencil-et.cpp b/testsuite/stencil-et.cpp -index b23e979..fe6b5ed 100644 ---- a/testsuite/stencil-et.cpp -+++ b/testsuite/stencil-et.cpp -@@ -44,7 +44,7 @@ void test_expr(const T1& d1, const T2& d2) - BZTEST(all(d1==d2)); - } - */ --#define test_expr(d1,d2) BZTEST(all((d1)==(d2))); -+#define test_expr(d1,d2) BZTEST(all((d1)-(d2)<=1e-7)); - - // Test two vector expressions for equality - template diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix deleted file mode 100644 index f370e45b5fd..00000000000 --- a/pkgs/development/libraries/blitz/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gfortran, texinfo - -# Select SIMD alignment width (in bytes) for vectorization. -, simdWidth ? 1 - -# Pad arrays to simdWidth by default? -# Note: Only useful if simdWidth > 1 -, enablePadding ? false - -# Activate serialization through Boost.Serialize? -, enableSerialization ? true, boost ? null - -# Activate test-suite? -# WARNING: Some of the tests require up to 1700MB of memory to compile. -, doCheck ? true - -}: - -assert enableSerialization -> boost != null; - -let - inherit (stdenv.lib) optional optionals; -in - -stdenv.mkDerivation { - name = "blitz++-0.10"; - src = fetchurl { - url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; - sha256 = "153g9sncir6ip9l7ssl6bhc4qzh0qr3lx2d15qm68hqxj7kg0kl0"; - }; - - patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gfortran texinfo ] - ++ optional (boost != null) boost; - - configureFlags = - [ "--enable-shared" - "--enable-fortran" - "--enable-optimize" - "--with-pic=yes" - "--enable-html-docs" - "--disable-doxygen" - "--disable-dot" - "--disable-latex-docs" - "--enable-simd-width=${toString simdWidth}" - ] - ++ optional enablePadding "--enable-array-length-padding" - ++ optional enableSerialization "--enable-serialization" - ++ optionals (boost != null) [ "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" ] - ++ optional stdenv.is64bit "--enable-64bit" - ; - - enableParallelBuilding = true; - - buildFlags = [ "lib" "info" "pdf" "html" ]; - installTargets = [ "install" "install-info" "install-pdf" "install-html" ]; - - inherit doCheck; - checkTarget = "check-testsuite check-examples"; - - meta = { - description = "Fast multi-dimensional array library for C++"; - homepage = https://sourceforge.net/projects/blitz/; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.aherrmann ]; - - longDescription = '' - Blitz++ is a C++ class library for scientific computing which provides - performance on par with Fortran 77/90. It uses template techniques to - achieve high performance. Blitz++ provides dense arrays and vectors, - random number generators, and small vectors (useful for representing - multicomponent or vector fields). - ''; - - broken = true; # failing test, ancient version, no library user in nixpkgs => if you care to fix it, go ahead - }; -} -- cgit 1.4.1