From ab08bb0237d106725b9b8a6b69e628650b026706 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Apr 2026 16:27:04 +0200 Subject: [PATCH] haskellPackages.{inline-c-win32,Southpaw}: track platforms in hackage2nix --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 98b273f56476..807ef298bf7c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1302,10 +1302,6 @@ with haskellLib; # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # This package can't be built on non-Windows systems. - inline-c-win32 = dontDistribute super.inline-c-win32; - Southpaw = dontDistribute super.Southpaw; - # https://ghc.haskell.org/trac/ghc/ticket/9825 vimus = overrideCabal (drv: { broken = pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isi686; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 578df8c43c5b..7a7ae4225004 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -829,6 +829,7 @@ supported-platforms: htune: [ platforms.linux ] # depends on alsa-pcm hw-prim-bits: [ platforms.x86 ] # x86 assembler inline-asm: [ platforms.x86 ] # x86 assembler + inline-c-win32: [ platforms.windows ] jsaddle-wkwebview: [ platforms.darwin ] keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) keid-frp-banana: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) @@ -856,6 +857,7 @@ supported-platforms: scat: [ platforms.x86 ] # uses scrypt, which requries x86 scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8 seqalign: [ platforms.x86 ] # x86 intrinsics + Southpaw: [ platforms.windows ] streamed: [ platforms.linux] # alsa-core only supported on linux swisstable: [ platforms.x86_64 ] # Needs AVX2 systemd-api: [ platforms.linux ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0ebb4d6e5708..57b4a1fa6e87 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42465,6 +42465,7 @@ self: { ]; description = "Assorted utility modules"; license = lib.licenses.mit; + platforms = lib.platforms.windows; } ) { }; @@ -391462,6 +391463,7 @@ self: { ]; description = "Win32 API Context for the inline-c library"; license = lib.licenses.mit; + platforms = lib.platforms.windows; } ) { };