diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad5ce6b7aea93..dc4059c8a9378 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2635,4 +2635,12 @@ in { # 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; }; + + # 2022-11-03: Builds with brick 1.3 which in turn works with text-zipper 0.12 + # Other dependencies are resolved with doJailbreak for both swarm and brick_1_3 + swarm = doJailbreak (super.swarm.override { + brick = doJailbreak (dontCheck (super.brick_1_3.override { + text-zipper = super.text-zipper_0_12; + })); + }); }) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7610a82814dcc..055962bc4abc3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4969,7 +4969,6 @@ broken-packages: - swagger - swagger-petstore - swagger-test - - swarm - swearjure - swf - swift-lda diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 51e58be7f3d7d..aec54b5f706ed 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -108,6 +108,7 @@ extra-packages: - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - brick == 1.3 # 2022-11-03: needed by swarm 0.1.1.0 - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8e0ca37c4a2ae..35b7da7452abb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -48431,6 +48431,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "brick_1_3" = callPackage + ({ mkDerivation, base, bimap, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, exceptions + , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck + , stm, template-haskell, text, text-zipper, unix, vector, vty + , word-wrap + }: + mkDerivation { + pname = "brick"; + version = "1.3"; + sha256 = "0lpd6685ya0va0a6n7cw70f5b1s13y8ynzac0gkxyqb1ivzj0hsb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bimap bytestring config-ini containers contravariant + data-clist deepseq directory exceptions filepath microlens + microlens-mtl microlens-th mtl stm template-haskell text + text-zipper unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector vty + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick_1_4" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions @@ -275812,9 +275839,7 @@ self: { ]; description = "2D resource gathering game with programmable robots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "swarm"; - broken = true; }) {}; "swearjure" = callPackage