From d720420f3795f54683db2f4114e7d5d3af3887d5 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 3 Apr 2022 13:57:53 +0200 Subject: [PATCH] haskellPackages: correct broken status of some packages --- .../configuration-hackage2nix/broken.yaml | 2 -- .../configuration-hackage2nix/main.yaml | 4 ++++ .../transitive-broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 16 ++++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e19c518dd34c..ba23a9a5b28f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -453,7 +453,6 @@ broken-packages: - botpp - bottom - boundingboxes - - bower-json - bowntz - bpath - braid @@ -2542,7 +2541,6 @@ broken-packages: - hylolib - hyperdrive - hyperfunctions - - hyper-haskell-server - hyperion - hyperloglogplus - hyperscript diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e3fc06072570..dfa46c41b935 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -404,6 +404,7 @@ unsupported-platforms: dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ] dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ] Euterpea: [ x86_64-darwin, aarch64-darwin ] + essence-of-live-coding-PortMidi: [ x86_64-darwin, aarch64-darwin ] follow-file: [ x86_64-darwin, aarch64-darwin ] freenect: [ x86_64-darwin, aarch64-darwin ] FTGL: [ x86_64-darwin, aarch64-darwin ] @@ -422,6 +423,7 @@ unsupported-platforms: gi-webkit2: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin gi-wnck: [ x86_64-darwin, aarch64-darwin ] gnome-keyring: [ x86_64-darwin, aarch64-darwin ] + grid-proto: [ x86_64-darwin, aarch64-darwin ] gtk3-mac-integration: [ x86_64-linux, aarch64-linux ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-sni-tray: [ x86_64-darwin, aarch64-darwin ] @@ -429,6 +431,7 @@ unsupported-platforms: hbro-contrib: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin hbro: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin hcwiid: [ x86_64-darwin, aarch64-darwin ] + HDRUtils: [ x86_64-darwin, aarch64-darwin ] HFuse: [ x86_64-darwin, aarch64-darwin ] hidapi: [ x86_64-darwin, aarch64-darwin ] hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ] @@ -462,6 +465,7 @@ unsupported-platforms: lio-fs: [ x86_64-darwin, aarch64-darwin ] logging-facade-journald: [ x86_64-darwin, aarch64-darwin ] longshot: [ aarch64-linux ] + lxc: [ x86_64-darwin, aarch64-darwin ] midi-alsa: [ x86_64-darwin, aarch64-darwin ] mpi-hs: [ aarch64-linux, x86_64-darwin, aarch64-darwin ] mpi-hs-binary: [ aarch64-linux, x86_64-darwin, aarch64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d9ff56076888..674735fd16e7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3646,7 +3646,6 @@ dont-distribute-packages: - soundgen - source-code-server - spade - - spago - sparkle - sparrow - sparsebit diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4bfda27b7b7a..abfa19d7ced6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8141,6 +8141,9 @@ self: { librarySystemDepends = [ pfstools ]; description = "Utilities for reading, manipulating, and writing HDR images"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) pfstools;}; "HERA" = callPackage @@ -46737,8 +46740,6 @@ self: { ]; description = "Read bower.json from Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bowntz" = callPackage @@ -88860,6 +88861,9 @@ self: { ]; description = "General purpose live coding framework - PortMidi backend"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -115620,6 +115624,9 @@ self: { executableHaskellDepends = [ base ]; description = "Game engine for Prototyping on a Grid"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "gridbounds" = callPackage @@ -150225,8 +150232,6 @@ self: { ]; description = "Server back-end for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyperdrive" = callPackage @@ -175353,6 +175358,9 @@ self: { libraryHaskellDepends = [ base bindings-lxc mtl transformers ]; description = "High level Haskell bindings to LXC (Linux containers)"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "lxd-client" = callPackage