From 49d146101a2a131a86d1a257cb3a3753d8637773 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 9 Apr 2022 09:56:35 +0900 Subject: [PATCH 01/22] haskell: don't lose packageOverrides for native-bignum --- pkgs/top-level/haskell-packages.nix | 60 ++++++++++++++++++----------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d12542915c7..9e77eecaed4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -245,29 +245,43 @@ in { # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. - integer-simple = let - integerSimpleGhcNames = pkgs.lib.filter - (name: ! builtins.elem name integerSimpleExcludes) - (pkgs.lib.attrNames packages); - in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override { - ghc = bh.compiler.integer-simple.${name}; - buildHaskellPackages = bh.packages.integer-simple.${name}; - overrides = _self : _super : { - integer-simple = null; - integer-gmp = null; - }; - }); + integer-simple = + let + integerSimpleGhcNames = pkgs.lib.filter + (name: ! builtins.elem name integerSimpleExcludes) + (pkgs.lib.attrNames packages); + in + pkgs.lib.genAttrs integerSimpleGhcNames + (name: + packages.${name}.override (oldAttrs: { + ghc = bh.compiler.integer-simple.${name}; + buildHaskellPackages = bh.packages.integer-simple.${name}; + overrides = + pkgs.lib.composeExtensions + (oldAttrs.overrides or (_: _: {})) + (_: _: { + integer-simple = null; + integer-gmp = null; + }); + }) + ); - native-bignum = let - nativeBignumGhcNames = pkgs.lib.filter - (name: builtins.elem name nativeBignumIncludes) - (pkgs.lib.attrNames compiler); - in pkgs.lib.genAttrs nativeBignumGhcNames (name: packages.${name}.override { - ghc = bh.compiler.native-bignum.${name}; - buildHaskellPackages = bh.packages.native-bignum.${name}; - overrides = _self : _super : { - integer-gmp = null; - }; - }); + native-bignum = + let + nativeBignumGhcNames = pkgs.lib.filter + (name: builtins.elem name nativeBignumIncludes) + (pkgs.lib.attrNames compiler); + in + pkgs.lib.genAttrs nativeBignumGhcNames + (name: + packages.${name}.override (oldAttrs: { + ghc = bh.compiler.native-bignum.${name}; + buildHaskellPackages = bh.packages.native-bignum.${name}; + overrides = + pkgs.lib.composeExtensions + (oldAttrs.overrides or (_: _: {})) + (_: _: { integer-gmp = null; }); + }) + ); }; } From c16208e4a313bb4aea74bef5c21c1e6514d623cf Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Fri, 8 Apr 2022 23:13:07 +0000 Subject: [PATCH 02/22] haskellPackages: unbreak bloodhound --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2d46a8eff49..a71fa872877 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -252,7 +252,7 @@ self: super: { binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw binary-search = dontCheck super.binary-search; bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw - bloodhound = dontCheck super.bloodhound; + bloodhound = dontCheck super.bloodhound; # https://github.com/plow-technologies/quickcheck-arbitrary-template/issues/10 buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 31a401ac8cc..8092c09907d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -433,7 +433,6 @@ broken-packages: - blockfrost-api - blockhash - Blogdown - - bloodhound - bloomfilter-redis - blubber-server - bludigon diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 316b6e92412..a12be89e8c5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -45328,7 +45328,6 @@ self: { description = "Elasticsearch client library for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bloodhound-amazonka-auth" = callPackage From 5a2e2471e8163da8e6f2c1dfd50ef9063199c08b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 22:52:47 +0200 Subject: [PATCH 03/22] haskellPackages: stackage LTS 19.2 -> LTS 19.3 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 78 +++++++------------ 1 file changed, 26 insertions(+), 52 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index ad02f7f51de..85354eff6b1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.2 +# Stackage LTS 19.3 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -296,7 +296,7 @@ default-package-overrides: - cborg ==0.2.6.0 - cborg-json ==0.2.3.0 - cdar-mBound ==0.1.0.4 - - c-enum ==0.1.1.2 + - c-enum ==0.1.1.3 - cereal ==0.5.8.2 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -329,9 +329,9 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.4.0.2 - citeproc ==0.6.0.1 - - clash-ghc ==1.6.2 - - clash-lib ==1.6.2 - - clash-prelude ==1.6.2 + - clash-ghc ==1.6.3 + - clash-lib ==1.6.3 + - clash-prelude ==1.6.3 - classy-prelude ==1.5.0.2 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -423,8 +423,8 @@ default-package-overrides: - cookie ==0.4.5 - copr-api ==0.1.0 - core-data ==0.3.1.1 - - core-program ==0.4.4.0 - - core-telemetry ==0.1.9.1 + - core-program ==0.4.5.1 + - core-telemetry ==0.1.9.2 - core-text ==0.3.5.0 - countable ==1.0 - covariance ==0.1.0.6 @@ -708,7 +708,7 @@ default-package-overrides: - explainable-predicates ==0.1.2.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==1.0.8 + - express ==1.0.10 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -823,7 +823,7 @@ default-package-overrides: - gdp ==0.0.3.0 - general-games ==1.1.1 - generic-aeson ==0.2.0.13 - - generic-arbitrary ==0.2.0 + - generic-arbitrary ==0.2.1 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 @@ -1091,7 +1091,7 @@ default-package-overrides: - hpack-dhall ==0.5.4 - hpc-codecov ==0.3.0.0 - HPDF ==1.6.0 - - hpp ==0.6.4 + - hpp ==0.6.5 - hpqtypes ==1.9.3.1 - hprotoc ==2.4.17 - hreader ==1.1.0 @@ -1116,7 +1116,7 @@ default-package-overrides: - hslua-classes ==2.1.0 - hslua-core ==2.1.0 - hslua-marshalling ==2.1.0 - - hslua-module-doclayout ==1.0.3 + - hslua-module-doclayout ==1.0.4 - hslua-module-path ==1.0.2 - hslua-module-system ==1.0.2 - hslua-module-text ==1.0.2 @@ -1354,7 +1354,7 @@ default-package-overrides: - LambdaHack ==0.11.0.0 - lame ==0.2.0 - language-bash ==0.9.2 - - language-c ==0.9.0.2 + - language-c ==0.9.1 - language-c-quote ==0.13 - language-docker ==10.4.3 - language-dot ==0.1.1 @@ -1462,7 +1462,7 @@ default-package-overrides: - lz4-frame-conduit ==0.1.0.1 - lzma ==0.0.0.3 - lzma-clib ==5.2.2 - - lzma-conduit ==1.2.2 + - lzma-conduit ==1.2.3 - machines ==0.7.2 - magic ==1.1 - magico ==0.0.2.3 @@ -1533,9 +1533,9 @@ default-package-overrides: - MissingH ==1.5.0.1 - mixed-types-num ==0.5.9.1 - mmap ==0.5.9 - - mmark ==0.0.7.5 + - mmark ==0.0.7.6 - mmark-cli ==0.0.5.1 - - mmark-ext ==0.2.1.4 + - mmark-ext ==0.2.1.5 - mmorph ==1.1.5 - mnist-idx ==0.1.3.0 - mnist-idx-conduit ==0.4.0.0 @@ -1543,7 +1543,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.1.2.2 - model ==0.5 - - modern-uri ==0.3.4.3 + - modern-uri ==0.3.4.4 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.3.1 @@ -1797,7 +1797,7 @@ default-package-overrides: - perf ==0.9.0 - perfect-hash-generator ==0.2.0.6 - persist ==0.1.1.5 - - persistent ==2.13.3.3 + - persistent ==2.13.3.4 - persistent-discover ==0.1.0.5 - persistent-documentation ==0.1.0.4 - persistent-mongoDB ==2.13.0.1 @@ -1833,7 +1833,7 @@ default-package-overrides: - pipes-ordered-zip ==1.2.1 - pipes-parse ==3.0.9 - pipes-random ==1.0.0.5 - - pipes-safe ==2.3.3 + - pipes-safe ==2.3.4 - pipes-wai ==3.2.0 - pkgtreediff ==0.5.0 - place-cursor-at ==1.0.1 @@ -1930,13 +1930,13 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.1.0 - - proto-lens-arbitrary ==0.1.2.10 - - proto-lens-optparse ==0.1.1.8 - - proto-lens-protobuf-types ==0.7.1.0 - - proto-lens-protoc ==0.7.1.0 - - proto-lens-runtime ==0.7.0.1 - - proto-lens-setup ==0.4.0.5 + - proto-lens ==0.7.1.1 + - proto-lens-arbitrary ==0.1.2.11 + - proto-lens-optparse ==0.1.1.9 + - proto-lens-protobuf-types ==0.7.1.1 + - proto-lens-protoc ==0.7.1.1 + - proto-lens-runtime ==0.7.0.2 + - proto-lens-setup ==0.4.0.6 - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.3 @@ -2839,7 +2839,7 @@ default-package-overrides: - yesod-form-bootstrap4 ==3.0.1 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.2 - - yesod-markdown ==0.12.6.12 + - yesod-markdown ==0.12.6.13 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.10 - yesod-paginator ==1.1.2.1 @@ -2847,30 +2847,4 @@ default-package-overrides: - 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 From ef0a727ee53eb626b067a9bc7a5d3a46800e29d6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 22:53:30 +0200 Subject: [PATCH 04/22] all-cabal-hashes: 2022-04-06T22:24:53Z -> 2022-04-09T11:23:17Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 52ca8f4897a..13efe11b33d 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "6387c3141750050e170d6ac030c063536c39aede", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz", - "sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j", - "msg": "Update from Hackage at 2022-04-06T22:24:53Z" + "commit": "e5167f06cba67fa268ebafb97f5ccbffe412cd2a", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e5167f06cba67fa268ebafb97f5ccbffe412cd2a.tar.gz", + "sha256": "1ihkrjk7a24wbzjz4wlx3mdh88bbq4665l1ld7gxs5jaimcmhn5j", + "msg": "Update from Hackage at 2022-04-09T11:23:17Z" } From d14e0c0dfb46ff5ffe21ed1d247b4d1f58b67b39 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 22:55:10 +0200 Subject: [PATCH 05/22] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 734 ++++++------------ 1 file changed, 250 insertions(+), 484 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2773110b39b..cef3ce53935 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22048,14 +22048,13 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.3"; - sha256 = "06w2glnn5w97bjmwl88j46xkr2mkvgy5a2wwwzqq168awn436kk3"; + version = "0.13.4"; + sha256 = "1qh3fdj82n7s2arwjin1mp5n8jn8p0dan5ll6zbj533j181k8w4p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq random simple-affine-space ]; - testHaskellDepends = [ base ]; description = "Elegant Functional Reactive Programming Language for Hybrid Systems"; license = lib.licenses.bsd3; }) {}; @@ -48590,8 +48589,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "1.0.3"; - sha256 = "1bqzj9gmx8lvfw037y4f3hibbcq6zafhm6xhjdhnvmlyc963n9v9"; + version = "1.0.4"; + sha256 = "0c6d8b11dgg585fvql0h2rrmiw2l8831ig2f89jlqzkdsa0asm67"; libraryHaskellDepends = [ base bitwise bytestring deepseq panic parameterized-utils random th-lift @@ -49543,8 +49542,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "c-enum"; - version = "0.1.1.2"; - sha256 = "01i8dfzrcpkji4vnnflabfbxd4f6q8mmzh1whnizqp14pbzmkqv2"; + version = "0.1.1.3"; + sha256 = "11xw95arxvbhz53sllvkwka2xfb0lhy2x2caimmcbcb0dh7k13q3"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "To make a type corresponding to an enum of C language"; @@ -57105,8 +57104,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.6.2"; - sha256 = "0whyml49yag2yjm0qx3kw50w5r88x1ahdqgfh7ys03vhmppnf6h7"; + version = "1.6.3"; + sha256 = "1g1szdy2fcjkjlf6w8r3kr0qinv56q0w1lcxav6jzz5ihplxyhhg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57140,8 +57139,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.6.2"; - sha256 = "0i1h25zl1zagjk7163dh66a56fwi720889g0pr1mi5pk2j1hwx20"; + version = "1.6.3"; + sha256 = "1ylpdfzhr7sgs7s2ivqh4nsmcl3v034k10a3wdd44n50bdlhsk47"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -57179,8 +57178,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.6.2"; - sha256 = "1wmdfm2i15gwccb7niqfsvfixdzmvv3z25p1qdbjik6368j0d376"; + version = "1.6.3"; + sha256 = "05j6rc3d4lpvrnxqsa81ass0xb8pw03nbdlgvq17gpm3697m0kqr"; libraryHaskellDepends = [ base clash-lib containers data-binary-ieee754 fakedata ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog @@ -57221,8 +57220,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.6.2"; - sha256 = "05yp80skljri0wgc884ka4b6mqziks820wfi1d8yl4sjm2850qji"; + version = "1.6.3"; + sha256 = "1yl0lx6bbjqj7zylayssi971q3y2736jzg9sd5rxpcgr15isprzm"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -57252,8 +57251,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.6.2"; - sha256 = "1i1zgjs8v0834cdbzg893x5l16d9fni33l153w288amg9cdy08l0"; + version = "1.6.3"; + sha256 = "05dxp79njsa85y0125b0biqcax7bc73j6zn1f6vgc235fbyc2nza"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog text @@ -57967,30 +57966,31 @@ self: { , optparse-applicative, safe-exceptions, servant-client , servant-client-core, silently, singletons, spoon, statistics, syb , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog - , tasty-hspec, tasty-hunit-compat, template-haskell, text, time - , type-spec, unordered-containers, vinyl, with-utf8 + , tasty-hspec, tasty-hunit-compat, template-haskell, temporary + , text, time, type-spec, unordered-containers, vinyl, with-utf8 }: mkDerivation { pname = "cleveland"; - version = "0.1.0"; - sha256 = "0px16j08fakmxzsf6rgx9gs91g61ygxzkf7sngj06a76yzfj4hlw"; + version = "0.1.1"; + sha256 = "0hwdcld5blhc1af2xc0d4qjj7vz7gh7989ckkbzfagkaz45d7rr7"; libraryHaskellDepends = [ - aeson base-noprelude constraints containers criterion cryptonite - data-default directory either exceptions file-embed fmt hedgehog - hex-text hspec hspec-expectations HUnit lens lorentz MonadRandom - morley morley-client morley-prelude mtl named o-clock + aeson base-noprelude bytestring constraints containers criterion + cryptonite data-default directory either exceptions file-embed fmt + hedgehog hex-text hspec hspec-expectations HUnit lens lorentz + MonadRandom morley morley-client morley-prelude mtl named o-clock optparse-applicative safe-exceptions servant-client-core singletons statistics tagged tasty tasty-ant-xml tasty-hedgehog tasty-hunit-compat template-haskell text time with-utf8 ]; testHaskellDepends = [ aeson aeson-pretty aeson-qq base-noprelude bimap bytestring - constraints containers data-default directory either filepath - first-class-families fmt hedgehog hex-text hspec hspec-expectations - HUnit lens lorentz megaparsec morley morley-client morley-prelude - mtl named o-clock servant-client silently singletons spoon syb - tasty tasty-hedgehog tasty-hspec tasty-hunit-compat text time - type-spec unordered-containers vinyl with-utf8 + constraints containers cryptonite data-default directory either + filepath first-class-families fmt hedgehog hex-text hspec + hspec-expectations HUnit lens lorentz megaparsec morley + morley-client morley-prelude mtl named o-clock servant-client + silently singletons spoon syb tasty tasty-hedgehog tasty-hspec + tasty-hunit-compat template-haskell temporary text time type-spec + unordered-containers vinyl with-utf8 ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ @@ -66321,8 +66321,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.4.4.0"; - sha256 = "1mp694llk3b04yqv8gr7i2rwcld99xmx1m55f5fhk1vgks816kih"; + version = "0.4.5.1"; + sha256 = "035yb2zjbhbpx0726ijbbmf3cnvhcykf3k0v35mhpcr4npa6pcig"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -66333,28 +66333,6 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_4_5_0" = callPackage - ({ mkDerivation, async, base, bytestring, chronologique, core-data - , core-text, directory, exceptions, filepath, fsnotify, hashable - , hourglass, mtl, prettyprinter, safe-exceptions, stm - , template-haskell, terminal-size, text, text-short, transformers - , typed-process, unix - }: - mkDerivation { - pname = "core-program"; - version = "0.4.5.0"; - sha256 = "01p6h6gmw1dqqnqv10skabmilz9rx0ryz7k66da1jyafy4jzw9n1"; - libraryHaskellDepends = [ - async base bytestring chronologique core-data core-text directory - exceptions filepath fsnotify hashable hourglass mtl prettyprinter - safe-exceptions stm template-haskell terminal-size text text-short - transformers typed-process unix - ]; - description = "Opinionated Haskell Interoperability"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams @@ -66363,8 +66341,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.1.9.1"; - sha256 = "11b106gs96l20zb0lyr0qw49bnm8wxfc4wcncjaip6mdvgcc8cza"; + version = "0.1.9.2"; + sha256 = "07gb8ms3kchjvc0xbh36s1hzcmxaaci78gjgzdnkzap3lisjgcf0"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program core-text exceptions http-streams io-streams mtl network-info @@ -70386,8 +70364,8 @@ self: { }: mkDerivation { pname = "cybus"; - version = "0.1.0.0"; - sha256 = "1zd384agclc75y0nqzmhlxlghgac3g807jqgvsqbk0ddlghqvkmn"; + version = "0.2.0.0"; + sha256 = "01bzczqs7r7c2wfpzn1c6xfnhr910yy6kzzvlx2qhp5d8wml32wj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75803,8 +75781,8 @@ self: { ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.3.0.0"; - sha256 = "1qxf729wmvcszw9bs2w9h7ww9sh55576hvalpg0qp6l3zlp3f4sq"; + version = "0.3.1.0"; + sha256 = "0zs4j2pqyp98gnacz3s32whvsds89i6p72rqgicy42c3mx8p8csc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -86767,15 +86745,15 @@ self: { }: mkDerivation { pname = "emacs-module"; - version = "0.1.1"; - sha256 = "1m6rcvhgdhlzzq86b4qhanbmymwl87r705jx9ih8s89fvsfgvq0y"; + version = "0.1.1.1"; + sha256 = "1j66b4r4zhqc2j1fqihzqdc0zacjy3fpgf54b7z55n2wqa6x9lgw"; libraryHaskellDepends = [ base bytestring deepseq exceptions monad-control mtl prettyprinter resourcet safe-exceptions-checked template-haskell text transformers-base vector void ]; description = "Utilities to write Emacs dynamic modules"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91290,8 +91268,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "1.0.8"; - sha256 = "1hkcrzbqn54sx907zh28sg659f46yip6dvgjaywdjpk8hbvqfzs2"; + version = "1.0.10"; + sha256 = "08y0ssnlfwcqw3vr8mswfc9yhjwhgwrl0yvx439443qwvfm64dc0"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -102807,19 +102785,6 @@ self: { }) {}; "generic-arbitrary" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "generic-arbitrary"; - version = "0.2.0"; - sha256 = "1wlrsj9l57vqdkaablb8ypq2g1i4mishjag00fyf2imr2cvzkamg"; - revision = "1"; - editedCabalFile = "1x7819chcy0ydby6d7024ny1a1si7pyx46rf1mzr3ngdy6wxdfbp"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Generic implementation for QuickCheck's Arbitrary"; - license = lib.licenses.mit; - }) {}; - - "generic-arbitrary_0_2_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-arbitrary"; @@ -102828,7 +102793,6 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; description = "Generic implementation for QuickCheck's Arbitrary"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-binary" = callPackage @@ -130526,8 +130490,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.2"; - sha256 = "1518hkza6xgvy6ykvmv12pc0lhdf5apbjahpgw6bdrwnfyj0xicm"; + version = "0.9.3"; + sha256 = "0rf00qskifbgxqkjy8fykc9ck4zwsvs08nsprw2447adx8dl9g5h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -130703,14 +130667,14 @@ self: { ({ mkDerivation, aeson, base, boost, bytestring, Cabal , cabal-pkg-config-version-hook, conduit, containers, directory , exceptions, filepath, hercules-ci-cnix-store, hspec - , hspec-discover, inline-c, inline-c-cpp, nix, protolude + , hspec-discover, inline-c, inline-c-cpp, nix, process, protolude , QuickCheck, scientific, temporary, text, unliftio , unordered-containers, vector }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.1.1"; - sha256 = "1rjly7ic310kzclh0dh2gknrn31anam2ncgjrhm6sq3hrvay1v32"; + version = "0.3.1.2"; + sha256 = "1jj4ksxwvr6rnbqshcrf2i54f2mfvjz84wlzwv99hxj8ycnm2ddh"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -130721,9 +130685,9 @@ self: { librarySystemDepends = [ boost ]; libraryPkgconfigDepends = [ nix ]; testHaskellDepends = [ - aeson base bytestring containers hercules-ci-cnix-store hspec - protolude QuickCheck scientific temporary unordered-containers - vector + aeson base bytestring containers filepath hercules-ci-cnix-store + hspec process protolude QuickCheck scientific temporary text + unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Bindings for the Nix evaluator"; @@ -130739,8 +130703,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.0.1"; - sha256 = "0vfwqa167800hilxqs4bm650sfdyg4q4w47vywpw1r8rmh0iznkh"; + version = "0.3.1.0"; + sha256 = "0qkwq2w7pybzn9lmw71xj0rfpv1rvjmjlc0nxywwb12rsvmjvllq"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -139009,26 +138973,6 @@ self: { }) {}; "hpp" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim - , time, transformers, unordered-containers - }: - mkDerivation { - pname = "hpp"; - version = "0.6.4"; - sha256 = "0hkdpd4rlc0z3sfj4ymvk751csfdvqf56y9np9qyzh4ndaw9sj78"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring directory filepath ghc-prim time transformers - unordered-containers - ]; - executableHaskellDepends = [ base directory filepath time ]; - testHaskellDepends = [ base bytestring transformers ]; - description = "A Haskell pre-processor"; - license = lib.licenses.bsd3; - }) {}; - - "hpp_0_6_5" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim , time, transformers, unordered-containers }: @@ -139046,7 +138990,6 @@ self: { testHaskellDepends = [ base bytestring transformers ]; description = "A Haskell pre-processor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpqtypes" = callPackage @@ -142892,22 +142835,6 @@ self: { }) {}; "hslua-module-doclayout" = callPackage - ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit - , tasty-lua, text - }: - mkDerivation { - pname = "hslua-module-doclayout"; - version = "1.0.3"; - sha256 = "01khmrgrvy1dhh2p8gjkrvhkwpnjnznhc23hvxbh2v8lxb4ak3r6"; - libraryHaskellDepends = [ base doclayout hslua text ]; - testHaskellDepends = [ - base doclayout hslua tasty tasty-hunit tasty-lua - ]; - description = "Lua module wrapping Text.DocLayout."; - license = lib.licenses.mit; - }) {}; - - "hslua-module-doclayout_1_0_4" = callPackage ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit , tasty-lua, text }: @@ -142921,7 +142848,6 @@ self: { ]; description = "Lua module wrapping Text.DocLayout."; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-path" = callPackage @@ -143472,14 +143398,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_9_5" = callPackage + "hspec_2_9_6" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.9.5"; - sha256 = "170fsms5gmp3yxcw3if35mpv6sq9mi6k259szspbh3qdp3d1z6mc"; + version = "2.9.6"; + sha256 = "1x3mizv029qn9yyq3ipr2awlapbsiyksxzd9x7r3vjfxlwbjs4sr"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -143599,7 +143525,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_9_5" = callPackage + "hspec-core_2_9_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -143608,8 +143534,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.9.5"; - sha256 = "0xyn90l7rar1av65bld7fs499mn1vpyga4vpz2ygi7lvc59lm0ay"; + version = "2.9.6"; + sha256 = "0mg8rdg8ga24fk6cv7p8vb0j33agay1nwaxqvfga6d4kj5g440fr"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck @@ -143688,14 +143614,14 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hspec-discover_2_9_5" = callPackage + "hspec-discover_2_9_6" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.9.5"; - sha256 = "0sd2bkwdgnzkb4gjaqk9q21s0qnp0q3n19yf4phb4qvl878rvnpk"; + version = "2.9.6"; + sha256 = "1k77hn47b3l4m8qpp2zfv73k2in7pi2fybda0dkpfj3a1jsarpin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -164839,25 +164765,6 @@ self: { }) {}; "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, deepseq - , directory, filepath, happy, mtl, pretty, process - }: - mkDerivation { - pname = "language-c"; - version = "0.9.0.2"; - sha256 = "1iyrhr87vmgmnkzza35j1y3zck8529kwi01pnkl5b54x10z20spf"; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath mtl - pretty process - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - description = "Analysis and generation of C code"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ expipiplus1 ]; - }) {}; - - "language-c_0_9_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq , directory, filepath, happy, mtl, pretty, process }: @@ -164873,7 +164780,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; @@ -174581,8 +174487,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.13.2"; - sha256 = "1kb611xj1rl8jbx3bibcqdklv8kls3xkis77vix2vdf6y6fhjhfr"; + version = "0.13.3"; + sha256 = "158zbmyhia8dcr8fcqg7xqc3xfq6f3i73g7dqbidcysh6c0fwh0p"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley @@ -175869,26 +175775,6 @@ self: { }) {}; "lzma-conduit" = callPackage - ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit - , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "lzma-conduit"; - version = "1.2.2"; - sha256 = "1z6q16hzp2r5a4gdbg9akky5l9bfarzzhzswrgvh0v28ax400whb"; - libraryHaskellDepends = [ - base bytestring conduit lzma resourcet transformers - ]; - testHaskellDepends = [ - base base-compat bytestring conduit HUnit QuickCheck resourcet - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Conduit interface for lzma/xz compression"; - license = lib.licenses.bsd3; - }) {}; - - "lzma-conduit_1_2_3" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers @@ -175906,7 +175792,6 @@ self: { ]; description = "Conduit interface for lzma/xz compression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lzma-enumerator" = callPackage @@ -182853,8 +182738,8 @@ self: { }: mkDerivation { pname = "miso"; - version = "1.8.1.0"; - sha256 = "0p7gh5ibz84fckc7pkh789jwl0ffxz0ixygbxx1w0r0hs22pn4ia"; + version = "1.8.2.0"; + sha256 = "1nxyl18lj1dcnn7qhq3xih6mxpvih0rc71nnkk9y19v6dxxv5ld4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183232,35 +183117,6 @@ self: { }) {}; "mmark" = callPackage - ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec - , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens - , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck - , text, text-metrics, unordered-containers, weigh, yaml - }: - mkDerivation { - pname = "mmark"; - version = "0.0.7.5"; - sha256 = "0jh5pbd2f6bqi8rg4q73k7cgbkdc888hjqf99kzcm6k9xllg5770"; - revision = "1"; - editedCabalFile = "1agra1nqsb6d7lcj2j42hd3cb899bnh00y8br7czlmw0jv5fjr55"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base case-insensitive containers deepseq dlist email-validate - foldl hashable html-entity-map lucid megaparsec microlens - microlens-th modern-uri mtl parser-combinators text text-metrics - unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri - QuickCheck text - ]; - benchmarkHaskellDepends = [ base criterion text weigh ]; - description = "Strict markdown processor for writers"; - license = lib.licenses.bsd3; - }) {}; - - "mmark_0_0_7_6" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens @@ -183285,7 +183141,6 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mmark-cli" = callPackage @@ -183311,30 +183166,6 @@ self: { }) {}; "mmark-ext" = callPackage - ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec - , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting - , text - }: - mkDerivation { - pname = "mmark-ext"; - version = "0.2.1.4"; - sha256 = "02ygx0kkp69gd2n4bnqjzbwzhs9ksqm148jf6zfgn3z8w1p9glzh"; - revision = "1"; - editedCabalFile = "1n1f0ijnll2pkmm25gy9yn7vycm8y1p14c0d9dq7kwbaa6bhr09d"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri - skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark skylighting text ]; - testToolDepends = [ hspec-discover ]; - description = "Commonly useful extensions for the MMark markdown processor"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "mmark-ext_0_2_1_5" = callPackage ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting , text @@ -183885,34 +183716,6 @@ self: { }) {}; "modern-uri" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; - version = "0.3.4.3"; - sha256 = "0904ff8pzcbk1swp0s1v5js468qnf3ccyzfcvaa62nsaj4qb7shq"; - revision = "1"; - editedCabalFile = "05y666pg4wsv7qpszjpa8d2zqzcmp1gyfkzvgi4nw9n9kmcij8hv"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = lib.licenses.bsd3; - }) {}; - - "modern-uri_0_3_4_4" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck @@ -183936,7 +183739,6 @@ self: { ]; description = "Modern library for working with URIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -186663,31 +186465,32 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base58-bytestring, binary, bytestring, constraints, containers - , crypto-sodium, cryptonite, data-default, elliptic-curve + , crypto-sodium, cryptonite, data-default, Diff, elliptic-curve , first-class-families, fmt, galois-field, generic-deriving, gitrev , haskeline, hex-text, lens, megaparsec, memory, MonadRandom , morley-prelude, mtl, named, optparse-applicative, pairing , parser-combinators, scientific, semigroups, show-type, singletons , syb, template-haskell, text, text-manipulate, th-lift - , th-lift-instances, time, timerep, uncaught-exception - , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text + , th-lift-instances, th-reify-many, time, timerep + , uncaught-exception, unordered-containers, vector, vinyl + , with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.16.2"; - sha256 = "1b236yp37pahx3njn0cwdbnkr7yj62ckhfsicgm2crb4l6sjkyas"; + version = "1.16.3"; + sha256 = "0s0xkmgymcc8s4izyy094qbyfkvv1f95x8iv4bmmwgkqgjjrlqsp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty base-noprelude base58-bytestring binary bytestring constraints containers crypto-sodium cryptonite - data-default elliptic-curve first-class-families fmt galois-field - generic-deriving gitrev hex-text lens megaparsec memory MonadRandom - morley-prelude mtl named optparse-applicative pairing - parser-combinators scientific semigroups show-type singletons syb - template-haskell text text-manipulate th-lift th-lift-instances - time timerep uncaught-exception unordered-containers vector vinyl - with-utf8 wl-pprint-text + data-default Diff elliptic-curve first-class-families fmt + galois-field generic-deriving gitrev hex-text lens megaparsec + memory MonadRandom morley-prelude mtl named optparse-applicative + pairing parser-combinators scientific semigroups show-type + singletons syb template-haskell text text-manipulate th-lift + th-lift-instances th-reify-many time timerep uncaught-exception + unordered-containers vector vinyl with-utf8 wl-pprint-text ]; executableHaskellDepends = [ aeson base-noprelude base58-bytestring bytestring fmt haskeline @@ -186708,13 +186511,13 @@ self: { , mtl, named, optparse-applicative, process, random , safe-exceptions, scientific, servant, servant-client , servant-client-core, singletons, syb, tasty, tasty-ant-xml - , tasty-discover, tasty-hunit-compat, template-haskell, text - , th-reify-many, time, universum, unliftio, vector + , tasty-discover, tasty-hunit-compat, text, time, universum + , unliftio }: mkDerivation { pname = "morley-client"; - version = "0.1.0"; - sha256 = "1xhmksv745dvf8axbihbdn9r9402na381czckab844whkdmnag0y"; + version = "0.1.1"; + sha256 = "0zwydp374aynavc0hgx3ab0m951pp4mmxi05gp9006882vndh6c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186723,8 +186526,8 @@ self: { hex-text http-client http-client-tls http-types lens lorentz megaparsec memory morley morley-prelude mtl named optparse-applicative process random safe-exceptions scientific - servant servant-client servant-client-core singletons syb - template-haskell text th-reify-many time universum unliftio vector + servant servant-client servant-client-core singletons syb text time + universum unliftio ]; executableHaskellDepends = [ aeson base-noprelude data-default fmt morley morley-prelude @@ -186734,8 +186537,8 @@ self: { aeson base-noprelude bytestring co-log co-log-core containers exceptions fmt hex-text hspec-expectations http-types HUnit lens lorentz memory morley morley-prelude safe-exceptions - servant-client-core singletons syb tasty tasty-ant-xml - tasty-hunit-compat template-haskell time + servant-client-core singletons tasty tasty-ant-xml + tasty-hunit-compat time ]; testToolDepends = [ tasty-discover ]; description = "Client to interact with the Tezos blockchain"; @@ -186744,12 +186547,17 @@ self: { }) {}; "morley-prelude" = callPackage - ({ mkDerivation, base-noprelude, int-cast, lens, universum }: + ({ mkDerivation, base-noprelude, Cabal, fmt, int-cast, lens + , OddWord, template-haskell, time, universum + }: mkDerivation { pname = "morley-prelude"; - version = "0.5.0"; - sha256 = "1j78ki07jh31am9i2g43crkajynb39agdk4as7gdkhj3lfrbriz4"; - libraryHaskellDepends = [ base-noprelude int-cast lens universum ]; + version = "0.5.1"; + sha256 = "06sry4i132psr9dcga9wk0c4d9zw581flwhw3mi186gl0k6cfqdi"; + libraryHaskellDepends = [ + base-noprelude Cabal fmt int-cast lens OddWord template-haskell + time universum + ]; description = "A custom prelude used in Morley"; license = lib.licenses.mit; }) {}; @@ -200020,6 +199828,21 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry_0_8_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events + , hashable + }: + mkDerivation { + pname = "opentelemetry"; + version = "0.8.0"; + sha256 = "05g4jc2cpcj1fa50hvzai4wqczjjb2vyxmxi1hpf26yyfqw1rgz9"; + libraryHaskellDepends = [ + base bytestring exceptions ghc-trace-events hashable + ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentelemetry-extra" = callPackage ({ mkDerivation, async, base, binary, bytestring, clock, containers , directory, exceptions, filepath, generic-arbitrary, ghc-events @@ -200056,6 +199879,43 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry-extra_0_8_0" = callPackage + ({ mkDerivation, async, base, binary, bytestring, clock, containers + , directory, exceptions, filepath, generic-arbitrary, ghc-events + , hashable, hashtables, http-client, http-client-tls, http-types + , hvega, jsonifier, opentelemetry, process, QuickCheck + , quickcheck-instances, random, scientific, splitmix, stm, tasty + , tasty-bench, tasty-discover, tasty-hunit, tasty-quickcheck, text + , text-show, typed-process, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-extra"; + version = "0.8.0"; + sha256 = "1g13a8lmrx38a48xhn4v1rk144l44vil7p7w5acb66dn6q0cc15d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring clock containers directory exceptions + filepath ghc-events hashable http-client http-client-tls http-types + jsonifier opentelemetry random scientific splitmix stm text + text-show unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers directory exceptions + filepath hashtables http-client http-client-tls hvega opentelemetry + process text typed-process + ]; + testHaskellDepends = [ + base bytestring generic-arbitrary ghc-events hashable opentelemetry + QuickCheck quickcheck-instances splitmix tasty tasty-discover + tasty-hunit tasty-quickcheck text text-show unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentelemetry-http-client" = callPackage ({ mkDerivation, base, http-client, http-types, opentelemetry, text }: @@ -200097,6 +199957,33 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry-lightstep_0_8_0" = callPackage + ({ mkDerivation, async, base, bytestring, clock, containers + , exceptions, filepath, ghc-events, http-client, http-client-tls + , http-types, network, opentelemetry, opentelemetry-extra + , scientific, splitmix, stm, text, typed-process + , unordered-containers + }: + mkDerivation { + pname = "opentelemetry-lightstep"; + version = "0.8.0"; + sha256 = "0nvfyd2m393szvvsrpfv8f59xx55xk1mr4gv46idwr43mvqxdz84"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring exceptions http-client http-client-tls + http-types network opentelemetry opentelemetry-extra scientific stm + text unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers exceptions filepath + ghc-events http-client http-types opentelemetry opentelemetry-extra + splitmix text typed-process unordered-containers + ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentelemetry-wai" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai @@ -200111,6 +199998,21 @@ self: { license = lib.licenses.asl20; }) {}; + "opentelemetry-wai_0_8_0" = callPackage + ({ mkDerivation, base, bytestring, http-types, opentelemetry, text + , wai + }: + mkDerivation { + pname = "opentelemetry-wai"; + version = "0.8.0"; + sha256 = "1k5wglr61zly4afij087vjsrxzxn6vvsk6rcasw0q1si8n2kl4wb"; + libraryHaskellDepends = [ + base bytestring http-types opentelemetry text wai + ]; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -201294,6 +201196,8 @@ self: { pname = "ordered"; version = "0.1"; sha256 = "0s0g5kgzdw7qjsdcddszjclamx9bi0369pkwhh0wncjg68a7mq69"; + revision = "1"; + editedCabalFile = "0xh5hdihyfgzywi9g902c7h6wpv055157ivksrw791ja05zs8v61"; libraryHaskellDepends = [ base ]; description = "A definition of Posets"; license = "unknown"; @@ -207979,42 +207883,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, criterion, deepseq - , fast-logger, file-embed, hspec, http-api-data, lift-type - , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances - , resource-pool, resourcet, scientific, shakespeare, silently - , template-haskell, text, th-lift-instances, time, transformers - , unliftio, unliftio-core, unordered-containers, vault, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.13.3.3"; - sha256 = "07fhi9mb2ffdw41jy6ypwvv6nwb1kwb21prjc6pqmbdyxp303ij0"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data lift-type monad-logger - mtl path-pieces resource-pool resourcet scientific silently - template-haskell text th-lift-instances time transformers unliftio - unliftio-core unordered-containers vault vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data monad-logger mtl - path-pieces QuickCheck quickcheck-instances resource-pool resourcet - scientific shakespeare silently template-haskell text - th-lift-instances time transformers unliftio unliftio-core - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq file-embed template-haskell text - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_13_3_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -208047,7 +207915,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -210458,6 +210325,8 @@ self: { pname = "pinch"; version = "0.4.1.2"; sha256 = "0khgx08mpj16lzqkk3xmxf5a6a68fc6x1vfg1r0lgj5lx2dgl89j"; + revision = "1"; + editedCabalFile = "1hpcwjgp12kp5hny74xjhrj7dj89pa4gin84b24arqlvmz5w9anq"; libraryHaskellDepends = [ array base bytestring cereal containers deepseq ghc-prim hashable network semigroups text unordered-containers vector @@ -211683,8 +211552,8 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.3.3"; - sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab"; + version = "2.3.4"; + sha256 = "1ha0q1dwl52rn59shmk8jhp7grngpiwmp8x4qa9h54flvxkqk12x"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -215226,8 +215095,8 @@ self: { ({ mkDerivation, base, deepseq, tasty, tasty-hunit }: mkDerivation { pname = "pos"; - version = "0.1.0.0"; - sha256 = "0xzzwpxjkb03ynml59irk5j4q98ggw6pwx1fvldqza0hfn7n5l90"; + version = "0.2.0.0"; + sha256 = "0c8zbfkbin97b9bavv56m1ym00q7bz9fv4aac45vlg4ns9b9yshv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq tasty tasty-hunit ]; description = "positive numbers"; @@ -218667,8 +218536,8 @@ self: { }: mkDerivation { pname = "primus"; - version = "0.1.0.0"; - sha256 = "1z4byp374nkdwsz99bh9v2w2sm3899li8rfbj7q8d4x0mlmcmafy"; + version = "0.2.0.0"; + sha256 = "170lizshqraf2gqawfnahns019lsazmqvqs61yznzfj71xwr763c"; libraryHaskellDepends = [ adjunctions base deepseq distributive pos profunctors semigroupoids these @@ -218677,7 +218546,7 @@ self: { adjunctions base checkers deepseq distributive lens pos profunctors QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck these ]; - description = "NonEmpty and positive functions"; + description = "nonempty and positive functions"; license = lib.licenses.bsd3; }) {}; @@ -220417,27 +220286,6 @@ self: { }) {}; "proto-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim - , lens-family, parsec, pretty, primitive, profunctors, QuickCheck - , tagged, tasty, tasty-quickcheck, text, transformers, vector - }: - mkDerivation { - pname = "proto-lens"; - version = "0.7.1.0"; - sha256 = "0b5wn89d23p87swjbafndrbmklix360amcq5jsl73zaqlh3vy4sy"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim lens-family parsec - pretty primitive profunctors tagged text transformers vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck vector - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens_0_7_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, tasty, tasty-quickcheck, text, transformers, vector @@ -220456,25 +220304,9 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; - version = "0.1.2.10"; - sha256 = "1dx82fx4q2q58xavkw62ws34vikpg5g6p0w3mpvn0pigwykjnzda"; - libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text - ]; - description = "Arbitrary instances for proto-lens"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-arbitrary_0_1_2_11" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: @@ -220487,7 +220319,6 @@ self: { ]; description = "Arbitrary instances for proto-lens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-combinators" = callPackage @@ -220549,19 +220380,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.8"; - sha256 = "1y5ygqzwyvphxyj6qr5cnknjk06rs6h0xlbwa864p6hjwlayapcn"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_9" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -220572,28 +220390,9 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf - , text - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.7.1.0"; - sha256 = "0yrwif600lr2pmqfninwap348k4xg5mvzx9cqp99gdgkknfb88hn"; - setupHaskellDepends = [ base Cabal proto-lens-setup ]; - libraryHaskellDepends = [ - base lens-family proto-lens proto-lens-runtime text - ]; - libraryToolDepends = [ proto-lens-protoc protobuf ]; - description = "Basic protocol buffer message types"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protobuf-types_0_7_1_1" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf , text @@ -220609,31 +220408,9 @@ self: { libraryToolDepends = [ proto-lens-protoc protobuf ]; description = "Basic protocol buffer message types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, ghc - , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens - , proto-lens-runtime, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.7.1.0"; - sha256 = "14lbal80mrwla51h3yax8v1hsd05mh5xyipc051n0jkxdifs1cv5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base filepath ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base bytestring containers filepath ghc ghc-paths ghc-source-gen - lens-family pretty proto-lens proto-lens-runtime text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protoc_0_7_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, ghc , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens , proto-lens-runtime, protobuf, text @@ -220652,26 +220429,9 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, proto-lens, text, vector - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.7.0.1"; - sha256 = "03dxnawrsz22s52qzfwgnzs18r7mdb1jvirsck2g62bh5incg80a"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family proto-lens - text vector - ]; - doHaddock = false; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_7_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: @@ -220685,26 +220445,9 @@ self: { ]; doHaddock = false; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto-lens-setup" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, deepseq - , directory, filepath, process, proto-lens-protoc, temporary, text - }: - mkDerivation { - pname = "proto-lens-setup"; - version = "0.4.0.5"; - sha256 = "1zl6srfsa4nizrrrbm7b69200w42rfmxmyzdzgb3cl0675ks2r28"; - libraryHaskellDepends = [ - base bytestring Cabal containers deepseq directory filepath process - proto-lens-protoc temporary text - ]; - description = "Cabal support for codegen with proto-lens"; - license = lib.licenses.bsd3; - }) {}; - - "proto-lens-setup_0_4_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text }: @@ -220718,7 +220461,6 @@ self: { ]; description = "Cabal support for codegen with proto-lens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "proto3-suite" = callPackage @@ -232103,6 +231845,39 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "req_3_11_0" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, exceptions, hspec + , hspec-core, hspec-discover, http-api-data, http-client + , http-client-tls, http-types, modern-uri, monad-control, mtl + , QuickCheck, retry, template-haskell, text, time, transformers + , transformers-base, unliftio-core + }: + mkDerivation { + pname = "req"; + version = "3.11.0"; + sha256 = "12nfm2pifwv8w4qbadqhraf6vbg9k54wcvnhwk96zvykhbnhpf2g"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection exceptions http-api-data http-client + http-client-tls http-types modern-uri monad-control mtl retry + template-haskell text time transformers transformers-base + unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-api-data http-client http-types modern-uri + monad-control mtl QuickCheck retry template-haskell text time + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , hspec-discover, http-client, req, resourcet, temporary @@ -259213,8 +258988,8 @@ self: { }: mkDerivation { pname = "stooq-api"; - version = "0.1.0.0"; - sha256 = "0r4sc0w9ghlvlysj5aycawlhrb9iylczg8nb0kdkw4790nrd5if0"; + version = "0.2.0.0"; + sha256 = "1fsfy2ira8bhkzh6bf72p0wvgq970y1nrgkqsbngbq2p8yx5s2ay"; libraryHaskellDepends = [ aeson base bytestring lens text time utf8-string vector wreq ]; @@ -280423,6 +280198,17 @@ self: { broken = true; }) {}; + "type-safe-avl" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-safe-avl"; + version = "1.0.0.0"; + sha256 = "0xkv97bzmj89q15hm9kzq7zw2b4y522gnyn4fwxwbsc1368n42q7"; + libraryHaskellDepends = [ base ]; + description = "Type safe BST and AVL trees"; + license = lib.licenses.gpl3Only; + }) {}; + "type-sets" = callPackage ({ mkDerivation, base, cmptype }: mkDerivation { @@ -299560,8 +299346,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.3"; - sha256 = "08xs3m14rqpgkjghgp2b8ddalzzs50bzf11nd9kgi72xbg451yzi"; + version = "0.13.4"; + sha256 = "08gb3z83vxj39fnvb3gyck54r01l0gh62cp9d2yfjhdr214d2lx3"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -301392,26 +301178,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.12"; - sha256 = "0ha06wbzdy040wdimqzpw71hvy5z0pg0b4q524lln05gb26wdlsn"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "yesod-markdown_0_12_6_13" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form From b3886428c1beb2c8eb7909b066e12e35a5f40294 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 11 Apr 2022 00:38:10 +0200 Subject: [PATCH 06/22] haskellPackages.hercules-ci-cnix-expr: Fix test It needs git during tests now. --- pkgs/development/haskell-modules/configuration-nix.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5b9164711ea..1707877d30e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -869,7 +869,10 @@ self: super: builtins.intersectAttrs super { cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_7; }); hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; }; - hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; }; + hercules-ci-cnix-expr = + addTestToolDepend pkgs.git ( + super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; } + ); hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_7; }; # Enable extra optimisations which increase build time, but also From fde2e98a0116ddba74569d11f281cd87fbdf13ab Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 11 Apr 2022 01:26:04 +0200 Subject: [PATCH 07/22] haskell.compiler.ghcjs: fix build with aeson 2.0 --- .../compilers/ghcjs/8.10/common-overrides.nix | 35 +++++++++++++++++-- .../compilers/ghcjs/8.10/default.nix | 3 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix index a83795635b9..e1671d01ffe 100644 --- a/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix @@ -1,8 +1,37 @@ -{ haskellLib }: +{ haskellLib, fetchpatch, buildPackages }: -let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; +let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak markUnbroken overrideCabal; in self: super: { - ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: { + ghcjs = overrideCabal (drv: { + # Jailbreak and patch can be dropped after https://github.com/ghcjs/ghcjs/pull/833 + jailbreak = true; + patches = drv.patches or [] ++ [ + (fetchpatch { + name = "ghcjs-aeson-2.0.patch"; + url = "https://github.com/ghcjs/ghcjs/commit/9ef1f92d740e8503d15d91699f57db147f0474cc.patch"; + sha256 = "0cgxcy6b5870bv4kj54n3bzcqinh4gl4w4r78dg43h2mblhkzbnj"; + }) + ]; + }) (super.ghcjs.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; + webdriver = overrideCabal (drv: { + patches = drv.patches or [] ++ [ + # Patch for aeson 2.0 which adds a lower bound on it, so we don't apply it globally + # Pending https://github.com/kallisti-dev/hs-webdriver/pull/183 + (fetchpatch { + name = "webdriver-aeson-2.0.patch"; + url = "https://github.com/georgefst/hs-webdriver/commit/90ded63218da17fc0bd9f9b208b0b3f60b135757.patch"; + sha256 = "1xvkk51r2v020xlmci5n1fd1na8raa332lrj7r9f0ijsyfvnqlv0"; + excludes = [ "webdriver.cabal" ]; + }) + ]; + # Fix line endings so patch applies + prePatch = drv.prePatch or "" + '' + find . -name '*.hs' | xargs "${buildPackages.dos2unix}/bin/dos2unix" + ''; + + jailbreak = true; + broken = false; + }) super.webdriver; })); } diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 2fbf7ded9c4..78d757efee3 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -2,6 +2,7 @@ , pkgsHostHost , callPackage , fetchgit +, fetchpatch , ghcjsSrcJson ? null , ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson) , bootPkgs @@ -36,7 +37,7 @@ let }) (callPackage ./common-overrides.nix { - inherit haskellLib; + inherit haskellLib fetchpatch buildPackages; }) ghcjsDepOverrides ]); From 7ad0327b599c653cd8eecdae6dcb1eb2ceccc29e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 11 Apr 2022 01:36:54 +0200 Subject: [PATCH 08/22] release-haskell.nix: build boot ghcjs on Hydra By telling Hydra where to look explicitly, it can be instrumented to build the boot ghcjs which is only about 300MB. This saves at least some time compiling for users and will also provide some eval CI automatically. --- pkgs/top-level/release-haskell.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4eb8d040a7d..720b4e7fc33 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -129,7 +129,18 @@ let jobs = recursiveUpdateMany [ (mapTestOn { haskellPackages = packagePlatforms pkgs.haskellPackages; - haskell.compiler = packagePlatforms pkgs.haskell.compiler; + haskell.compiler = packagePlatforms pkgs.haskell.compiler // (lib.genAttrs [ + "ghcjs" + "ghcjs810" + ] (ghcjsName: { + # We can't build ghcjs itself, since it exceeds 3GB (Hydra's output limit) due + # to the size of its bundled libs. We can however save users a bit of compile + # time by building the bootstrap ghcjs on Hydra. For this reason, we overwrite + # the ghcjs attributes in haskell.compiler with a reference to the bootstrap + # ghcjs attribute in their bootstrap package set (exposed via passthru) which + # would otherwise be ignored by Hydra. + bootGhcjs = (packagePlatforms pkgs.haskell.compiler.${ghcjsName}.passthru).bootGhcjs; + })); tests.haskell = packagePlatforms pkgs.tests.haskell; From 1be5cae549b0f8a85915062450808ce58939bac1 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 12 Apr 2022 14:15:05 +0900 Subject: [PATCH 09/22] haskell: remove override of integer-gmp It appears that integer-gmp is already set to null for all compilers, so there is no need to explicitly set it to null in the integer-simple and native-bignum package sets. --- pkgs/top-level/haskell-packages.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9e77eecaed4..c040e8c722a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -259,10 +259,7 @@ in { overrides = pkgs.lib.composeExtensions (oldAttrs.overrides or (_: _: {})) - (_: _: { - integer-simple = null; - integer-gmp = null; - }); + (_: _: { integer-simple = null; }); }) ); @@ -274,14 +271,10 @@ in { in pkgs.lib.genAttrs nativeBignumGhcNames (name: - packages.${name}.override (oldAttrs: { + packages.${name}.override { ghc = bh.compiler.native-bignum.${name}; buildHaskellPackages = bh.packages.native-bignum.${name}; - overrides = - pkgs.lib.composeExtensions - (oldAttrs.overrides or (_: _: {})) - (_: _: { integer-gmp = null; }); - }) + } ); }; } From bb6afd70079c1de67bcb0f29e9754451741443e6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 12 Apr 2022 12:35:46 +0200 Subject: [PATCH 10/22] haskellPackages.gi-adwaita: mark as broken See #164686. As Stackage LTS still restricts the gi-gtk packages to GTK 3 compatible releases, looking into this doesn't make too much sense yet. (Also nothing actually depends on it at the moment.) --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5402b7b1e76..a7adf844a59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1688,6 +1688,7 @@ broken-packages: - ghc-usage - gh-labeler - giak + - gi-adwaita - gi-cogl - Gifcurry - gi-gio-hs-list-model diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ecdae328277..48a3181014c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -68,8 +68,7 @@ core-packages: # tracked in stackage.yaml. Adding conflicting overrides with stackage here will # not work. default-package-overrides: - # gi-gdkx11-4.x requires gtk-4.x, which is still under development and - # not yet available in Nixpkgs + # gi-gdkx11-4.x requires gtk-4.x, but stackage still restricts gi-gtk to 3.* - gi-gdkx11 < 4 # reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0 - reflex-dom-pandoc < 1.0.0.0 From ab12eef0fbfbd1ab07be0c0c63dceeabe4b84f49 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 13 Apr 2022 00:48:46 +0200 Subject: [PATCH 11/22] haskellPackages.cryptostore: disable flaky test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3f820347e54..c863c0b340a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2540,6 +2540,9 @@ self: super: { # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; + # 2022-04-12: Flaky test suite: https://github.com/ocheron/cryptostore/issues/7 + cryptostore = dontCheck 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; From 76168cb09670a03ae62a7150b2f910ef4756b093 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 14 Apr 2022 12:30:48 +0200 Subject: [PATCH 12/22] haskell.packages.ghc8107.haskell-language-server: enable hlint plugin --- .../haskell-modules/configuration-ghc-8.10.x.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 84d0a30858f..bd84ef84d49 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -89,19 +89,22 @@ self: super: { mime-string = disableOptimization super.mime-string; # Older compilers need the latest ghc-lib to build this package. - hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin; + hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: { + # Workaround for https://github.com/haskell/haskell-language-server/issues/2728 + postPatch = '' + sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs + ''; + }) + super.hls-hlint-plugin); haskell-language-server = appendConfigureFlags [ "-f-fourmolu" "-f-stylishhaskell" "-f-brittany" - "-f-hlint" ] (super.haskell-language-server.override { # Not buildable on 8.10 hls-fourmolu-plugin = null; - # https://github.com/haskell/haskell-language-server/issues/2728 - hls-hlint-plugin = null; }); # ormolu 0.3 requires Cabal == 3.4 From 82b4dabe8f9f54df50514db0375dd466c1a1fb6c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 14 Apr 2022 12:47:52 +0200 Subject: [PATCH 13/22] haskell.packages.ghc8107.haskell-language-server: enable fourmolu plugin --- .../haskell-modules/configuration-ghc-8.10.x.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index bd84ef84d49..5b13e0d036b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -98,14 +98,13 @@ self: super: { super.hls-hlint-plugin); haskell-language-server = appendConfigureFlags [ - "-f-fourmolu" "-f-stylishhaskell" "-f-brittany" ] - (super.haskell-language-server.override { - # Not buildable on 8.10 - hls-fourmolu-plugin = null; - }); + super.haskell-language-server; + + # has a restrictive lower bound on Cabal + fourmolu = doJailbreak super.fourmolu; # ormolu 0.3 requires Cabal == 3.4 ormolu = super.ormolu_0_2_0_0; From 3fa9ae18a01b7a87e245000bb0c25d0d011a66b9 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 14 Apr 2022 13:00:43 +0200 Subject: [PATCH 14/22] haskell.packages.ghc884.haskell-language-server: enable hlint and fourmolu plugins --- .../configuration-ghc-8.8.x.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 6b56d9eb735..9a6e8ccab16 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -131,18 +131,23 @@ self: super: { mime-string = disableOptimization super.mime-string; + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: { + # Workaround for https://github.com/haskell/haskell-language-server/issues/2728 + postPatch = '' + sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs + ''; + }) + super.hls-hlint-plugin); + haskell-language-server = appendConfigureFlags [ - "-f-fourmolu" "-f-stylishhaskell" "-f-brittany" - "-f-hlint" ] - (super.haskell-language-server.override { - # Not buildable on 8.8 - hls-fourmolu-plugin = null; - # https://github.com/haskell/haskell-language-server/issues/2728 - hls-hlint-plugin = null; - }); + super.haskell-language-server; + + # has a restrictive lower bound on Cabal + fourmolu = doJailbreak super.fourmolu; # OneTuple needs hashable instead of ghc-prim for GHC < 9 OneTuple = super.OneTuple.override { From c1f27518045e6e61b74ad8e9a039221ae1ae8438 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 16 Apr 2022 20:25:23 +0200 Subject: [PATCH 15/22] haskellPackages.cryptostore: 0.2.1.0 -> 0.2.2.0 This upgrade fixes a genuine bug caught by the test suite (which wasn't flaky as it turns out), so we'll upgrade manually. --- .../haskell-modules/configuration-common.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c863c0b340a..6d3b2438d77 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2540,8 +2540,14 @@ self: super: { # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; - # 2022-04-12: Flaky test suite: https://github.com/ocheron/cryptostore/issues/7 - cryptostore = dontCheck super.cryptostore; + # 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; From c9aacf1f8b807f19195bc5b24f01460db69581a3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 17 Apr 2022 20:48:07 +0200 Subject: [PATCH 16/22] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh Note: some failing packages are not marked as broken to monitor multiple weird failures involving: > Test.QuickCheck.resize: negative size Could be a bug involving hspec and QuickCheck in some way. --- .../configuration-hackage2nix/broken.yaml | 4 +++- .../configuration-hackage2nix/transitive-broken.yaml | 2 +- pkgs/development/haskell-modules/hackage-packages.nix | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a7adf844a59..3571beda6bd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1687,8 +1687,8 @@ broken-packages: - ghcup - ghc-usage - gh-labeler - - giak - gi-adwaita + - giak - gi-cogl - Gifcurry - gi-gio-hs-list-model @@ -2546,6 +2546,7 @@ broken-packages: - hylolib - hyperdrive - hyperfunctions + - hyper-haskell-server - hyperion - hyperloglogplus - hyperscript @@ -4025,6 +4026,7 @@ broken-packages: - process-leksah - process-listlike - processmemory + - procex - procrastinating-variable - procstat - prof2pretty diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7b527b41d85..47a41044af5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2446,7 +2446,6 @@ dont-distribute-packages: - kansas-lava-shake - karakuri - karps - - katip-elasticsearch - katip-raven - katip-rollbar - keenser @@ -2789,6 +2788,7 @@ dont-distribute-packages: - moonshine - morley - morley-client + - morley-prelude - morley-upgradeable - morpheus-graphql - morpheus-graphql-app diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9547c11ac60..36ed959863b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -45328,7 +45328,6 @@ self: { ]; description = "Elasticsearch client library for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -106948,6 +106947,8 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage @@ -150269,6 +150270,8 @@ self: { ]; description = "Server back-end for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hyperdrive" = callPackage @@ -161101,7 +161104,6 @@ self: { ]; description = "ElasticSearch scribe for the Katip logging framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katip-kafka" = callPackage @@ -186559,6 +186561,7 @@ self: { ]; description = "A custom prelude used in Morley"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "morley-upgradeable" = callPackage @@ -219134,6 +219137,8 @@ self: { testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "procrastinating-structure" = callPackage From 471653824c1d2bf42f107c3f7942ba0d72aa7951 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 19 Apr 2022 12:02:01 +0200 Subject: [PATCH 17/22] pkgsMusl.haskell.compiler.ghc884: bootstrap using normal binary ghc On non-arm platforms there's no reason to use the minimal GHC for musl bootstrapping, as it doesn't hit the size limit. Additionally this serves as a wonky workaround for ghc#21402 [1], as the minimal GHC 8.10.2 binary currently contains `xxx` in its `outPath`. [1]: https://gitlab.haskell.org/ghc/ghc/-/issues/21402 --- pkgs/top-level/haskell-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c040e8c722a..c46a7f1bcd2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -79,9 +79,12 @@ in { ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { bootPkgs = # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.isAarch64 || stdenv.hostPlatform.isMusl then + # 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities + if stdenv.isAarch64 then packages.ghc8102BinaryMinimal + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + else if stdenv.hostPlatform.isMusl then + packages.ghc8102Binary else packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; From 56c72fce7d2190ac2bbb5da2a7a3b51c0e57c4fe Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 19 Apr 2022 23:33:53 +0900 Subject: [PATCH 18/22] spago: get working by using aeson-1.5.6.0 --- .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 47a41044af5..b8378378650 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3650,7 +3650,6 @@ dont-distribute-packages: - soundgen - source-code-server - spade - - spago - sparkle - sparrow - sparsebit diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1707877d30e..4116cf51ebe 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -619,8 +619,15 @@ self: super: builtins.intersectAttrs super { ''; }) super.spago; + spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: { + # spago (and its dependency, bower-json) is not yet updated for aeson-2.0 + aeson = hfinal.aeson_1_5_6_0; + # bower-json needs aeson_1_5_6_0 and is marked broken without it. + bower-json = doDistribute (markUnbroken hprev.bower-json); + }); + # Tests require network access. - spagoWithoutChecks = dontCheck spagoDocs; + spagoWithoutChecks = dontCheck spagoOldAeson; in spagoWithoutChecks; From f1f7144df4643993d9d7c74c8df5ed9e026c37f5 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 21 Apr 2022 09:34:45 +0900 Subject: [PATCH 19/22] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 5 +++++ .../transitive-broken.yaml | 4 ++++ .../haskell-modules/hackage-packages.nix | 14 ++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3571beda6bd..f18d261ce1a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -357,6 +357,7 @@ broken-packages: - binary-communicator - binary-derive - binary-ext + - binary-generic-combinators - binary-indexed-tree - binary-protocol - binary-tree @@ -2780,6 +2781,7 @@ broken-packages: - kangaroo - karabiner-config - katip-datadog + - katip-elasticsearch - katip-kafka - katip-logzio - katip-scalyr-scribe @@ -3332,6 +3334,7 @@ broken-packages: - msgpack - msgpack-binary - msgpack-persist + - msgpack-types - msh - msi-kb-backlit - MTGBuilder @@ -3597,6 +3600,7 @@ broken-packages: - open-signals - opensoundcontrol-ht - openssh-protocol + - opentelemetry-extra - opentelemetry-http-client - opentheory-char - opentok @@ -4333,6 +4337,7 @@ broken-packages: - robin - robots-txt - roc-cluster + - roc-id - roku-api - rollbar-client - rollbar-hs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b8378378650..b712cbcd153 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2811,9 +2811,11 @@ dont-distribute-packages: - mptcp-pm - mptcpanalyzer - msgpack-aeson + - msgpack-arbitrary - msgpack-idl - msgpack-rpc - msgpack-rpc-conduit + - msgpack-testsuite - mtgoxapi - mu-avro - mu-graphql @@ -2965,6 +2967,8 @@ dont-distribute-packages: - openpgp-Crypto - openpgp-crypto-api - openssh-github-keys + - opentelemetry-lightstep + - opentelemetry-lightstep_0_8_0 - optima-for-hasql - optimal-blocks - optimusprime diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 36ed959863b..59fe88f0b24 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -41656,6 +41656,8 @@ self: { ]; description = "Combinators and utilities to make Generic-based deriving of Binary easier and more expressive"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "binary-ieee754" = callPackage @@ -161104,6 +161106,8 @@ self: { ]; description = "ElasticSearch scribe for the Katip logging framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "katip-kafka" = callPackage @@ -187795,6 +187799,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "msgpack-binary" = callPackage @@ -187936,6 +187941,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "msgpack-types" = callPackage @@ -187960,6 +187966,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "msh" = callPackage @@ -199879,6 +199887,8 @@ self: { testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opentelemetry-extra_0_8_0" = callPackage @@ -199916,6 +199926,7 @@ self: { benchmarkHaskellDepends = [ base opentelemetry tasty-bench ]; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opentelemetry-http-client" = callPackage @@ -199957,6 +199968,7 @@ self: { splitmix text typed-process unordered-containers ]; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "opentelemetry-lightstep_0_8_0" = callPackage @@ -234558,6 +234570,8 @@ self: { ]; description = "Implementation of the ROC National ID standard"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rock" = callPackage From 3e6d4c00a9ad98fcdceb476aab68de2f92b752b2 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 21 Apr 2022 09:47:56 +0900 Subject: [PATCH 20/22] jl: mark broken jl appears to need support added for aeson-2.0, or either building it will aeson-1.5. --- pkgs/development/tools/jl/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index 15347432f70..bc41263e96f 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/pkgs/development/tools/jl/default.nix @@ -34,4 +34,10 @@ mkDerivation rec { description = "Functional sed for JSON"; maintainers = with lib.maintainers; [ fgaz ]; homepage = "https://github.com/chrisdone/jl"; + + # jl needs to be updated to work with aeson-2.0. + # As far as I can tell, there is unfortunately no where to report issues upstream + # for us to be able to track when upstream adds aeson-2.0 support. + hydraPlatforms = lib.platforms.none; + broken = true; } From 9cd8281b8b142c572eda5d5693aa192000ec4250 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 21 Apr 2022 10:28:50 +0900 Subject: [PATCH 21/22] hyper-haskell-server-with-packages: mark broken --- pkgs/development/tools/haskell/hyper-haskell/server.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix index b8e5aa281ea..ca272eb3626 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -1,4 +1,4 @@ -{ stdenv, ghcWithPackages, makeWrapper, packages }: +{ stdenv, ghcWithPackages, makeWrapper, packages, lib }: let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); @@ -19,4 +19,11 @@ in stdenv.mkDerivation { # trivial derivation preferLocalBuild = true; allowSubstitutes = false; + + meta = { + # Marked as broken because the underlying + # haskellPackages.hyper-haskell-server is marked as broken. + hydraPlatforms = lib.platforms.none; + broken = true; + }; } From ddbc061b4bd47cbc78b4288693e23552b91b1f4e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 21 Apr 2022 10:34:31 +0900 Subject: [PATCH 22/22] hasura-graphql-engine: mark as broken `graphql-engine` and `graphql-parser` appear to need to be updated for aeson-2.0. --- pkgs/development/misc/haskell/hasura/graphql-engine.nix | 5 +++++ pkgs/development/misc/haskell/hasura/graphql-parser.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix index 646c5767136..7e44cffe893 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix @@ -96,4 +96,9 @@ mkDerivation { description = "GraphQL API over Postgres"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lassulus ]; + + # Needs to be updated for aeson-2.0 + # https://github.com/hasura/graphql-engine/issues/8369 + hydraPlatforms = lib.platforms.none; + broken = true; } diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix index 70024ce732c..5061fe4a2ec 100644 --- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix +++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix @@ -29,4 +29,9 @@ mkDerivation { description = "A native Haskell GraphQL parser"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; + + # Needs to be updated for aeson-2.0 + # https://github.com/hasura/graphql-engine/issues/8369 + hydraPlatforms = lib.platforms.none; + broken = true; }