From cc016577d3501ff7c1ec4040e0c5a8fbd93d0560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 14:20:16 +0100 Subject: [PATCH 01/11] box86: Add 32 bit cross-platform support on Risc-V --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 286e790df8e3..b1703ecb84fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1387,6 +1387,8 @@ with pkgs; pkgsCross.gnu32.callPackage ../applications/emulators/box86 args else if stdenv.hostPlatform.isAarch64 then pkgsCross.armv7l-hf-multiplatform.callPackage ../applications/emulators/box86 args + else if stdenv.hostPlatform.isRiscV64 then + pkgsCross.riscv32.callPackage ../applications/emulators/box86 args else throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}"; From fdd6dab3825fa467c4d7f5e79b056296e7934759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:19:20 +0100 Subject: [PATCH 02/11] notion-app: throw on unsupported arch --- pkgs/by-name/no/notion-app/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix index bd33b998b55c..05f9d46c7683 100644 --- a/pkgs/by-name/no/notion-app/package.nix +++ b/pkgs/by-name/no/notion-app/package.nix @@ -5,7 +5,9 @@ unzip, }: let - info = (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"; + info = + (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin" + or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}"); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "notion-app"; From 956b67b192195e6a9fd85c61504610cfe6ac18bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:23:15 +0100 Subject: [PATCH 03/11] vscode-extensions: throw on unsupported systems --- pkgs/applications/editors/vscode/extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6ab87df26539..4ada6b024fe3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1115,7 +1115,7 @@ let publisher = "Continue"; version = "1.1.49"; } - // sources.${stdenv.system}; + // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ (lib.getLib stdenv.cc.cc) ]; meta = { @@ -1387,7 +1387,7 @@ let publisher = "devsense"; version = "1.41.14332"; } - // sources.${stdenv.system}; + // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); nativeBuildInputs = [ autoPatchelfHook ]; @@ -3334,7 +3334,7 @@ let publisher = "ms-dotnettools"; version = "2.2.3"; } - // sources.${stdenv.system}; + // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ (lib.getLib stdenv.cc.cc) From 5af573cc81d977daffa9ca6ba2e1761256e6e562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:24:35 +0100 Subject: [PATCH 04/11] wkhtmltopdf: throw on unsupported systems --- pkgs/by-name/wk/wkhtmltopdf/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix index 67c5d26ef8ef..24ecddd3dc9a 100644 --- a/pkgs/by-name/wk/wkhtmltopdf/package.nix +++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix @@ -124,5 +124,7 @@ stdenv.mkDerivation ( }; } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs - // lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs.${stdenv.system} + // + lib.optionalAttrs (stdenv.hostPlatform.isLinux) + linuxAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}") ) From 61593a72a0c467ce64150a203c5b72650d59ae16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:26:24 +0100 Subject: [PATCH 05/11] swift: throw on unsupported arch --- pkgs/development/compilers/swift/compiler/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index c23b8e0877f5..993ca970c06e 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -484,6 +484,7 @@ stdenv.mkDerivation { "aarch64" = "AArch64"; } .${targetPlatform.parsed.cpu.name} + or (throw "Unsupported CPU architecture: ${targetPlatform.parsed.cpu.name}") } " buildProject llvm llvm-project/llvm From 92e1e3ac5f1a680a77b65af1199ee944d65820d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:28:06 +0100 Subject: [PATCH 06/11] bulloak: throw on unsupported arch --- pkgs/by-name/bu/bulloak/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 069374c134b3..976a622d397c 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -47,7 +47,9 @@ rustPlatform.buildRustPackage rec { doCheck = false; # provide the list of solc versions to the `svm-rs-builds` dependency - SVM_RELEASES_LIST_JSON = solc-versions.${stdenv.hostPlatform.system}; + SVM_RELEASES_LIST_JSON = + solc-versions.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); meta = { description = "Solidity test generator based on the Branching Tree Technique"; From 5f7bce21073cb4554e0a2b64cddc097e037c5819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:50:17 +0100 Subject: [PATCH 07/11] daytona-bin: throw on unsupported systems --- pkgs/by-name/da/daytona-bin/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daytona-bin/package.nix b/pkgs/by-name/da/daytona-bin/package.nix index bf26c54e94ea..d04b4f972fe9 100644 --- a/pkgs/by-name/da/daytona-bin/package.nix +++ b/pkgs/by-name/da/daytona-bin/package.nix @@ -30,7 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; }; in - fetchurl urls."${stdenvNoCC.hostPlatform.system}"; + fetchurl ( + urls."${stdenvNoCC.hostPlatform.system}" + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}") + ); dontUnpack = true; From e2dda6ab17883c1fd702a8b41466a254e11921c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 17:54:35 +0100 Subject: [PATCH 08/11] rocm-modules-6: throw on unsupported system --- pkgs/development/rocm-modules/6/llvm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index c4174805684c..cdb5d705b068 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -170,6 +170,7 @@ let "aarch64" = "AArch64"; } .${llvmStdenv.targetPlatform.parsed.cpu.name} + or (throw "Unsupported CPU architecture: ${llvmStdenv.targetPlatform.parsed.cpu.name}") }"; # -ffat-lto-objects = emit LTO object files that are compatible with non-LTO-supporting builds too # FatLTO objects are a special type of fat object file that contain LTO compatible IR in addition to generated object code, From 461b59211efc05f922426141014be192c432de4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 18:09:23 +0100 Subject: [PATCH 09/11] tritonclient: throw on unsupported systems --- pkgs/development/python-modules/tritonclient/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tritonclient/default.nix b/pkgs/development/python-modules/tritonclient/default.nix index 49393e0c7671..4448047f9611 100644 --- a/pkgs/development/python-modules/tritonclient/default.nix +++ b/pkgs/development/python-modules/tritonclient/default.nix @@ -35,8 +35,11 @@ buildPythonPackage rec { inherit pname version format; python = "py3"; dist = "py3"; - platform = platforms.${stdenv.hostPlatform.system} or { }; - sha256 = hashes.${stdenv.hostPlatform.system} or { }; + platform = + platforms.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + sha256 = + hashes.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; propagatedBuildInputs = [ From 600f6b675178b835a1f121924e88ec34fd01e5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 18:12:26 +0100 Subject: [PATCH 10/11] vl-convert-python/librusty_v8: throw on unsupported system --- .../python-modules/vl-convert-python/librusty_v8.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix index 53aaf4910485..636b86d4c6e1 100644 --- a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix +++ b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix @@ -10,7 +10,9 @@ let fetchurl { name = "librusty_v8-${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; - sha256 = args.shas.${stdenv.hostPlatform.system}; + sha256 = + args.shas.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); meta = { inherit (args) version; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From b3b3b216af0884f26e06b3751b1561138f6910a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 26 Jun 2025 18:15:21 +0100 Subject: [PATCH 11/11] zenny-cli: throw on unsupported system --- pkgs/by-name/ze/zenn-cli/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix index eac27008ec60..380b4cc8fc9b 100644 --- a/pkgs/by-name/ze/zenn-cli/package.nix +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -24,7 +24,9 @@ let go-turbo = stdenv.mkDerivation { pname = "go-turbo"; version = go-turbo-version; - src = go-turbo-srcs.${stdenv.hostPlatform.system}; + src = + go-turbo-srcs.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ autoPatchelfHook ]; dontBuild = true; installPhase = ''