diff --git a/pkgs/by-name/xt/xtensor-blas/package.nix b/pkgs/by-name/xt/xtensor-blas/package.nix index ef46533f776c..68f8dcf0cd0a 100644 --- a/pkgs/by-name/xt/xtensor-blas/package.nix +++ b/pkgs/by-name/xt/xtensor-blas/package.nix @@ -3,51 +3,49 @@ stdenv, fetchFromGitHub, cmake, - gtest, openblas, xtensor, xtl, + doctest, }: stdenv.mkDerivation (finalAttrs: { pname = "xtensor-blas"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor-blas"; tag = finalAttrs.version; - hash = "sha256-Lg6MjJbZUCMqv4eSiZQrLfJy/86RWQ9P85UfeIQJ6bk="; + hash = "sha256-3g84TMOBWq9q8O6GipwdsugjGhPwkZE1cXbRsnVp3Ls="; }; + # test case THREW exception: Could not find workspace size for gelsd + postPatch = '' + substituteInPlace test/CMakeLists.txt \ + --replace-fail "test_lapack.cpp" "" \ + --replace-fail "test_linalg.cpp" "" \ + --replace-fail "test_qr.cpp" "" \ + --replace-fail "test_lstsq.cpp" "" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ + openblas xtensor xtl ]; - nativeCheckInputs = [ - gtest - openblas - ]; + nativeCheckInputs = [ doctest ]; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; - # Disable some failing tests - env.GTEST_FILTER = - "-" - + lib.concatStringsSep ":" [ - "xlapack.*" - "xlinalg.*" - "xtest_extended.*" - ]; - doCheck = true; meta = { description = "Extension to the xtensor library offering bindings to BLAS and LAPACK"; - homepage = "https://github.com/QuantStack/xtensor-blas"; + homepage = "https://github.com/xtensor-stack/xtensor-blas"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jherland ]; }; diff --git a/pkgs/by-name/xt/xtensor/package.nix b/pkgs/by-name/xt/xtensor/package.nix index 3a47f4ce30f2..4a3ef07fbf81 100644 --- a/pkgs/by-name/xt/xtensor/package.nix +++ b/pkgs/by-name/xt/xtensor/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xtensor"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor"; tag = finalAttrs.version; - hash = "sha256-gAGLb5NPT4jiIpXONqY+kalxKCFKFXlNqbM79x1lTKE="; + hash = "sha256-RvxjQXMKhgAsvCSprMKyAMETbOsg9Ek7yREXtaNa5Eo="; }; nativeBuildInputs = [