diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 402fe4b56c1e..48b833a10b2e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -752,6 +752,7 @@ self: super: { translatable-intset = dontCheck super.translatable-intset; ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; + universe-some = dontCheck super.universe-some; wai-logger = dontCheck super.wai-logger; WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw webdriver = dontCheck super.webdriver; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 624b767f47c9..cbda98a04796 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -106,6 +106,7 @@ self: super: { stripe-signature = doJailbreak super.stripe-signature; # text >=1.2.5 && <1.3 || >=2.0 && <2.1 string-random = doJailbreak super.string-random; # text >=1.2.2.1 && <2.1 inflections = doJailbreak super.inflections; # text >=0.2 && <2.1 + universe-some = doJailbreak super.universe-some; # th-abstraction < 0.7 # # Test suite issues diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2c1c9578a5b7..222a12dde7d9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -6287,7 +6287,6 @@ broken-packages: - universal-binary # failure in job https://hydra.nixos.org/build/233240583 at 2023-09-02 - universe-instances-base # failure in job https://hydra.nixos.org/build/233197845 at 2023-09-02 - universe-instances-trans # failure in job https://hydra.nixos.org/build/233235623 at 2023-09-02 - - universe-some # failure in job https://hydra.nixos.org/build/233254356 at 2023-09-02 - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02 - unix-memory # failure in job https://hydra.nixos.org/build/252735802 at 2024-03-16 - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 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 b58da3ac10b6..b1f3384b91ff 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -4100,8 +4100,6 @@ dont-distribute-packages: - unitym-servant - unitym-yesod - universal - - universe - - universe-dependent-sum - universe-th - unix-fcntl - unpacked-these diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 238ba5f804ff..eebe41c65eb9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -314608,7 +314608,6 @@ self: { ]; description = "A class for finite and recursively enumerable types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "universe-base" = callPackage @@ -314637,7 +314636,6 @@ self: { libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "universe-instances-base" = callPackage @@ -314717,8 +314715,6 @@ self: { testHaskellDepends = [ base some template-haskell universe-base ]; description = "Universe instances for Some from some"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "universe-th" = callPackage