diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3c0778f58658..1a2ff4b293bb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1320,7 +1320,6 @@ dont-distribute-packages: - Hashell - hashflare - hask-home - - haskanoid - haskdeep - haskeem - haskell-admin diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a7a440c32513..870f2fac7cf2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -877,17 +877,6 @@ builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.smpeg.dev}/include/smpeg" ] super.SDL-mpeg; - # https://github.com/ivanperez-keera/hcwiid/pull/4 - hcwiid = overrideCabal (drv: { - configureFlags = (drv.configureFlags or [ ]) ++ [ - "--extra-lib-dirs=${pkgs.bluez.out}/lib" - "--extra-lib-dirs=${pkgs.cwiid}/lib" - "--extra-include-dirs=${pkgs.cwiid}/include" - "--extra-include-dirs=${pkgs.bluez.dev}/include" - ]; - prePatch = ''sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal"''; - }) super.hcwiid; - # cabal2nix doesn't pick up some of the dependencies. ginsu = let diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e4046f6bc884..757ef24339fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -309381,7 +309381,6 @@ self: { ]; description = "A breakout game written in Yampa using SDL"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "haskanoid"; } ) { }; @@ -325423,7 +325422,7 @@ self: { ) { bluetooth = null; - inherit (pkgs) cwiid; + cwiid = null; }; hdaemonize = callPackage (