From 015d2ea8ad876f003dcd825c40e61509da091f44 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 4 Jul 2024 21:35:46 +0000 Subject: [PATCH] release-cuda: refine the allowUnfreePredicate --- pkgs/top-level/release-cuda.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index dd31ef14df36..365e306455ac 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -12,6 +12,22 @@ $ hydra-eval-jobs pkgs/top-level/release-cuda.nix -I . */ +let + ensureList = x: if builtins.isList x then x else [ x ]; + allowUnfreePredicate = + p: + builtins.all ( + license: + license.free + || license.redistributable + || builtins.elem license.shortName [ + "CUDA EULA" + "cuDNN EULA" + "NVidia OptiX EULA" + ] + ) (ensureList p.meta.license); +in + { # The platforms for which we build Nixpkgs. supportedSystems ? [ @@ -22,8 +38,8 @@ # Attributes passed to nixpkgs. nixpkgsArgs ? { config = { + inherit allowUnfreePredicate; "${variant}Support" = true; - allowUnfree = true; inHydra = true; }; },