From adb6af6e871baef8e07e9fa44756a2292fa0e3c8 Mon Sep 17 00:00:00 2001 From: Tony Zorman Date: Mon, 1 Apr 2024 18:01:47 +0200 Subject: [PATCH] haskellPackages.kmonad: unbreak --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index b2ac63b5cd4c..589d97db7c60 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3299,7 +3299,6 @@ broken-packages: - kind-integer # failure in job https://hydra.nixos.org/build/233250066 at 2023-09-02 - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - - kmonad # failure in job https://hydra.nixos.org/build/252717089 at 2024-03-16 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 062b1767a7e4..8bec59f4da59 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1331,4 +1331,6 @@ self: super: builtins.intersectAttrs super { # Test failure is related to a GHC implementation detail of primitives and doesn't # cause actual problems in dependent packages, see https://github.com/lehins/pvar/issues/4 pvar = dontCheck super.pvar; + + kmonad = enableSeparateBinOutput super.kmonad; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fa71c7ced658..b1795972c0cd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -180849,9 +180849,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "kmonad"; - broken = true; }) {}; "kmp-dfa" = callPackage diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d977766a928a..c439144fbc53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39804,6 +39804,8 @@ with pkgs; kmon = callPackage ../tools/system/kmon { }; + kmonad = haskellPackages.kmonad.bin; + kompose = callPackage ../applications/networking/cluster/kompose { }; kompute = callPackage ../development/libraries/kompute {