haskellPackages: Fix more eval errors

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

@@ -231,7 +231,6 @@ self: super: {
   # ghc 8.10.
   hnix = dontCheck (super.hnix.override {
     # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
-    neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1
     prettyprinter = self.prettyprinter_1_7_0; # at least 1.7
 
   });
@@ -336,12 +335,6 @@ self: super: {
     else super.math-functions;
   matplotlib = dontCheck super.matplotlib;
 
-  # Needs the latest version of vty and brick.
-  matterhorn = super.matterhorn.overrideScope (self: super: {
-    brick = self.brick_0_57;
-    vty = self.vty_5_32;
-  });
-
   memcache = dontCheck super.memcache;
   metrics = dontCheck super.metrics;
   milena = dontCheck super.milena;

pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix

@@ -66,7 +66,6 @@ self: super: {
   integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
   lukko = doJailbreak super.lukko;
   parallel = doJailbreak super.parallel;
-  primitive = doJailbreak super.primitive_0_7_1_0;
   regex-posix = doJailbreak super.regex-posix;
   resolv = doJailbreak super.resolv;
   singleton-bool = doJailbreak super.singleton-bool;

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

@@ -2781,6 +2781,7 @@ dont-distribute-packages:
   - accelerate-io-JuicyPixels
   - accelerate-io-repa
   - accelerate-io-vector
+  - accelerate-kullback-liebler
   - accelerate-llvm-ptx
   - bindings-yices
   - boolector
@@ -2807,7 +2808,10 @@ dont-distribute-packages:
   - yices-painless
 
   # these packages don't evaluate because they have broken (system) dependencies
+  - XML
   - comark
+  - couch-simple
+  - diagrams-hsqml
   - diagrams-reflex
   - dialog
   - fltkhs-demos
@@ -2817,14 +2821,27 @@ dont-distribute-packages:
   - ghcjs-dom-hello
   - ghcjs-dom-webkit
   - gi-javascriptcore
+  - gi-webkit
   - gi-webkit2
   - gi-webkit2webextension
-  - gi-webkit
   - gsmenu
   - haste-gapi
   - haste-perch
   - hbro
   - hplayground
+  - hs-mesos
+  - hsqml
+  - hsqml-datamodel
+  - hsqml-datamodel-vinyl
+  - hsqml-datemodel-vinyl
+  - hsqml-demo-manic
+  - hsqml-demo-morris
+  - hsqml-demo-notes
+  - hsqml-demo-notes
+  - hsqml-demo-samples
+  - hsqml-morris
+  - hsqml-morris
+  - hstorchat
   - imprevu-happstack
   - jsaddle-webkit2gtk
   - jsaddle-webkitgtk
@@ -2855,10 +2872,13 @@ dont-distribute-packages:
   - wai-middleware-brotli
   - web-browser-in-haskell
   - webkit
-  - webkitgtk3-javascriptcore
   - webkitgtk3
+  - webkitgtk3-javascriptcore
   - websnap
-  - XML
 
 broken-packages:
   # These packages don't compile or depend on packages that don't compile.
+  - git-remote-ipfs
+  - ipld-cid
+  - multibase
+  - multihash-serialise

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

@@ -20940,6 +20940,7 @@ self: {
        doHaddock = false;
        description = "Kullback-Liebler divergence";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -59147,6 +59148,7 @@ self: {
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -68673,6 +68675,7 @@ self: {
        ];
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -95944,6 +95947,8 @@ self: {
        ];
        description = "Git remote helper to store git objects on IPFS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-repair" = callPackage
@@ -123316,6 +123321,7 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mesos = null; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -126698,6 +126704,7 @@ self: {
        ];
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -126710,6 +126717,7 @@ self: {
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -126725,6 +126733,7 @@ self: {
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -126741,6 +126750,7 @@ self: {
        ];
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -126759,6 +126769,7 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -126777,6 +126788,7 @@ self: {
        ];
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -126791,6 +126803,7 @@ self: {
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -126809,6 +126822,7 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsreadability" = callPackage
@@ -127065,6 +127079,7 @@ self: {
        ];
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstox" = callPackage
@@ -136789,6 +136804,8 @@ self: {
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipopt-hs" = callPackage
@@ -165395,6 +165412,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multifile" = callPackage
@@ -165497,6 +165516,8 @@ self: {
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihashmap" = callPackage