Merge pull request #287892 from pbsds/fix-unsupported-system

treewide: add attempted system to "Unsupported system" throws
This commit is contained in:
Peder Bergebakken Sundt 2024-02-13 19:38:58 +01:00 committed by GitHub
commit 9858b3962a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 12 additions and 12 deletions

View File

@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI=";
x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY=";
aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs=";
}.${stdenv.system} or (throw "Unsupported platform");
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
};
nativeBuildInputs =

View File

@ -5,7 +5,7 @@ let
arch =
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "darwin"
else throw "Unsupported platform";
else throw "Unsupported system: ${stdenv.system}";
analysisDir = "server/analysis_binaries/${arch}";
in
vscode-utils.buildVscodeMarketplaceExtension rec {

View File

@ -80,7 +80,7 @@ let
outputHash = {
x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q=";
aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw=";
}.${stdenv.system} or (throw "Unsupported platform");
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
};
in stdenv.mkDerivation {

View File

@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
i686-linux = "sha256-/Q7VZahYhLdKVFB25CanROYxD2etQOcRg+4bXZUMqTc=";
x86_64-darwin = "sha256-9biFAbFD7Bva7KPKztgCvcaoX8E6AlJBKkjlDQdP6Zw=";
aarch64-darwin = "sha256-to5Y0R9tm9b7jUQAK3eBylLhpu+w5oDd63FbBCBAvd8=";
}.${stdenv.system} or (throw "Unsupported platform");
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
};
cargoDeps = rustPlatform.importCargoLock {

View File

@ -221,13 +221,13 @@
aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb";
x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz";
aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz";
}.${stdenv.system} or (throw "Unsupported platform");
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
hash = {
x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";
aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a";
x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d";
aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x";
}.${stdenv.system} or (throw "Unsupported platform");
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
};
nativeBuildInputs =

View File

@ -43,7 +43,7 @@ buildPythonPackage rec {
name = "x86_64";
hash = "sha256-/+gegUMd2n7MpJvdilS5VWefXc0tuRcLrXBBXSH35b0=";
};
}.${stdenv.system} or (throw "Unsupported system");
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
in fetchPypi {
pname = "home_assistant_chip_core";
inherit version format;

View File

@ -28,7 +28,7 @@ stdenv.mkDerivation {
pname = "StaticSitesClient-${versionFlavor}";
version = flavor.buildId;
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform");
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [
autoPatchelfHook

View File

@ -7,13 +7,13 @@ let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({
src = if lib.isAttrs zipHash then
fetchurl {
name = "${pname}-${version}-${plat}.zip";
hash = zipHash.${plat} or (throw "unsupported system");
hash = zipHash.${plat} or (throw "Unsupported system: ${plat}");
url = "https://grafana.com/api/plugins/${pname}/versions/${version}/download" + {
x86_64-linux = "?os=linux&arch=amd64";
aarch64-linux = "?os=linux&arch=arm64";
x86_64-darwin = "?os=darwin&arch=amd64";
aarch64-darwin = "?os=darwin&arch=arm64";
}.${plat} or (throw "unknown system");
}.${plat} or (throw "Unsupported system: ${plat}");
}
else
fetchurl {

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg";
hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system");
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
buildInputs = [
libsecret

View File

@ -12,7 +12,7 @@ let
x86_64-linux = "amd64";
};
data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")};
data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")};
baseUrl = "https://apt.enpass.io";