Merge pull request #169513 from NixOS/haskell-updates

haskellPackages: update stackage and hackage

maintainers/maintainer-list.nix

@@ -7199,6 +7199,13 @@
     githubId = 1769386;
     name = "Liam Diprose";
   };
+  libjared = {
+    email = "jared@perrycode.com";
+    github = "libjared";
+    githubId = 3746656;
+    matrix = "@libjared:matrix.org";
+    name = "Jared Perry";
+  };
   liff = {
     email = "liff@iki.fi";
     github = "liff";

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "e5167f06cba67fa268ebafb97f5ccbffe412cd2a",
+  "commit": "762464dcc5ce93f1c6a9a746feb6bd1bd0c47006",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e5167f06cba67fa268ebafb97f5ccbffe412cd2a.tar.gz",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/762464dcc5ce93f1c6a9a746feb6bd1bd0c47006.tar.gz",
-  "sha256": "1ihkrjk7a24wbzjz4wlx3mdh88bbq4665l1ld7gxs5jaimcmhn5j",
+  "sha256": "0k1qp34lsc08a99p669v8n0fxs6mdzwc2bz87v0hdah4qagi4z4g",
-  "msg": "Update from Hackage at 2022-04-09T11:23:17Z"
+  "msg": "Update from Hackage at 2022-04-20T23:34:08Z"
 }

pkgs/development/compilers/ghc/8.10.2-binary.nix

