diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 14847d415c9c..e27f3c9a9817 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -28,14 +28,14 @@ }: let - hip = stdenv.mkDerivation rec { + hip = stdenv.mkDerivation (finalAttrs: { pname = "hip"; version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-kmRvrwnT0h2dBMI+H9d1vmeW3TmDBD+qW4YYhaMV2dE="; }; @@ -106,16 +106,16 @@ let maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; - }; + }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hip"; version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-i7hT/j+V0LT6Va2XcQyyKXF1guoIyhcOHvn842wCRx4="; }; @@ -203,4 +203,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/llvm/rocm/llvm.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix index 82e4c167f594..9e4675bfbbd8 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -24,7 +24,7 @@ let if stdenv.isx86_64 then "X86" else if stdenv.isAarch64 then "AArch64" else throw "Unsupported ROCm LLVM platform"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { inherit src version; pname = "rocm-llvm"; @@ -88,4 +88,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix index 6088db18cb74..c4b7a3461444 100644 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ b/pkgs/development/libraries/clang-ocl/default.nix @@ -8,15 +8,15 @@ , clang }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clang-ocl"; rocmVersion = "5.3.3"; - version = rocmVersion; + version = finalAttrs.rocmVersion; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "clang-ocl"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; }; @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != clang.version; + broken = finalAttrs.rocmVersion != clang.version; }; -} +}) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix index 7dcab1c9c271..882aa1a918d9 100644 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ b/pkgs/development/libraries/composable_kernel/default.nix @@ -18,7 +18,7 @@ assert buildTests -> gtest != null; # Try removing this next update assert buildTests == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "composable_kernel"; version = "unstable-2022-11-19"; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = teams.rocm.members; }; -} +}) diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix index dc4899c8ec16..7874f13c6de8 100644 --- a/pkgs/development/libraries/hipcub/default.nix +++ b/pkgs/development/libraries/hipcub/default.nix @@ -19,11 +19,11 @@ assert buildTests -> gtest != null; assert buildBenchmarks -> gbenchmark != null; # CUB can also be used as a backend instead of rocPRIM. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; repoVersion = "2.12.0"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipCUB"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-/GMZKbMD1sZQCM2FulM9jiJQ8ByYZinn0C8d/deFh0g="; }; @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; license = with licenses; [ bsd3 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 526634746d4c..ce2361509ce8 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -26,11 +26,11 @@ let mirror1 = "https://sparse.tamu.edu/MM"; mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; repoVersion = "2.3.1"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "hipSPARSE"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-Phcihat774ZSAe1QetE/GSZzGlnCnvS9GwsHBHCaD4c="; }; @@ -139,6 +139,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix index 59c8531a8b11..0b476654ba5c 100644 --- a/pkgs/development/libraries/miopengemm/default.nix +++ b/pkgs/development/libraries/miopengemm/default.nix @@ -36,10 +36,10 @@ let varwidth titlesec; }); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "miopengemm"; rocmVersion = "5.3.3"; - version = rocmVersion; + version = finalAttrs.rocmVersion; outputs = [ "out" @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "MIOpenGEMM"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc="; }; @@ -107,11 +107,11 @@ in stdenv.mkDerivation rec { postInstall = lib.optionalString buildTests '' mkdir -p $test/bin find tests -executable -type f -exec mv {} $test/bin \; - patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $test/bin/* + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $test/bin/* '' + lib.optionalString buildBenchmarks '' mkdir -p $benchmark/bin find examples -executable -type f -exec mv {} $benchmark/bin \; - patchelf --set-rpath ${lib.makeLibraryPath buildInputs}:$out/lib $benchmark/bin/* + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* ''; postFixup = lib.optionalString buildDocs '' @@ -132,6 +132,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != clang.version; + broken = finalAttrs.rocmVersion != clang.version; }; -} +}) diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix index 169a73cf35e1..f6b8671ac5d5 100644 --- a/pkgs/development/libraries/rccl/default.nix +++ b/pkgs/development/libraries/rccl/default.nix @@ -16,11 +16,11 @@ assert buildTests -> chrpath != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rccl"; repoVersion = "2.12.10"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rccl"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-whRXGD8oINDYhFs8+hEWKWoGNqacGlyy7xi8peA8Qsk="; }; @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; license = with licenses; [ bsd2 bsd3 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix index df64a277919b..6664f8b1a770 100644 --- a/pkgs/development/libraries/rocblas/default.nix +++ b/pkgs/development/libraries/rocblas/default.nix @@ -41,16 +41,16 @@ assert buildTests -> gfortran != null; assert buildTests == false; assert buildBenchmarks == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; repoVersion = "2.45.0"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocBLAS"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-z40WxF+suMeIZihBWJPRWyL20S2FUbeZb5JewmQWOJo="; }; @@ -143,6 +143,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index c12a97c9ad60..6c6856e8e1de 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -5,14 +5,14 @@ , rocm-comgr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocclr"; version = "5.3.3"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-dmL9krI/gHGQdOZ53+bQ7WjKcmJ+fZZP0lzF8ITLT4E="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { # the future. platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 452dc7eaf36d..9f97356fe711 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -25,11 +25,11 @@ assert buildBenchmarks -> fftwFloat != null; assert (buildTests || buildBenchmarks) -> boost != null; assert (buildTests || buildBenchmarks) -> llvmPackages != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocfft"; repoVersion = "1.0.18"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocFFT"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-jb2F1fRe+YLloYJ/KtzrptUDhmdBDBtddeW/g55owKM="; }; @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; hydraPlatforms = [ ]; # rocFFT produces an extremely large output }; -} +}) diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 6c2287604804..28efaad31e33 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-comgr"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index dce0953e938b..27970319f8f7 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -6,14 +6,14 @@ , llvm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-device-libs"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 47e2d0b24c6d..a5455619885e 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -20,14 +20,14 @@ , rocm-thunk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-opencl-runtime"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DAMD_OPENCL_PATH=${src}" + "-DAMD_OPENCL_PATH=${finalAttrs.src}" "-DROCCLR_PATH=${rocclr}" "-DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm/opencl" ]; @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 25e9f5a45497..e1e394642835 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -13,14 +13,14 @@ , rocm-device-libs , rocm-thunk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { license = with licenses; [ ncsa ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; }; -} +}) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index b2a1bc9443f6..93fe52bf32fc 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,14 +7,14 @@ , numactl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; }; -} +}) diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix index 193b238b3f45..5580e82470a9 100644 --- a/pkgs/development/libraries/rocmlir/default.nix +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -7,15 +7,15 @@ , python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocmlir"; rocmVersion = "5.3.3"; - version = rocmVersion; + version = finalAttrs.rocmVersion; src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocMLIR"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; }; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix index 216cc2e08bff..f59955f67160 100644 --- a/pkgs/development/libraries/rocprim/default.nix +++ b/pkgs/development/libraries/rocprim/default.nix @@ -17,11 +17,11 @@ assert buildTests -> gtest != null; assert buildBenchmarks -> gbenchmark != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; repoVersion = "2.11.1"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocPRIM"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-jfTuGEPyssARpdo0ZnfVJt0MBkoHnmBtf6Zg4xXNJ1U="; }; @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix index eefb3ff44690..f8d3324f1d74 100644 --- a/pkgs/development/libraries/rocsparse/default.nix +++ b/pkgs/development/libraries/rocsparse/default.nix @@ -30,11 +30,11 @@ let mirror1 = "https://sparse.tamu.edu/MM"; mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "rocsparse"; repoVersion = "2.3.2"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; outputs = [ "out" @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocSPARSE"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-1069oBrIpZ4M9CAkzoQ9a5j3WlCXErirTbgTUZuT6b0="; }; @@ -155,6 +155,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix index 7b9b7b1e010d..02a7b086e7db 100644 --- a/pkgs/development/libraries/rocthrust/default.nix +++ b/pkgs/development/libraries/rocthrust/default.nix @@ -21,11 +21,11 @@ assert buildTests -> gtest != null; assert buildTests == false; assert buildBenchmarks == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; repoVersion = "2.16.0"; rocmVersion = "5.3.3"; - version = "${repoVersion}-${rocmVersion}"; + version = "${finalAttrs.repoVersion}-${finalAttrs.rocmVersion}"; # Comment out these outputs until tests/benchmarks are fixed (upstream?) # outputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "rocThrust"; - rev = "rocm-${rocmVersion}"; + rev = "rocm-${finalAttrs.rocmVersion}"; hash = "sha256-WODOeWWL0AOYu0djwDlVZuiJDxcchsAT7BFG9JKYScw="; }; @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; - broken = rocmVersion != hip.version; + broken = finalAttrs.rocmVersion != hip.version; }; -} +}) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index c2616d81e451..ae462e3508f0 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, writeScript, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = teams.rocm.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 90afc09f8360..19dc6803f478 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -6,13 +6,13 @@ # Polaris) such that no system call is needed for downstream # compilers to determine the desired target. , defaultTargets ? []}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.3.3"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; }; @@ -52,4 +52,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; broken = stdenv.isAarch64; }; -} +}) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index e5ef93103736..c28682a071c5 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, writeScript, cmake, wrapPython }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; version = "5.3.3"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; - rev = "rocm-${version}"; + rev = "rocm-${finalAttrs.version}"; hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ="; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; }; -} +})