Merge pull request #203489 from arcz/haskell-unbreaks

haskellPackages: unbreak selected packages

pkgs/development/haskell-modules/configuration-common.nix

@@ -2315,4 +2315,26 @@ self: super: {
 
   # unix-compat <0.5
   hxt-cache = doJailbreak super.hxt-cache;
+
+  # base <4.16
+  fast-builder = doJailbreak super.fast-builder;
+
+  # QuickCheck <2.14
+  term-rewriting = doJailbreak super.term-rewriting;
+
+  # tests can't find the test binary anymore - parseargs-example
+  parseargs = dontCheck super.parseargs;
+
+  # base <4.14
+  decimal-literals = doJailbreak super.decimal-literals;
+
+  # multiple bounds too strict
+  snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple;
+
+  # doctest <0.19
+  polysemy = doJailbreak super.polysemy;
+
+  # multiple bounds too strict
+  co-log-polysemy = doJailbreak super.co-log-polysemy;
+  co-log-polysemy-formatting = doJailbreak super.co-log-polysemy-formatting;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -414,7 +414,6 @@ broken-packages:
   - bizzlelude-js
   - bkr
   - blakesum
-  - Blammo
   - blas
   - blaze-html-contrib
   - blaze-html-hexpat
@@ -753,7 +752,6 @@ broken-packages:
   - collections-api
   - co-log-concurrent
   - co-log-json
-  - co-log-polysemy-formatting
   - co-log-sys
   - colonnade
   - colorless
@@ -1044,7 +1042,6 @@ broken-packages:
   - dead-simple-json
   - debug-tracy
   - decepticons
-  - decimal-literals
   - DecisionTree
   - decoder-conduit
   - deepcontrol
@@ -3737,7 +3734,6 @@ broken-packages:
   - PArrows
   - Parry
   - parse
-  - parseargs
   - parsec2
   - parsec3
   - parsec-free
@@ -3943,7 +3939,6 @@ broken-packages:
   - polysemy-keyed-state
   - polysemy-kvstore-jsonfile
   - polysemy-log-co
-  - polysemy-managed
   - polysemy-mocks
   - polysemy-readline
   - polysemy-scoped-fs
@@ -4534,7 +4529,6 @@ broken-packages:
   - servant-namedargs
   - servant-nix
   - servant-pandoc
-  - servant-polysemy
   - servant-pool
   - servant-proto-lens
   - servant-purescript
@@ -4911,7 +4905,6 @@ broken-packages:
   - stripe
   - stripe-core
   - stripe-servant
-  - strongweak
   - structural-traversal
   - structures
   - stt
@@ -5071,7 +5064,6 @@ broken-packages:
   - termbox-tea
   - termination-combinators
   - termplot
-  - term-rewriting
   - terntup
   - tersmu
   - tesla

pkgs/development/haskell-modules/hackage-packages.nix

@@ -2083,8 +2083,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Batteries-included Structured Logging library";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlastHTTP" = callPackage
@@ -61386,9 +61384,7 @@ self: {
        ];
        description = "A Polysemy logging effect for high quality (unstructured) logs";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "example";
-       broken = true;
      }) {};
 
   "co-log-sys" = callPackage
@@ -76774,8 +76770,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
        license = lib.licenses.gpl3Only;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "decision-diagrams" = callPackage
@@ -212272,9 +212266,7 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "parseargs-example";
-       broken = true;
      }) {};
 
   "parsec_3_1_15_1" = callPackage
@@ -221824,8 +221816,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Primitive functions and data types";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysemy-methodology" = callPackage
@@ -252956,8 +252946,6 @@ self: {
        ];
        description = "Utilities for using servant in a polysemy stack";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pool" = callPackage
@@ -271233,8 +271221,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Convert between strong and weak representations of types";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "strptime" = callPackage
@@ -279442,8 +279428,6 @@ self: {
        testHaskellDepends = [ base containers HUnit QuickCheck ];
        description = "Term Rewriting Library";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "termbox" = callPackage