@@ -272,6 +272,20 @@ stdenv.mkDerivation rec {
     lib.optionalString stdenv.isLinux ''
       find . -type f -executable -exec patchelf \
           --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
+    '' +
+    # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path
+    # substitution. Which can break the build if the store path / prefix happens
+    # to contain this string. This will be fixed with 9.4 bindists.
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/21402
+    ''
+      # Detect hadrian Makefile by checking for the target that has the problem
+      if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then
+        echo Hadrian bindist, applying workaround for xxx path substitution.
+        # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch
+        substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'
+      else
+        echo Not a hadrian bindist, not applying xxx path workaround.
+      fi
     '';
 
   # fix for `configure: error: Your linker is affected by binutils #16177`

pkgs/development/compilers/ghc/8.10.7-binary.nix

@@ -270,6 +270,20 @@ stdenv.mkDerivation rec {
     lib.optionalString stdenv.isLinux ''
       find . -type f -executable -exec patchelf \
           --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
+    '' +
+    # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path
+    # substitution. Which can break the build if the store path / prefix happens
+    # to contain this string. This will be fixed with 9.4 bindists.
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/21402
+    ''
+      # Detect hadrian Makefile by checking for the target that has the problem
+      if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then
+        echo Hadrian bindist, applying workaround for xxx path substitution.
+        # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch
+        substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0'
+      else
+        echo Not a hadrian bindist, not applying xxx path workaround.
+      fi
     '';
 
   # fix for `configure: error: Your linker is affected by binutils #16177`

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

@@ -687,9 +687,6 @@ self: super: {
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 
-  # 2022-03-24: Strict aeson bound: https://github.com/berberman/nvfetcher/pull/63
-  nvfetcher = throwIfNot (super.nvfetcher.version == "0.4.0.0") "nvfetcher: remove jailbreak after update" doJailbreak super.nvfetcher;
-
   # 2022-03-24: Strict aeson bound:
   arch-web = throwIfNot (super.arch-web.version == "0.1.0") "arch-web: remove jailbreak after update"  doJailbreak super.arch-web;
 
@@ -854,6 +851,18 @@ self: super: {
   # test suite requires git and does a bunch of git operations
   restless-git = dontCheck super.restless-git;
 
+  # requires git at test-time *and* runtime, but we'll just rely on users to
+  # bring their own git at runtime
+  sensei = overrideCabal (drv: {
+    testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
+    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;
+  }));
+
   # Depends on broken fluid.
   fluid-idl-http-client = markBroken super.fluid-idl-http-client;
   fluid-idl-scotty = markBroken super.fluid-idl-scotty;
@@ -1154,6 +1163,16 @@ self: super: {
   # https://github.com/danfran/cabal-macosx/issues/13
   cabal-macosx = dontCheck super.cabal-macosx;
 
+  # Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites
+  # https://github.com/typeable/generic-arbitrary/issues/14
+  generic-arbitrary = appendPatches [
+    (pkgs.fetchpatch {
+      name = "generic-arbitrary-no-negative-resize.patch";
+      url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
+      sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
+    })
+  ] super.generic-arbitrary;
+
   # https://github.com/DanielG/cabal-helper/pull/123
   cabal-helper = doJailbreak super.cabal-helper;
 
@@ -2584,15 +2603,6 @@ self: super: {
   # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15
   base-noprelude = doJailbreak super.base-noprelude;
 
-  # Manually upgrade cryptostore to work around
-  # https://github.com/ocheron/cryptostore/issues/7
-  cryptostore = assert super.cryptostore.version == "0.2.1.0"; overrideCabal {
-    version = "0.2.2.0";
-    sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx";
-    revision = null;
-    editedCabalFile = null;
-  } super.cryptostore;
-
   # 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10
   dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans;
 

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

@@ -290,4 +290,10 @@ self: super: ({
 
   # https://github.com/haskell-crypto/cryptonite/issues/360
   cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite;
+
+} // lib.optionalAttrs pkgs.stdenv.isx86_64 {  # x86_64-darwin
+
+  # tests appear to be failing to link or something:
+  # https://hydra.nixos.org/build/174540882/nixlog/9
+  regex-rure = dontCheck super.regex-rure;
 })

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

@@ -130,4 +130,11 @@ self: super: {
 
   # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)
   inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;
+
+  # Depends on OneTuple for GHC < 9.0
+  universe-base = addBuildDepends [ self.OneTuple ] super.universe-base;
+
+  # Not possible to build in the main GHC 9.0 package set
+  # https://github.com/awakesecurity/spectacle/issues/49
+  spectacle = doDistribute (markUnbroken super.spectacle);
 }

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

@@ -162,4 +162,7 @@ self: super: {
 
   # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)
   inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;
+
+  # Depends on OneTuple for GHC < 9.0
+  universe-base = addBuildDepends [ self.OneTuple ] super.universe-base;
 }

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

@@ -80,6 +80,7 @@ self: super: {
   constraints = doJailbreak super.constraints;
   cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
   data-fix = doJailbreak super.data-fix;
+  dbus = super.dbus_1_2_24;
   dec = doJailbreak super.dec;
   ed25519 = doJailbreak super.ed25519;
   ghc-byteorder = doJailbreak super.ghc-byteorder;
@@ -170,7 +171,7 @@ self: super: {
   ];
 
   # lens >= 5.1 supports 9.2.1
-  lens = super.lens_5_1;
+  lens = doDistribute self.lens_5_1;
 
   # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
   alex = dontCheck super.alex;

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

@@ -357,7 +357,6 @@ broken-packages:
   - binary-communicator
   - binary-derive
   - binary-ext
-  - binary-generic-combinators
   - binary-indexed-tree
   - binary-protocol
   - binary-tree
@@ -669,6 +668,8 @@ broken-packages:
   - citeproc-hs
   - cjk
   - cj-token
+  - cl3-hmatrix-interface
+  - cl3-linear-interface
   - clang-compilation-database
   - clang-pure
   - clanki
@@ -1048,6 +1049,7 @@ broken-packages:
   - dense-int-set
   - dependent-hashmap
   - dependent-monoidal-map
+  - dep-t
   - dep-t-dynamic
   - deptrack-core
   - derangement
@@ -1208,6 +1210,7 @@ broken-packages:
   - dynamic-object
   - dynamic-pipeline
   - DynamicTimeWarp
+  - dyna-processing
   - dynloader
   - DysFRP
   - dywapitchtrack
@@ -1600,6 +1603,7 @@ broken-packages:
   - gegl
   - gelatin
   - gemcap
+  - gemini-exports
   - gemstone
   - gencheck
   - gender
@@ -1736,6 +1740,7 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
+  - glirc
   - GLMatrix
   - global-variables
   - glob-posix
@@ -1774,6 +1779,7 @@ broken-packages:
   - gpah
   - GPipe
   - GPipe-GLFW4
+  - gpmf
   - gpx-conduit
   - graceful
   - grafana
@@ -1890,6 +1896,7 @@ broken-packages:
   - hakyll-typescript
   - HaLeX
   - halfs
+  - half-space
   - halipeto
   - halive
   - halma
@@ -2103,6 +2110,7 @@ broken-packages:
   - hedgehog-checkers
   - hedgehog-generic
   - hedgehog-golden
+  - hedgehog-lens
   - hedgehog-servant
   - hedis-config
   - hedis-namespace
@@ -2894,6 +2902,7 @@ broken-packages:
   - lazify
   - lazyarray
   - lazyboy
+  - lazy-bracket
   - lazy-priority-queue
   - lazyset
   - LazyVault
@@ -3334,7 +3343,6 @@ broken-packages:
   - msgpack
   - msgpack-binary
   - msgpack-persist
-  - msgpack-types
   - msh
   - msi-kb-backlit
   - MTGBuilder
@@ -3600,7 +3608,6 @@ broken-packages:
   - open-signals
   - opensoundcontrol-ht
   - openssh-protocol
-  - opentelemetry-extra
   - opentelemetry-http-client
   - opentheory-char
   - opentok
@@ -4337,7 +4344,6 @@ broken-packages:
   - robin
   - robots-txt
   - roc-cluster
-  - roc-id
   - roku-api
   - rollbar-client
   - rollbar-hs
@@ -4467,7 +4473,6 @@ broken-packages:
   - semigroups-actions
   - sendgrid-haskell
   - sendgrid-v3
-  - sensei
   - sensu-run
   - sentry
   - separated

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

@@ -251,6 +251,8 @@ package-maintainers:
     - mattermost-api
     - mattermost-api-qc
     - Unique
+  libjared:
+    - sensei
   maralorn:
     - cabal-fmt
     - ema
@@ -463,6 +465,7 @@ unsupported-platforms:
   libmodbus:                                    [ x86_64-darwin, aarch64-darwin ]
   libsystemd-journal:                           [ x86_64-darwin, aarch64-darwin ]
   libtelnet:                                    [ x86_64-darwin, aarch64-darwin ]
+  libvirt-hs:                                   [ x86_64-darwin ] # spidermonkey is not supported on darwin
   libzfs:                                       [ x86_64-darwin, aarch64-darwin ]
   linearEqSolver:                               [ aarch64-linux ]
   linux-evdev:                                  [ x86_64-darwin, aarch64-darwin ]
@@ -505,6 +508,7 @@ unsupported-platforms:
   scrypt:                                       [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8
   sdl2-mixer:                                   [ x86_64-darwin, aarch64-darwin ]
   sdl2-ttf:                                     [ x86_64-darwin, aarch64-darwin ]
+  sensei:                                       [ x86_64-darwin ]
   synthesizer-alsa:                             [ x86_64-darwin, aarch64-darwin ]
   taffybar:                                     [ x86_64-darwin, aarch64-darwin ]
   termonad:                                     [ x86_64-darwin, aarch64-darwin ]

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

@@ -1,4 +1,4 @@
-# Stackage LTS 19.3
+# Stackage LTS 19.4
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -24,6 +24,7 @@ default-package-overrides:
   - aeson-casing ==0.2.0.0
   - aeson-commit ==1.4
   - aeson-compat ==0.3.10
+  - aeson-diff ==1.1.0.12
   - aeson-extra ==0.5.1
   - aeson-generic-compat ==0.0.1.3
   - aeson-optics ==1.1.1
@@ -117,6 +118,9 @@ default-package-overrides:
   - autoexporter ==2.0.0.1
   - auto-update ==0.1.6
   - aws-cloudfront-signed-cookies ==0.2.0.10
+  - aws-xray-client ==0.1.0.2
+  - aws-xray-client-persistent ==0.1.0.5
+  - aws-xray-client-wai ==0.1.0.2
   - backtracking ==0.1.0
   - bank-holidays-england ==0.2.0.7
   - barbies ==2.0.3.1
@@ -391,6 +395,7 @@ default-package-overrides:
   - conduino ==0.2.2.0
   - conduit ==1.3.4.2
   - conduit-aeson ==0.1.0.1
+  - conduit-algorithms ==0.0.12.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
   - conduit-connection ==0.1.0.5
@@ -422,9 +427,9 @@ default-package-overrides:
   - convertible ==1.1.1.0
   - cookie ==0.4.5
   - copr-api ==0.1.0
-  - core-data ==0.3.1.1
+  - core-data ==0.3.2.1
   - core-program ==0.4.5.1
-  - core-telemetry ==0.1.9.2
+  - core-telemetry ==0.1.9.3
   - core-text ==0.3.5.0
   - countable ==1.0
   - covariance ==0.1.0.6
@@ -456,7 +461,7 @@ default-package-overrides:
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
-  - cryptostore ==0.2.1.0
+  - cryptostore ==0.2.2.0
   - crypt-sha512 ==0
   - csp ==1.4.0
   - css-text ==0.1.3.0
@@ -505,6 +510,7 @@ default-package-overrides:
   - data-default-instances-unordered-containers ==0.0.1
   - data-default-instances-vector ==0.0.1
   - data-diverse ==4.7.0.0
+  - datadog ==0.3.0.0
   - data-dword ==0.3.2.1
   - data-endian ==0.1.1
   - data-fix ==0.3.2
@@ -680,7 +686,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - ersatz ==0.4.10
-  - esqueleto ==3.5.4.0
+  - esqueleto ==3.5.4.1
   - essence-of-live-coding ==0.2.6
   - essence-of-live-coding-gloss ==0.2.6
   - essence-of-live-coding-pulse ==0.2.6
@@ -998,7 +1004,7 @@ default-package-overrides:
   - haskell-src-meta ==0.8.9
   - haskey-btree ==0.3.0.1
   - haskintex ==0.8.0.0
-  - haskoin-core ==0.21.1
+  - haskoin-core ==0.21.2
   - hasktags ==0.72.0
   - hasql ==1.5.0.2
   - hasql-migration ==0.3.0
@@ -1011,7 +1017,7 @@ default-package-overrides:
   - has-transformers ==0.1.0.4
   - hasty-hamiltonian ==1.3.4
   - HaTeX ==3.22.3.1
-  - HaXml ==1.25.8
+  - HaXml ==1.25.9
   - haxr ==3000.11.4.1
   - HCodecs ==0.5.2
   - hdaemonize ==0.5.6
@@ -1537,7 +1543,7 @@ default-package-overrides:
   - mmark-cli ==0.0.5.1
   - mmark-ext ==0.2.1.5
   - mmorph ==1.1.5
-  - mnist-idx ==0.1.3.0
+  - mnist-idx ==0.1.3.1
   - mnist-idx-conduit ==0.4.0.0
   - mockery ==0.3.5
   - mock-time ==0.1.0
@@ -1747,7 +1753,7 @@ default-package-overrides:
   - pandoc-plot ==1.4.1
   - pandoc-throw ==0.1.0.0
   - pandoc-types ==1.22.2
-  - pantry ==0.5.4
+  - pantry ==0.5.5
   - parallel ==3.2.2.0
   - parallel-io ==0.3.5
   - parameterized ==0.5.0.0
@@ -1797,7 +1803,7 @@ default-package-overrides:
   - perf ==0.9.0
   - perfect-hash-generator ==0.2.0.6
   - persist ==0.1.1.5
-  - persistent ==2.13.3.4
+  - persistent ==2.13.3.5
   - persistent-discover ==0.1.0.5
   - persistent-documentation ==0.1.0.4
   - persistent-mongoDB ==2.13.0.1
@@ -1971,7 +1977,7 @@ default-package-overrides:
   - quickcheck-unicode ==1.0.1.0
   - quicklz ==1.5.0.11
   - quiet ==0.2
-  - quote-quot ==0.2.0.0
+  - quote-quot ==0.2.1.0
   - radius ==0.7.1.0
   - rainbow ==0.34.2.2
   - rainbox ==0.26.0.0
@@ -2050,7 +2056,7 @@ default-package-overrides:
   - repa ==3.4.1.5
   - repa-io ==3.4.1.2
   - replace-attoparsec ==1.4.5.0
-  - replace-megaparsec ==1.4.4.0
+  - replace-megaparsec ==1.4.5.0
   - repline ==0.4.0.0
   - req ==3.10.0
   - req-conduit ==1.0.1
@@ -2116,7 +2122,7 @@ default-package-overrides:
   - sandwich-quickcheck ==0.1.0.6
   - sandwich-slack ==0.1.0.6
   - say ==0.1.0.1
-  - sbp ==4.1.5
+  - sbp ==4.1.6
   - sbv ==8.17
   - scalpel ==0.6.2
   - scalpel-core ==0.6.2
@@ -2461,7 +2467,7 @@ default-package-overrides:
   - text-ansi ==0.1.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.6.5
-  - text-builder-dev ==0.2.0.1
+  - text-builder-dev ==0.2.1
   - text-conversions ==0.3.1
   - text-icu ==0.7.1.0
   - text-latin1 ==0.3.1
@@ -2843,8 +2849,34 @@ default-package-overrides:
   - yesod-newsfeed ==1.7.0.0
   - yesod-page-cursor ==2.0.0.10
   - yesod-paginator ==1.1.2.1
-  - yesod-persistent ==1.6.0.7
+  - yesod-persistent ==1.6.0.8
   - yesod-recaptcha2 ==1.0.2
   - yesod-routes-flow ==3.0.0.2
   - yesod-sitemap ==1.6.0
+  - yesod-static ==1.6.1.0
+  - yesod-test ==1.6.12
+  - yesod-websockets ==0.3.0.3
   - yes-precure5-command ==5.5.3
+  - yi-rope ==0.11
+  - yjsvg ==0.2.0.1
+  - yjtools ==0.9.18
+  - yoga ==0.0.0.5
+  - youtube ==0.2.1.1
+  - zenacy-html ==2.0.4
+  - zenacy-unicode ==1.0.1
+  - zero ==0.1.5
+  - zeromq4-haskell ==0.8.0
+  - zeromq4-patterns ==0.3.1.0
+  - zim-parser ==0.2.1.0
+  - zio ==0.1.0.2
+  - zip ==1.7.2
+  - zip-archive ==0.4.2.1
+  - zipper-extra ==0.1.3.2
+  - zippers ==0.3.2
+  - zip-stream ==0.2.1.0
+  - zlib ==0.6.2.3
+  - zlib-bindings ==0.1.1.5
+  - zlib-lens ==0.1.2.1
+  - zot ==0.0.3
+  - zstd ==0.1.3.0
+  - ztail ==1.2.0.3

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

@@ -663,6 +663,7 @@ dont-distribute-packages:
  - ascii
  - ascii-cows
  - ascii-table
+ - ascii_1_2_0_0
  - asic
  - asif
  - assert4hs-hspec
@@ -1203,6 +1204,8 @@ dont-distribute-packages:
  - delimiter-separated
  - delta
  - delta-h
+ - dep-t-advice
+ - dep-t-value
  - dependent-literals-plugin
  - dependent-state
  - depends
@@ -2811,11 +2814,9 @@ dont-distribute-packages:
  - mptcp-pm
  - mptcpanalyzer
  - msgpack-aeson
- - msgpack-arbitrary
  - msgpack-idl
  - msgpack-rpc
  - msgpack-rpc-conduit
- - msgpack-testsuite
  - mtgoxapi
  - mu-avro
  - mu-graphql
@@ -2967,8 +2968,6 @@ dont-distribute-packages:
  - openpgp-Crypto
  - openpgp-crypto-api
  - openssh-github-keys
- - opentelemetry-lightstep
- - opentelemetry-lightstep_0_8_0
  - optima-for-hasql
  - optimal-blocks
  - optimusprime
@@ -3325,6 +3324,7 @@ dont-distribute-packages:
  - regions-mtl
  - registry-hedgehog
  - registry-hedgehog-aeson
+ - registry-messagepack
  - regular-extras
  - regular-web
  - regular-xmlpickler
@@ -3764,6 +3764,9 @@ dont-distribute-packages:
  - sydtest-servant
  - sydtest-typed-process
  - sydtest-wai
+ - sydtest-webdriver
+ - sydtest-webdriver-screenshot
+ - sydtest-webdriver-yesod
  - sydtest-yesod
  - sylvia
  - sym-plot

pkgs/development/tools/purescript/spago/spago.nix

@@ -14,11 +14,11 @@
 }:
 mkDerivation {
   pname = "spago";
-  version = "0.20.7";
+  version = "0.20.8";
   src = fetchgit {
     url = "https://github.com/purescript/spago.git";
-    sha256 = "0k9ablqhx4m1hk0sc0rx824qq5gr7fp7dpg9rj5v793v6hd3q4jv";
+    sha256 = "0lakss2pg5kwbxqsmvzgkcc70l6j40cj9rarhkpcf0kxw98bb5x0";
-    rev = "41d9c967dc1db0de03985e31083eb76b3e2fcce4";
+    rev = "744bdbbefc538750d4c36888ee53dc5d336314c4";
     fetchSubmodules = true;
   };
   isLibrary = true;

pkgs/games/hedgewars/default.nix

@@ -103,5 +103,10 @@ mkDerivation rec {
        all movement on the battlefield has ceased).'';
     maintainers = with maintainers; [ kragniz fpletz ];
     inherit (fpc.meta) platforms;
+
+    # Appears to be some sort of C++ linking error.
+    # Example: https://hydra.nixos.org/build/174544990/nixlog/6
+    broken = true;
+    hydraPlatforms = platforms.none;
   };
 }

pkgs/top-level/release-haskell.nix

@@ -304,27 +304,29 @@ let
       # Test some statically linked packages to catch regressions
       # and get some cache going for static compilation with GHC.
       # Use integer-simple to avoid GMP linking problems (LGPL)
-      pkgsStatic.haskell.packages =
+      pkgsStatic =
         removePlatforms
           [
             "aarch64-linux" # times out on Hydra
             "x86_64-darwin" # TODO: reenable when static libiconv works on darwin
           ] {
-            integer-simple.ghc8107 = {
+            haskellPackages = {
-              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8107)
+              inherit (packagePlatforms pkgs.pkgsStatic.haskellPackages)
                 hello
                 lens
                 random
                 QuickCheck
+                cabal2nix
               ;
             };
 
-            native-bignum.ghc902 = {
+            haskell.packages.native-bignum.ghc922 = {
-              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc902)
+              inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc922)
                 hello
                 lens
                 random
                 QuickCheck
+                cabal2nix
               ;
             };
           };
@@ -361,6 +363,9 @@ let
       ghc-lib = released;
       ghc-lib-parser = released;
       ghc-lib-parser-ex = released;
+      spectacle = [
+        compilerNames.ghc8107
+      ];
     })
     {
       mergeable = pkgs.releaseTools.aggregate {
@@ -446,12 +451,8 @@ let
           ];
         };
         constituents = accumulateDerivations [
-          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello
+          jobs.pkgsStatic.haskellPackages
-          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens
+          jobs.pkgsStatic.haskell.packages.native-bignum.ghc922
-          jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random
-          jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.hello
-          jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.lens
-          jobs.pkgsStatic.haskell.packages.native-bignum.ghc902.random
         ];
       };
     }