From d79d3de85f3f9348dce369460a5a08f461eb9a86 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 8 Jan 2024 22:03:40 +0100 Subject: [PATCH] cudaPackages.cuda-library-samples: Only enable on Linux, fix channel This very weirdly broke the channel evaluation: https://hydra.nixos.org/build/245871962/nixlog/1 It appears that this attribute is only evaluated by Hydra, _not_ by ofborg. So this wouldn't have been detected by CI anyways in the PR that introduced the problem: https://github.com/NixOS/nixpkgs/pull/276800. However, due to https://github.com/NixOS/nixpkgs/pull/271123#discussion_r1442134594, the channel only broke once that was fixed with https://github.com/NixOS/nixpkgs/pull/278777 Whether the fix is good, I don't know, but the failing-on-darwin attribute doesn't exist anymore with this commit, making the tarball build succeed again: nix-build pkgs/top-level/release.nix -A tarball --- pkgs/test/cuda/cuda-library-samples/extension.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/cuda/cuda-library-samples/extension.nix b/pkgs/test/cuda/cuda-library-samples/extension.nix index 62de715fd0b4f..4cb34af732095 100644 --- a/pkgs/test/cuda/cuda-library-samples/extension.nix +++ b/pkgs/test/cuda/cuda-library-samples/extension.nix @@ -2,7 +2,7 @@ let # Samples are built around the CUDA Toolkit, which is not available for # aarch64. Check for both CUDA version and platform. - platformIsSupported = hostPlatform.isx86_64; + platformIsSupported = hostPlatform.isx86_64 && hostPlatform.isLinux; # Build our extension extension =