From 07c82debac4edddec7fb4ac1d6e1c697be5c8c7a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 6 Aug 2022 14:36:58 +0200 Subject: [PATCH] haskellPackages.keid-*: restrict to x86_64-linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The combination of the following dependencies… * geomancy (only x86 due to intrinsics) * vulkan (i686 and darwin don't work apparently) …leaves us with effectively a single platform that works and we can test in practice, x86_64-linux. --- .../configuration-hackage2nix/main.yaml | 10 +++++----- pkgs/development/haskell-modules/hackage-packages.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 76e69a0f8a87..4cd5ac4fc361 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -456,11 +456,6 @@ unsupported-platforms: Jazzkell: [ platforms.darwin ] # depends on Euterpea jsaddle-hello: [ platforms.darwin ] # depends on jsaddle-webkit2gtk jsaddle-webkit2gtk: [ platforms.darwin ] - keid-core: [ aarch64-linux ] - keid-geometry: [ aarch64-linux ] - keid-render-basic: [ aarch64-linux ] - keid-sound-openal: [ aarch64-linux ] - keid-ui-dearimgui: [ aarch64-linux ] Kulitta: [ platforms.darwin ] # depends on Euterpea LambdaHack: [ platforms.darwin ] large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17 @@ -543,6 +538,11 @@ supported-platforms: HQu: [ platforms.x86 ] # vendored C++ library needs i686/x86_64 hw-prim-bits: [ platforms.x86 ] # x86 assembler inline-asm: [ platforms.x86 ] # x86 assembler + keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-geometry: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-render-basic: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-sound-openal: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) + keid-ui-dearimgui: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) kqueue: [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ] linux-evdev: [ platforms.linux ] linux-file-extents: [ platforms.linux ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ebf23daa9f39..667752e65983 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -167008,7 +167008,7 @@ self: { ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; }) {}; "keid-frp-banana" = callPackage @@ -167039,7 +167039,7 @@ self: { ]; description = "Geometry primitives for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; }) {}; "keid-render-basic" = callPackage @@ -167060,7 +167060,7 @@ self: { ]; description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167096,7 +167096,7 @@ self: { ]; description = "OpenAL sound system for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; }) {}; "keid-ui-dearimgui" = callPackage @@ -167114,7 +167114,7 @@ self: { ]; description = "DearImGui elements for Keid engine"; license = lib.licenses.bsd3; - badPlatforms = [ "aarch64-linux" ]; + platforms = [ "x86_64-linux" ]; hydraPlatforms = lib.platforms.none; broken = true; }) {};