Unverified Commit 3cf15f0e authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

{adaptivecpp,magma}: remove no longer necessary rocmPackages version check (#398593)

parents a9c7187e 531cc317

pkgs/by-name/ad/adaptivecpp/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ stdenv.mkDerivation (finalAttrs: { 
    description = "Multi-backend implementation of SYCL for CPUs and GPUs";

    mainProgram = "acpp";

    maintainers = with maintainers; [ yboettcher ];

    # Broken with current nixpkgs ROCm 6.0.2

    # Works with updated ROCm, see https://github.com/NixOS/nixpkgs/pull/367695

    broken = rocmSupport && strings.versionOlder rocmPackages.clr.version "6.3.1";

    license = licenses.bsd2;

  };

})

pkgs/development/libraries/science/math/magma/generic.nix

+1 −6
Original line number Diff line number Diff line
@@ -254,11 +254,6 @@ stdenv.mkDerivation { 
      || !(cudaSupport || rocmSupport) # At least one back-end enabled

      || (cudaSupport && rocmSupport) # Mutually exclusive

      || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null)

      || (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null)

      || (

        rocmSupport

        && strings.versionAtLeast version "2.8.0"

        && strings.versionOlder rocmPackages.clr.version "6.3"

      );

      || (rocmSupport && strings.versionOlder version "2.8.0" && rocmPackages_5 == null);

  };

}