diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec0545a89281..78eef4126147 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,6 +204,15 @@ self: super: { # Too strict bounds on optparse-applicative weeder = lib.warnIf (lib.versionAtLeast super.weeder.version "2.8.0") "jailbreak on weeder may be obsolete" doJailbreak super.weeder; + # test dependency has incorrect upper bound but still supports the newer dependency + # https://github.com/fused-effects/fused-effects/issues/451 + # https://github.com/fused-effects/fused-effects/pull/452 + fused-effects = doJailbreak super.fused-effects; + + # support for transformers >= 0.6 + fused-effects-random = doJailbreak super.fused-effects-random; + fused-effects-readline = doJailbreak super.fused-effects-readline; + # Allow scotty < 0.21 # For < 0.22 add https://github.com/taffybar/taffybar/commit/71fe820d892a85e49ad2f2843eac0a59e01f3fd4 taffybar = appendPatches [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3d63f4c2ae13..71867acc3ec1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1872,7 +1872,6 @@ broken-packages: - funpat # failure in job https://hydra.nixos.org/build/233222123 at 2023-09-02 - funspection # failure in job https://hydra.nixos.org/build/233227352 at 2023-09-02 - fused-effects-exceptions # failure in job https://hydra.nixos.org/build/233203744 at 2023-09-02 - - fused-effects # failure in job https://hydra.nixos.org/build/252724943 at 2024-03-16 - fused-effects-mwc-random # failure in job https://hydra.nixos.org/build/233253228 at 2023-09-02 - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d315bce3bf6b..865e22e358ce 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1488,10 +1488,6 @@ dont-distribute-packages: - funion - funnyprint - funsat - - fused-effects-lens - - fused-effects-optics - - fused-effects-random - - fused-effects-readline - fused-effects-squeal - fwgl-glfw - fwgl-javascript @@ -2113,7 +2109,6 @@ dont-distribute-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hinit - hinvaders - hinze-streams - hipbot @@ -2813,7 +2808,6 @@ dont-distribute-packages: - monad-metrics-extensible - monad-state - monad-stlike-stm - - monadic-bang - monadiccp-gecode - monarch - monetdb-mapi diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 03301c25a7da..f27f38f07f58 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22741,6 +22741,7 @@ self: { ]; description = "A binding to the X11 graphics library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.slotThe ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -22812,6 +22813,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft and some Xrender parts"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.slotThe ]; }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage @@ -112887,8 +112889,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fused-effects-exceptions" = callPackage @@ -112920,7 +112920,6 @@ self: { testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-mwc-random" = callPackage @@ -112954,7 +112953,6 @@ self: { libraryHaskellDepends = [ base fused-effects optics-core ]; description = "Bridge between the optics and fused-effects ecosystems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-random" = callPackage @@ -112966,7 +112964,6 @@ self: { libraryHaskellDepends = [ base fused-effects random transformers ]; description = "Random number generation for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-readline" = callPackage @@ -112986,7 +112983,6 @@ self: { testHaskellDepends = [ base ]; description = "A readline-like effect and carrier for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-resumable" = callPackage @@ -147987,7 +147983,6 @@ self: { ]; description = "Generic project initialization tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hi"; maintainers = [ lib.maintainers.poscat ]; }) {}; @@ -161284,6 +161279,7 @@ self: { description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "html-presentation-text" = callPackage @@ -205054,7 +205050,6 @@ self: { testHaskellDepends = [ base ghc ghc-boot ghc-paths transformers ]; description = "GHC plugin to desugar ! into do-notation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "monadic-recursion-schemes" = callPackage @@ -222219,6 +222214,7 @@ self: { description = "Utility functions for working with optparse-applicative"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.slotThe ]; broken = true; }) {}; @@ -328099,7 +328095,7 @@ self: { mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328132,7 +328128,7 @@ self: { mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328179,7 +328175,7 @@ self: { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328286,6 +328282,7 @@ self: { description = "Third party extensions for xmonad with wacky dependencies"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "xmonad-screenshot" = callPackage