Merge pull request #172982 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
2 years ago · 0dbbfdd03f
parent 037af08082 859c2499fb
commit 0dbbfdd03f
10 changed files with 683 additions and 290 deletions
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@ -1,6 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
-#! nix-shell -p hydra_unstable
+#! nix-shell -p hydra-unstable
 #! nix-shell -i runhaskell

 {-
@ -20,14 +20,12 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
-{-# OPTIONS_GHC -Wall #-}
 {-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE TupleSections #-}
+{-# OPTIONS_GHC -Wall #-}

 import Control.Monad (forM_, (<=<))
 import Control.Monad.Trans (MonadIO (liftIO))
--- a/nixos/tests/xmonad.nix
+++ b/nixos/tests/xmonad.nix
@ -13,7 +13,9 @@ let
    import System.Environment (getArgs)
    import System.FilePath ((</>))

-    main = launch $ def { startupHook = startup } `additionalKeysP` myKeys
+    main = do
+      dirs <- getDirectories
+      launch (def { startupHook = startup } `additionalKeysP` myKeys) dirs

    startup = isSessionStart >>= \sessInit ->
      spawn "touch /tmp/${name}"
@ -23,14 +25,15 @@ let

    compiledConfig = printf "xmonad-%s-%s" arch os

-    compileRestart resume =
-      whenX (recompile True) $
+    compileRestart resume = do
+      dirs <- asks directories
+
+      whenX (recompile dirs True) $
        when resume writeStateToFile
          *> catchIO
            ( do
-                dir <- getXMonadDataDir
                args <- getArgs
-                executeFile (dir </> compiledConfig) False args Nothing
+                executeFile (cacheDir dirs </> compiledConfig) False args Nothing
            )
  '';

@ -94,7 +97,7 @@ in {

    # set up the new config
    machine.succeed("mkdir -p ${user.home}/.xmonad")
-    machine.copy_from_host("${newConfig}", "${user.home}/.xmonad/xmonad.hs")
+    machine.copy_from_host("${newConfig}", "${user.home}/.config/xmonad/xmonad.hs")

    # recompile xmonad using the new config
    machine.send_key("alt-ctrl-q")
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "38aa99a1623af5371157721c2a4b033b828e9938",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/38aa99a1623af5371157721c2a4b033b828e9938.tar.gz",
-  "sha256": "0phak7cjg3nrj5i3ih2k95hcwx25s6zijbp81ycqd0yb108gvw34",
-  "msg": "Update from Hackage at 2022-05-10T13:45:20Z"
+  "commit": "2c56a18f7c408d4fd67a3667d93cab163692fc53",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c56a18f7c408d4fd67a3667d93cab163692fc53.tar.gz",
+  "sha256": "0yvikmygrb6gb0lv4jp00rsqnagvkrc94sgmrn1gfjlmazss77z5",
+  "msg": "Update from Hackage at 2022-05-14T01:13:33Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -217,6 +217,7 @@ self: super: {
  persistent-zookeeper = dontCheck super.persistent-zookeeper;
  pocket-dns = dontCheck super.pocket-dns;
  postgresql-simple = dontCheck super.postgresql-simple;
+  squeal-postgresql = dontCheck super.squeal-postgresql;
  postgrest = dontCheck super.postgrest;
  postgrest-ws = dontCheck super.postgrest-ws;
  snowball = dontCheck super.snowball;
@ -859,9 +860,10 @@ self: super: {
    testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
  }) (super.sensei.overrideScope (self: super: {
    hspec-meta = self.hspec-meta_2_9_3;
-    hspec = self.hspec_2_9_7;
-    hspec-core = dontCheck self.hspec-core_2_9_7;
-    hspec-discover = self.hspec-discover_2_9_7;
+    hspec = self.hspec_2_10_0;
+    hspec-core = dontCheck self.hspec-core_2_10_0;
+    hspec-discover = self.hspec-discover_2_10_0;
+    shelly = dontCheck super.shelly; # disable checks, because the newer hspec in this overrideScope doesn‘t work with newest hspec-contrib
  }));

  # Depends on broken fluid.
@ -2012,8 +2014,6 @@ self: super: {
  haveibeenpwned = doJailbreak super.haveibeenpwned;

  # Too strict version bounds on ghc-events
-  # https://github.com/haskell/ThreadScope/issues/118
-  threadscope = doJailbreak super.threadscope;
  # https://github.com/mpickering/hs-speedscope/issues/16
  hs-speedscope = doJailbreak super.hs-speedscope;

@ -2654,4 +2654,39 @@ self: super: {
  servant-cassava = assert super.servant-cassava.version == "0.10.1";
    doJailbreak super.servant-cassava;

+  # Fix tests failure for ghc 9 (https://github.com/clinty/debian-haskell/pull/3)
+  debian = appendPatch (fetchpatch {
+    name = "debian-haskell.3.patch";
+    url = "https://github.com/clinty/debian-haskell/pull/3/commits/47441c8e4a7a00a3c8825eec98bf7a823594f9be.patch";
+    sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd";
+  }) super.debian;
+
+  # Raise version bounds for hspec
+  records-sop = appendPatch (fetchpatch {
+    url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch";
+    sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI=";
+  }) super.records-sop;
+
+  # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20)
+  polynomial = appendPatch (fetchpatch {
+    name = "haskell-polynomial.20.patch";
+    url = "https://github.com/mokus0/polynomial/pull/20.diff";
+    sha256 = "1bwivimpi2hiil3zdnl5qkds1inyn239wgxbn3y8l2pwyppnnfl0";
+  })
+  (overrideCabal (drv: {
+    revision = null;
+    editedCabalFile = null;
+    doCheck = false; # Source dist doesn't include the checks
+  })
+  super.polynomial);
+
+  fast-tags = appendPatches [
+    (fetchpatch {
+      name = "fast-tags-ghc-9.0-fix-test-nondeterminism.patch";
+      url = "https://github.com/elaforge/fast-tags/commit/af861acc2dd239fedd8b169ddc5e3fa694e7af57.patch";
+      sha256 = "0ml678q1n29daqnxsb5p94s5lf7a6dk4lqbbgmiayxrbyxnlbi4f";
+      excludes = [ ".github/**" ];
+    })
+  ] super.fast-tags;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -115,7 +115,7 @@ self: super: {
  lifted-async = doJailbreak super.lifted-async;
  lukko = doJailbreak super.lukko;
  lzma-conduit = doJailbreak super.lzma-conduit;
-  ormolu = self.ormolu_0_4_0_0;
+  ormolu = self.ormolu_0_5_0_0;
  parallel = doJailbreak super.parallel;
  path = doJailbreak super.path;
  polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
@ -209,6 +209,7 @@ self: super: {
  fourmolu = super.fourmolu_0_6_0_0;
  # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
  hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
+  hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin;
  implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
  # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
  hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -525,6 +525,7 @@ broken-packages:
  - cabal-bundle-clib
  - cabal-constraints
  - cabal-db
+  - cabal-debian
  - cabal-dependency-licenses
  - cabal-detailed-quickcheck
  - cabal-dev
@ -1031,7 +1032,6 @@ broken-packages:
  - dead-code-detection
  - Deadpan-DDP
  - dead-simple-json
-  - debian
  - debug-me
  - debug-tracy
  - decepticons
@ -1404,7 +1404,6 @@ broken-packages:
  - fast-nats
  - fastpbkdf2
  - FastPush
-  - fast-tags
  - FastxPipe
  - fathead-util
  - fb
@ -1586,6 +1585,7 @@ broken-packages:
  - fused-effects-exceptions
  - fused-effects-mwc-random
  - fused-effects-resumable
+  - fused-effects-squeal
  - fusion
  - futhask
  - futun
@ -2851,6 +2851,7 @@ broken-packages:
  - lagrangian
  - lambda2js
  - lambdaBase
+  - lambdabot-telegram-plugins
  - lambdabot-utils
  - lambdabot-xmpp
  - lambda-bridge
@ -3936,7 +3937,6 @@ broken-packages:
  - poly-control
  - polydata-core
  - polynom
-  - polynomial
  - polynomial-algebra
  - polysemy-check
  - polysemy-keyed-state
@ -3979,6 +3979,7 @@ broken-packages:
  - postgresql-simple-sop
  - postgresql-transactional
  - postgresql-tx-simple
+  - postgresql-tx-squeal
  - postgresql-typed-lifted
  - postgres-tmp
  - postgrest-ws
@ -4217,7 +4218,6 @@ broken-packages:
  - record
  - record-encode
  - records
-  - records-sop
  - record-wrangler
  - recursion-schemes-ext
  - recursion-schemes-ix
@ -4774,6 +4774,7 @@ broken-packages:
  - spir-v
  - splay
  - splaytree
+  - splines
  - split-morphism
  - splitter
  - Spock-api-ghcjs
@ -5122,7 +5123,6 @@ broken-packages:
  - thorn
  - th-pprint
  - threadmanager
-  - threadscope
  - thread-supervisor
  - threepenny-editors
  - threepenny-gui-contextmenu
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -188,6 +188,7 @@ package-maintainers:
    - hakyll
    - hakyll-contrib-hyphenation
    - webify
+    - squeal-postgresql
  Gabriel439:
    - annah
    - bench
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -873,7 +873,6 @@ dont-distribute-packages:
 - cabal-bounds
 - cabal-cache
 - cabal-cargs
- - cabal-debian
 - cabal-query
 - cabal-test
 - cabal2arch
@ -1361,7 +1360,6 @@ dont-distribute-packages:
 - enumerator-tf
 - enumfun
 - ephemeral
- - erf-native
 - eros-client
 - eros-http
 - error-message
@ -1546,7 +1544,6 @@ dont-distribute-packages:
 - funion
 - funnyprint
 - funsat
- - fused-effects-squeal
 - fwgl-glfw
 - fwgl-javascript
 - fxpak
@ -2485,6 +2482,7 @@ dont-distribute-packages:
 - keera-hails-reactive-yampa
 - keera-hails-reactivelenses
 - keera-posture
+ - keid-frp-banana
 - keid-geometry
 - keid-render-basic
 - keid-resource-gltf
@ -3141,7 +3139,6 @@ dont-distribute-packages:
 - postgresql-simple-queue
 - postgresql-simple-typed
 - postgresql-tx-query
- - postgresql-tx-squeal
 - postgresql-tx-squeal-compat-simple
 - postgrest
 - postmark
@ -3691,7 +3688,6 @@ dont-distribute-packages:
 - sphinx-cli
 - spice
 - spike
- - splines
 - sprinkles
 - sql-simple-mysql
 - sql-simple-pool
@ -3699,9 +3695,6 @@ dont-distribute-packages:
 - sql-simple-sqlite
 - sqlite-simple-typed
 - sqsd-local
- - squeal-postgresql
- - squeal-postgresql-ltree
- - squeal-postgresql-uuid-ossp
 - sr-extra
 - sscgi
 - sshd-lint
@ -4063,7 +4056,6 @@ dont-distribute-packages:
 - viewprof
 - vigilance
 - vimeta
- - vinyl-generics
 - vinyl-operational
 - vision
 - visual-graphrewrite
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -144,7 +144,14 @@ let

      tests.haskell = packagePlatforms pkgs.tests.haskell;

-      nixosTests.agda = (packagePlatforms pkgs.nixosTests).agda;
+      nixosTests = {
+        inherit (packagePlatforms pkgs.nixosTests)
+          agda
+          xmonad
+          xmonad-xdg-autostart
+        ;
+      };
+
      agdaPackages = packagePlatforms pkgs.agdaPackages;

      # top-level packages that depend on haskellPackages