From 642279ab6fa65cd8207699a5eb7da5a0e0d0a19a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 22 Jul 2022 01:00:22 +0200 Subject: [PATCH 01/13] haskellPackages: stackage LTS 19.15 -> LTS 19.16 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 99112fb4a2f9..e0e05f00797d 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.15 +# Stackage LTS 19.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -16,8 +16,8 @@ default-package-overrides: - adjunctions ==4.4.1 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.8.1 - - aern2-mp ==0.2.8.0 - - aern2-real ==0.2.8.0 + - aern2-mp ==0.2.9.1 + - aern2-real ==0.2.9.1 - aeson ==2.0.3.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.1 @@ -293,7 +293,7 @@ default-package-overrides: - case-insensitive ==1.2.1.0 - cases ==0.1.4.1 - casing ==0.1.4.1 - - cassava ==0.5.2.0 + - cassava ==0.5.3.0 - cassava-conduit ==0.6.0 - cassava-megaparsec ==2.0.4 - cast ==0.1.0.2 @@ -333,7 +333,7 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - circular ==0.4.0.2 + - circular ==0.4.0.3 - citeproc ==0.6.0.1 - clash-ghc ==1.6.3 - clash-lib ==1.6.3 @@ -581,7 +581,7 @@ default-package-overrides: - di-monad ==1.3.1 - directory-tree ==0.12.1 - direct-sqlite ==2.3.27 - - dirichlet ==0.1.0.6 + - dirichlet ==0.1.0.7 - discount ==0.1.1 - discover-instances ==0.1.0.0 - discrimination ==0.4.1 @@ -813,7 +813,7 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==2.0.0.2 - functor-combinators ==0.4.1.0 - - fused-effects ==1.1.1.3 + - fused-effects ==1.1.2.0 - fusion-plugin ==0.2.4 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -898,6 +898,7 @@ default-package-overrides: - gi-cairo-render ==0.1.1 - gi-dbusmenu ==0.4.10 - gi-dbusmenugtk3 ==0.4.11 + - gi-freetype2 ==2.0.1 - gi-gdk ==3.0.25 - gi-gdkpixbuf ==2.0.28 - gi-gdkx11 ==3.0.12 @@ -909,7 +910,7 @@ default-package-overrides: - gi-gtk ==3.0.38 - gi-gtk-hs ==0.3.12 - gi-gtksource ==3.0.25 - - gi-harfbuzz ==0.0.5 + - gi-harfbuzz ==0.0.6 - gi-javascriptcore ==4.0.24 - ginger ==0.10.4.0 - gi-pango ==1.0.26 @@ -1036,7 +1037,7 @@ default-package-overrides: - hedn ==0.3.0.4 - here ==1.2.13 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.6 + - heterocephalus ==1.0.5.7 - hex ==0.2.0 - hexml ==0.3.4 - hexpat ==0.20.13 @@ -1392,8 +1393,8 @@ default-package-overrides: - lens-action ==0.2.6 - lens-aeson ==1.1.3 - lens-csv ==0.1.1.0 - - lens-family ==2.1.1 - - lens-family-core ==2.1.0 + - lens-family ==2.1.2 + - lens-family-core ==2.1.2 - lens-family-th ==0.5.2.1 - lens-misc ==0.0.2.0 - lens-process ==0.4.0.0 @@ -1422,7 +1423,7 @@ default-package-overrides: - linear-circuit ==0.1.0.4 - linebreak ==1.1.0.1 - linenoise ==0.3.2 - - linux-capabilities ==0.1.0.0 + - linux-capabilities ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1430,7 +1431,7 @@ default-package-overrides: - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==2.0.0.0 - - list-t ==1.0.5.2 + - list-t ==1.0.5.3 - list-transformer ==1.0.8 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1484,7 +1485,7 @@ default-package-overrides: - massiv-persist ==1.0.0.3 - massiv-serialise ==1.0.0.2 - massiv-test ==1.0.0.0 - - mathexpr ==0.3.0.0 + - mathexpr ==0.3.1.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.2 - matplotlib ==0.7.7 @@ -1539,7 +1540,7 @@ default-package-overrides: - mintty ==0.1.4 - missing-foreign ==0.1.1 - MissingH ==1.5.0.1 - - mixed-types-num ==0.5.9.1 + - mixed-types-num ==0.5.10 - mmap ==0.5.9 - mmark ==0.0.7.6 - mmark-cli ==0.0.5.1 @@ -1660,7 +1661,7 @@ default-package-overrides: - network-wait ==0.1.2.0 - newtype ==0.2.2.0 - newtype-generics ==0.6.2 - - nfc ==0.1.0 + - nfc ==0.1.1 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-derivation ==1.1.2 @@ -1749,7 +1750,7 @@ default-package-overrides: - pandoc ==2.17.1.1 - pandoc-csv2table ==1.0.9 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-lua-marshal ==0.1.6.1 + - pandoc-lua-marshal ==0.1.7 - pandoc-plot ==1.4.1 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22.2 @@ -1785,7 +1786,7 @@ default-package-overrides: - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - - pava ==0.1.1.3 + - pava ==0.1.1.4 - pcg-random ==0.1.3.7 - pcre2 ==2.1.1.1 - pcre-heavy ==1.0.0.2 @@ -2046,7 +2047,7 @@ default-package-overrides: - regex-pcre-builtin ==0.95.2.3.8.44 - regex-posix ==0.96.0.1 - regex-posix-clib ==2.7 - - regex-tdfa ==1.3.1.2 + - regex-tdfa ==1.3.1.4 - regex-with-pcre ==1.1.0.2 - reinterpret-cast ==0.1.0 - rel8 ==1.3.1.0 @@ -2070,7 +2071,7 @@ default-package-overrides: - resource-pool ==0.2.3.2 - resourcet ==1.2.6 - result ==0.2.6.0 - - retry ==0.9.2.1 + - retry ==0.9.3.0 - rev-state ==0.1.2 - rfc1751 ==0.1.3 - rfc5051 ==0.2 @@ -2117,7 +2118,7 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.9 + - sandwich ==0.1.0.10 - sandwich-quickcheck ==0.1.0.6 - sandwich-slack ==0.1.0.6 - say ==0.1.0.1 From 8aeb1d8ec5787dbadcc418c751247489386d827f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 22 Jul 2022 01:00:36 +0200 Subject: [PATCH 02/13] all-cabal-hashes: 2022-07-18T21:55:34Z -> 2022-07-21T21:13:45Z 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 958478e86839..37ae9808bdd9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "f254a995da2ac1341f05d921778c064b49a5fcb2", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f254a995da2ac1341f05d921778c064b49a5fcb2.tar.gz", - "sha256": "136liqr85agwz0byvlp31r7in1nx28lm5y9kk7qy2jamspyf52hy", - "msg": "Update from Hackage at 2022-07-18T21:55:34Z" + "commit": "155a57bcfc019c9972a44be54a407d0329dfb436", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/155a57bcfc019c9972a44be54a407d0329dfb436.tar.gz", + "sha256": "17pqq15b936gf8vm1lb1kmnnlmjd61a5bfld9v3cs7ydz764kg8w", + "msg": "Update from Hackage at 2022-07-21T21:13:45Z" } From 28e9634a9dc5007266e668941b3f3a43dc044732 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 22 Jul 2022 01:01:30 +0200 Subject: [PATCH 03/13] 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 | 919 ++++++++---------- 1 file changed, 416 insertions(+), 503 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f2872558e78..00bb29aa0b24 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2069,8 +2069,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.0.2.2"; - sha256 = "1xj2m7hblaq1d5z9f4ygfwi23w1xvfmjjwrsm2m5kwkp10k5d19i"; + version = "1.0.2.3"; + sha256 = "1c113fdjwfbh01n3xsprya4dp6wc4m9xvilx9fyb3lbzdmmii624"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -14488,8 +14488,8 @@ self: { }: mkDerivation { pname = "NGLess"; - version = "1.4.1.1"; - sha256 = "0d2xkm6cw4g563d687bb6c3b971h72i0bf50k0arjkv9n7cp9sh9"; + version = "1.4.2.0"; + sha256 = "0578rjwi3xwikfaxha8yignr37adykqkbhspxds0c5bzwcw5zywh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -19688,8 +19688,8 @@ self: { }: mkDerivation { pname = "Spock-core"; - version = "0.14.0.0"; - sha256 = "0bcxngy33wap9py3y4f6kjysl31yjz3qmkp6z5z6pka80x9w3sf7"; + version = "0.14.0.1"; + sha256 = "0a93v9pxbvd9qqpx9rnv6gqpc5y8xh5dkfi0lkc566pj9cv8bpad"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie hashable http-api-data http-types hvect mmorph monad-control @@ -21638,8 +21638,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.0.0.0"; - sha256 = "0k4bg9shg8vklqhcd8ms9bpciwf4q1mip5m2agz3qj4056mrnjp9"; + version = "1.2.0.0"; + sha256 = "0zq7dxw050bj13mb7ayz144lxpwwhd424wzafnypn5i3vpmgldd6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -25049,27 +25049,6 @@ self: { }) {}; "aern2-mp" = callPackage - ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec - , integer-logarithms, mixed-types-num, QuickCheck, reflection - , regex-tdfa, template-haskell - }: - mkDerivation { - pname = "aern2-mp"; - version = "0.2.8.0"; - sha256 = "0nfd2r05jm93idsgijccxzqkkpjkpkn8jz3kqwanlma0x3wj02cj"; - libraryHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - testHaskellDepends = [ - base cdar-mBound collect-errors deepseq hspec integer-logarithms - mixed-types-num QuickCheck reflection regex-tdfa template-haskell - ]; - description = "Multi-precision ball (interval) arithmetic"; - license = lib.licenses.bsd3; - }) {}; - - "aern2-mp_0_2_9_1" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell @@ -25088,30 +25067,9 @@ self: { ]; description = "Multi-precision ball (interval) arithmetic"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aern2-real" = callPackage - ({ mkDerivation, aern2-mp, base, collect-errors, hspec - , integer-logarithms, mixed-types-num, QuickCheck - }: - mkDerivation { - pname = "aern2-real"; - version = "0.2.8.0"; - sha256 = "13nk4s5r7h7wg4q0x01f8aiy432zngynd5qbqsqi9fz149k7mik1"; - libraryHaskellDepends = [ - aern2-mp base collect-errors hspec integer-logarithms - mixed-types-num QuickCheck - ]; - testHaskellDepends = [ - aern2-mp base collect-errors hspec integer-logarithms - mixed-types-num QuickCheck - ]; - description = "Real numbers as sequences of MPBalls"; - license = lib.licenses.bsd3; - }) {}; - - "aern2-real_0_2_9_1" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: @@ -25129,7 +25087,6 @@ self: { ]; description = "Real numbers as convergent sequences of intervals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson_1_5_6_0" = callPackage @@ -38064,20 +38021,18 @@ self: { }) {}; "aws-arn" = callPackage - ({ mkDerivation, base, deriving-compat, hashable, lens, tasty - , tasty-discover, tasty-hunit, text + ({ mkDerivation, base, deriving-compat, hashable, profunctors + , tagged, tasty, tasty-discover, tasty-hunit, text }: mkDerivation { pname = "aws-arn"; - version = "0.1.0.1"; - sha256 = "0ml27685rjycrhc84sq41yniy15s2ak59cq5j1ybf9mxkwl52qcn"; - revision = "1"; - editedCabalFile = "1jm9g9fqyk2xr37kw52qghcpr9ak9nss1hnc3wy1lq2an42q1dpw"; + version = "0.2.0.0"; + sha256 = "1amqcycxncgcs7nvpxrr2f2r2g6dhyfmlcwsk2am8l9ncmrr8ijx"; libraryHaskellDepends = [ - base deriving-compat hashable lens text + base deriving-compat hashable profunctors tagged text ]; testHaskellDepends = [ - base deriving-compat lens tasty tasty-discover tasty-hunit text + base deriving-compat profunctors tagged tasty tasty-hunit text ]; testToolDepends = [ tasty-discover ]; description = "Types and optics for manipulating Amazon Resource Names (ARNs)"; @@ -40317,6 +40272,8 @@ self: { pname = "base64"; version = "0.4.2.4"; sha256 = "119mpqcv1rwkhwm69ga2b4f7hr825fa5wfm1w3i1szmhzh52s2k4"; + revision = "1"; + editedCabalFile = "09jja484hzhnjfaz9whridrxsk799gyrg6qnvbpiy8q9c5cybfhi"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -51334,8 +51291,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.1.3"; - sha256 = "1zy2b86ns5jhrl6z6qw6g1zq5nv3lpf4askpr40l9gid61h6mr01"; + version = "0.1.1.4"; + sha256 = "0rgv66b26kjzl06xlh1x0l4xxc8a0fvzvj6jm9asya2wrmvs9z9m"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -54672,33 +54629,6 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, text-short, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.5.2.0"; - sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "9"; - editedCabalFile = "087489f6wx9gcr107xnw7pbmnwh9rkdqqk2sky3g43k87j2aqhbj"; - configureFlags = [ "-f-bytestring--lt-0_10_4" ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers deepseq hashable Only - scientific text text-short transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck - quickcheck-instances scientific test-framework test-framework-hunit - test-framework-quickcheck2 text unordered-containers vector - ]; - description = "A CSV parsing and encoding library"; - license = lib.licenses.bsd3; - }) {}; - - "cassava_0_5_3_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , deepseq, hashable, HUnit, Only, QuickCheck, quickcheck-instances , scientific, test-framework, test-framework-hunit @@ -54721,7 +54651,6 @@ self: { ]; description = "A CSV parsing and encoding library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cassava-conduit" = callPackage @@ -58085,24 +58014,6 @@ self: { }) {}; "circular" = callPackage - ({ mkDerivation, aeson, base, criterion, hspec, primitive - , QuickCheck, quickcheck-instances, vector - }: - mkDerivation { - pname = "circular"; - version = "0.4.0.2"; - sha256 = "1wmm649rpjyy1w7k8zd4b8k52cb26i2jq4n6hszbspxp2bcvrnfs"; - libraryHaskellDepends = [ aeson base primitive vector ]; - testHaskellDepends = [ - aeson base hspec primitive QuickCheck quickcheck-instances vector - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Circular fixed-sized mutable vectors"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "circular_0_4_0_3" = callPackage ({ mkDerivation, aeson, base, criterion, hspec, primitive , QuickCheck, quickcheck-instances, vector }: @@ -58117,7 +58028,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -75373,6 +75283,35 @@ self: { broken = true; }) {}; + "dbmonitor" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, dhall + , directory, filepath, fsnotify, hasql, lifted-base, monad-control + , mtl, optparse-applicative, stm, telegram-bot-simple, text, time + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "dbmonitor"; + version = "0.1.0"; + sha256 = "02j2f6r7jkgmmxqxysz45api0ai8wic4dffhw0y1xxhwfw5cx023"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base bytestring dhall directory filepath + fsnotify hasql lifted-base monad-control mtl optparse-applicative + stm telegram-bot-simple text time transformers-base + unordered-containers vector + ]; + executableHaskellDepends = [ + ansi-terminal async base bytestring dhall directory filepath + fsnotify hasql lifted-base monad-control mtl optparse-applicative + stm telegram-bot-simple text time transformers-base + unordered-containers vector + ]; + description = "Data consistency alerting for PostgreSQL"; + license = lib.licenses.bsd3; + mainProgram = "dbmonitor"; + }) {}; + "dbus" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens @@ -76501,12 +76440,12 @@ self: { mainProgram = "deeplearning_demonstration"; }) {}; - "deepseq_1_4_7_0" = callPackage + "deepseq_1_4_8_0" = callPackage ({ mkDerivation, array, base, ghc-prim }: mkDerivation { pname = "deepseq"; - version = "1.4.7.0"; - sha256 = "0sm00rsw714y73qr5zihz5fhxw0hahs6ksmf8wa60m1qwb9jcy9v"; + version = "1.4.8.0"; + sha256 = "0nk5hly70xb91q5pnq87yrwh0365kqj7iyhq5mbj8yhgwxr1661d"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ array base ghc-prim ]; description = "Deep evaluation of data structures"; @@ -81087,23 +81026,6 @@ self: { }) {}; "dirichlet" = callPackage - ({ mkDerivation, base, hspec, log-domain, math-functions - , mwc-random, primitive, vector - }: - mkDerivation { - pname = "dirichlet"; - version = "0.1.0.6"; - sha256 = "1awypb4ww1mgmvyd16hx1wxjws83slv65i3dc059b7w5nrmwqg49"; - libraryHaskellDepends = [ - base log-domain math-functions mwc-random primitive vector - ]; - testHaskellDepends = [ base hspec log-domain mwc-random vector ]; - description = "Multivariate Dirichlet distribution"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "dirichlet_0_1_0_7" = callPackage ({ mkDerivation, base, hspec, log-domain, math-functions , mwc-random, random, vector }: @@ -81117,7 +81039,6 @@ self: { testHaskellDepends = [ base hspec log-domain random vector ]; description = "Multivariate Dirichlet distribution"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -84212,6 +84133,36 @@ self: { mainProgram = "dotenv"; }) {}; + "dotenv_0_9_0_3" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec + , optparse-applicative, process, shellwords, text + }: + mkDerivation { + pname = "dotenv"; + version = "0.9.0.3"; + sha256 = "163w2japbcdjzmhr7afq2rss7sp7gz2j8mylcc716x63gm3ws20h"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat containers directory exceptions megaparsec process + shellwords text + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec process shellwords text + ]; + testToolDepends = [ hspec-discover ]; + description = "Loads environment variables from dotenv files"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "dotenv"; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -87347,10 +87298,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "1.0.0.0"; - sha256 = "0z1jnlmxwvacnira88rh5syd3p2rwy71cqb7nq4wlza43ym1vifa"; - revision = "1"; - editedCabalFile = "14y45ykqrxcl980rbn1pvzh7vldrg0hf55710544ssgbh9m71mrb"; + version = "1.1.0.0"; + sha256 = "0hfy27bgx57rga93jrj16laia65anhcks9b8xcwfsvc4zp3bsckh"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -87372,8 +87321,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "1.0.0.0"; - sha256 = "1mnwlq5i1y77f4p2jpyc6ciw600giz9g1n5rs0lwzwnbrjckqfp5"; + version = "1.1.0.0"; + sha256 = "1wglhfxmp7vcvyijdz9zmh8ai1q1k0a83d7klmiipxvym853w97b"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -87391,6 +87340,8 @@ self: { pname = "effectful-plugin"; version = "1.0.0.0"; sha256 = "11y9d1ylwhgrrwf0pcpjqix2vrwzbwr2rlma6rm0h8yqpkchbx81"; + revision = "1"; + editedCabalFile = "0878clqj18snfg7qlrpca21jy12w5b99d79gx6hkkw8pqi4x96x8"; libraryHaskellDepends = [ base containers effectful-core ghc ghc-tcplugins-extra ]; @@ -87407,6 +87358,8 @@ self: { pname = "effectful-th"; version = "1.0.0.0"; sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; + revision = "1"; + editedCabalFile = "0qpyaxkvz1h6z80zhiq80vs6hhgpp02faxxv5zyxkmi4ixf5arr2"; libraryHaskellDepends = [ base containers effectful exceptions template-haskell th-abstraction @@ -93645,6 +93598,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "explainable-predicates_0_1_2_2" = callPackage + ({ mkDerivation, array, base, doctest-exitcode-stdio, doctest-lib + , hspec, HUnit, mono-traversable, QuickCheck, regex-tdfa, syb + , template-haskell + }: + mkDerivation { + pname = "explainable-predicates"; + version = "0.1.2.2"; + sha256 = "16aajh4b6pg94y14581ppqlwhkb3qgz1d87zz6zjy7kbg8acrffa"; + libraryHaskellDepends = [ + array base HUnit mono-traversable QuickCheck regex-tdfa syb + template-haskell + ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib hspec + ]; + description = "Predicates that can explain themselves"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "explicit-constraint-lens" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -101608,40 +101582,38 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, base, Blammo, bugsnag, bytestring - , case-insensitive, conduit, containers, datadog, directory - , doctest, ekg-core, envparse, errors, exceptions, extra, filepath - , Glob, hashable, hspec, hspec-core, hspec-expectations-lifted + , case-insensitive, conduit, containers, datadog, doctest, dotenv + , ekg-core, envparse, errors, exceptions, extra, filepath, Glob + , hashable, hspec, hspec-core, hspec-expectations-lifted , hspec-junit-formatter, http-client, http-conduit , http-link-header, http-types, immortal, lens, lens-aeson - , load-env, memcache, monad-control, MonadRandom, mtl, network-uri + , memcache, monad-control, MonadRandom, mtl, network-uri , path-pieces, persistent, persistent-postgresql, postgresql-simple - , primitive, process, QuickCheck, resource-pool, retry, safe - , scientist, semigroupoids, template-haskell, temporary, text, time - , transformers, transformers-base, typed-process, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod-core + , primitive, QuickCheck, resource-pool, retry, safe, scientist + , semigroupoids, template-haskell, text, time, transformers + , transformers-base, typed-process, unliftio, unliftio-core + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.5.1.0"; - sha256 = "01qghpcgsh4fbszq7p21n1gk16v88bna2kr8aax81wl1iqabpyg1"; + version = "1.6.0.0"; + sha256 = "1ciqkqzif6hnasqhcmlhm5smq06mjh05l94v36413zv7ikcszygx"; libraryHaskellDepends = [ aeson base Blammo bugsnag bytestring case-insensitive conduit - containers datadog doctest ekg-core envparse errors exceptions - extra filepath Glob hashable hspec hspec-core + containers datadog doctest dotenv ekg-core envparse errors + exceptions extra filepath Glob hashable hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client - http-conduit http-link-header http-types immortal lens load-env - memcache monad-control MonadRandom mtl network-uri path-pieces - persistent persistent-postgresql postgresql-simple primitive - resource-pool retry safe scientist semigroupoids template-haskell - text time transformers transformers-base typed-process unliftio - unliftio-core unordered-containers vector wai wai-extra yaml - yesod-core + http-conduit http-link-header http-types immortal lens memcache + monad-control MonadRandom mtl network-uri path-pieces persistent + persistent-postgresql postgresql-simple primitive resource-pool + retry safe scientist semigroupoids template-haskell text time + transformers transformers-base typed-process unliftio unliftio-core + unordered-containers vector wai wai-extra yaml yesod-core ]; testHaskellDepends = [ - aeson base Blammo bytestring directory errors hspec http-types lens - lens-aeson memcache postgresql-simple process QuickCheck temporary - text time wai wai-extra + aeson base Blammo bugsnag bytestring errors hspec http-types lens + lens-aeson memcache postgresql-simple QuickCheck unliftio wai + wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -103735,25 +103707,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, containers, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, tasty-bench, transformers - }: - mkDerivation { - pname = "fused-effects"; - version = "1.1.1.3"; - sha256 = "046d6r1sbcqvinla14hhfb6f2ynryz5ixqzf4q2fjd3g0c4pfm88"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing - transformers - ]; - testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base tasty-bench transformers ]; - description = "A fast, flexible, fused effect system"; - license = lib.licenses.bsd3; - }) {}; - - "fused-effects_1_1_2_0" = callPackage ({ mkDerivation, base, containers, hedgehog, hedgehog-fn , inspection-testing, markdown-unlit, tasty-bench, transformers , unliftio-core @@ -103771,7 +103724,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -110831,25 +110783,6 @@ self: { }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-harfbuzz"; - version = "0.0.5"; - sha256 = "1kngcm03596cqz4djll1snmif2wdpkih0awkavcl2m63xcd86m4z"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; - description = "HarfBuzz bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; - - "gi-harfbuzz_0_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-freetype2 , gi-glib, gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -110868,7 +110801,6 @@ self: { libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage @@ -130137,6 +130069,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_6_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.6.0.1"; + sha256 = "164s6mwl1aq6r2i1qvdhcpr6mr3c8hffnkqzz07p46plysyzfs8f"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -130228,8 +130187,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.3.1.1"; - sha256 = "1bc7l6l6ss9grgphnb0sks08v0wx0aalja4rkjzp49p5m6g82rc6"; + version = "0.3.1.2"; + sha256 = "165s21mw1j38xpzrqpg5nbgfa3gc9qw88b80d8cfdxdiyghn79hq"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -130285,8 +130244,8 @@ self: { }: mkDerivation { pname = "hasql-implicits"; - version = "0.1.0.4"; - sha256 = "1ls8ximzpgr3p4301xgxjfl17dff4ljpxwps205nblh1d7bkda6a"; + version = "0.1.0.5"; + sha256 = "10mfl1sa23zv7hgc0k1xykjxgrs4qjlmwdkxw38y0wn9b7zzpnlh"; libraryHaskellDepends = [ aeson base bytestring containers hasql network-ip scientific text time uuid vector @@ -130372,14 +130331,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-optparse-applicative_0_4" = callPackage + "hasql-optparse-applicative_0_4_0_1" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.4"; - sha256 = "1caw85628qw7vcs34nf74pra1zsc9mxnlgarhc2wam0bfjq2xabw"; + version = "0.4.0.1"; + sha256 = "1i2skl8zick54vf9hn169j1cmjgajiwvjdyxhdssisipjrczpqg8"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -130415,14 +130374,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_0_7_2" = callPackage + "hasql-pool_0_7_2_1" = callPackage ({ mkDerivation, base, hasql, hspec, rerebase, stm, time , transformers }: mkDerivation { pname = "hasql-pool"; - version = "0.7.2"; - sha256 = "068bbsybbjgdpq2vyzjfh6h1ayjcyws1flmdarb1bdq80nbdq2m9"; + version = "0.7.2.1"; + sha256 = "0rlnaan1ch8fr7z9jiznvpfabip070ibg1pqc4rircn2sw8773yb"; libraryHaskellDepends = [ base hasql stm time transformers ]; testHaskellDepends = [ hasql hspec rerebase stm ]; description = "A pool of connections for Hasql"; @@ -130671,6 +130630,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-th_0_4_0_17" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector + }: + mkDerivation { + pname = "hasql-th"; + version = "0.4.0.17"; + sha256 = "1s4ra8i4az6kik4ahfg3h0rzyz54fifn0dkabfpfxalg1ap5y7ic"; + libraryHaskellDepends = [ + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector + ]; + description = "Template Haskell utilities for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-transaction" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder , contravariant, contravariant-extras, hasql, mtl, rerebase @@ -130689,6 +130667,25 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-transaction_1_0_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-tree-builder + , contravariant, contravariant-extras, hasql, mtl, rerebase + , transformers + }: + mkDerivation { + pname = "hasql-transaction"; + version = "1.0.1.2"; + sha256 = "0wqvxjrjgrmnbbassayyixa4sa5qw5iwwcrh5yz65dw20qf7m9rs"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder contravariant + contravariant-extras hasql mtl transformers + ]; + testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + description = "Composable abstraction over retryable transactions for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-transaction-io" = callPackage ({ mkDerivation, base, bytestring, bytestring-tree-builder, hasql , mtl, resourcet, safe-exceptions, transformers, unliftio-core @@ -134092,8 +134089,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.6"; - sha256 = "1viy6h0jslhr5ln06g1yqmgqjr36yl6014v8m2fzlnszga761v6y"; + version = "0.9.7"; + sha256 = "1pgzgmjc025n9if2hq84i4d9syrz7fskzvyy5ilz4h49vqnjngcq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -134307,8 +134304,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.3.0"; - sha256 = "0h4igygjmi8z9dyfidizs04f9yhnibdba523h8996lf7s2dxb6g9"; + version = "0.3.3.1"; + sha256 = "12dar9i4kbils7f03almhlarhjysgh2zqsq24xqrsz6fwdcdn5v6"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -134653,25 +134650,6 @@ self: { }) {}; "heterocephalus" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist - , doctest, Glob, mtl, parsec, shakespeare, template-haskell - , template-haskell-compat-v0208, text, transformers - }: - mkDerivation { - pname = "heterocephalus"; - version = "1.0.5.6"; - sha256 = "15bgmgnyrf721d0a3bpmvbz723a79hbh56wa6a2v087v3qrlx05g"; - libraryHaskellDepends = [ - base blaze-html blaze-markup containers dlist mtl parsec - shakespeare template-haskell template-haskell-compat-v0208 text - transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - description = "A type-safe template engine for working with front end development tools"; - license = lib.licenses.mit; - }) {}; - - "heterocephalus_1_0_5_7" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist , doctest, Glob, mtl, parsec, shakespeare, template-haskell , template-haskell-compat-v0208, text, transformers @@ -134688,7 +134666,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "A type-safe template engine for working with front end development tools"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "heterogeneous-list-literals" = callPackage @@ -138990,19 +138967,17 @@ self: { }) {}; "hlrdb" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite - , hashable, hedis, hlrdb-core, memory, random, store, time + ({ mkDerivation, base, base64, bytestring, cryptonite, hashable + , hedis, hlrdb-core, memory, random, store, time , unordered-containers, zstd }: mkDerivation { pname = "hlrdb"; - version = "0.3.2.0"; - sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p"; - revision = "3"; - editedCabalFile = "1r8dmsfbsm4lhak2hskid03bad2fvnb71v779grzf5hy6y46jc42"; + version = "0.4.0.0"; + sha256 = "0cj2ff40n3v171xhvdips3als1f2x91ksxcqm7i570mwkdgbh1jr"; libraryHaskellDepends = [ - base base64-bytestring bytestring cryptonite hashable hedis - hlrdb-core memory random store time unordered-containers zstd + base base64 bytestring cryptonite hashable hedis hlrdb-core memory + random store time unordered-containers zstd ]; description = "High-level Redis Database"; license = lib.licenses.mit; @@ -172898,21 +172873,6 @@ self: { }) {}; "lens-family" = callPackage - ({ mkDerivation, base, containers, lens-family-core, mtl - , transformers - }: - mkDerivation { - pname = "lens-family"; - version = "2.1.1"; - sha256 = "1ra31r3y672nyqf7147kxws1qvksgics8pgd6fasyf1v0l3c798j"; - libraryHaskellDepends = [ - base containers lens-family-core mtl transformers - ]; - description = "Lens Families"; - license = lib.licenses.bsd3; - }) {}; - - "lens-family_2_1_2" = callPackage ({ mkDerivation, base, containers, lens-family-core, mtl , transformers }: @@ -172925,21 +172885,9 @@ self: { ]; description = "Lens Families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lens-family-core" = callPackage - ({ mkDerivation, base, containers, transformers }: - mkDerivation { - pname = "lens-family-core"; - version = "2.1.0"; - sha256 = "1jjzm2f4ixjwysyk8gybzpb98rlf2mmzn0nfg8qvhkf5gl87jv3v"; - libraryHaskellDepends = [ base containers transformers ]; - description = "Haskell 2022 Lens Families"; - license = lib.licenses.bsd3; - }) {}; - - "lens-family-core_2_1_2" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "lens-family-core"; @@ -172948,7 +172896,6 @@ self: { libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 2022 Lens Families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lens-family-th" = callPackage @@ -176248,17 +176195,6 @@ self: { }) {blkid = null;}; "linux-capabilities" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "linux-capabilities"; - version = "0.1.0.0"; - sha256 = "033mnbxg9bzi3cc4js22gpi96g5yslv6sksxdsgab5k075gad85k"; - libraryHaskellDepends = [ base ]; - description = "Linux capabilities Haskell data type"; - license = lib.licenses.asl20; - }) {}; - - "linux-capabilities_0_1_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "linux-capabilities"; @@ -176267,7 +176203,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Linux capabilities Haskell data type"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "linux-cgroup" = callPackage @@ -176974,24 +176909,6 @@ self: { }) {}; "list-t" = callPackage - ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph - , monad-control, mtl, mtl-prelude, semigroups, transformers - , transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "1.0.5.2"; - sha256 = "0478iigfrkinhkjyq9zc4xvrbzcfvq46s6k0bj4a2sy8j41jzgww"; - libraryHaskellDepends = [ - base foldl logict mmorph monad-control mtl semigroups transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - description = "ListT done right"; - license = lib.licenses.mit; - }) {}; - - "list-t_1_0_5_3" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, semigroups, transformers , transformers-base @@ -177007,7 +176924,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -183922,17 +183838,6 @@ self: { }) {}; "mathexpr" = callPackage - ({ mkDerivation, base, data-default-class }: - mkDerivation { - pname = "mathexpr"; - version = "0.3.0.0"; - sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3"; - libraryHaskellDepends = [ base data-default-class ]; - description = "Parse and evaluate math expressions with variables and functions"; - license = lib.licenses.gpl3Only; - }) {}; - - "mathexpr_0_3_1_0" = callPackage ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "mathexpr"; @@ -183941,7 +183846,6 @@ self: { libraryHaskellDepends = [ base data-default-class ]; description = "Parse and evaluate math expressions with variables and functions"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "mathflow" = callPackage @@ -188584,25 +188488,6 @@ self: { }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.5.9.1"; - sha256 = "009hsagx0g1myf2jlljqnf96mwnz3a4jbcmrcjs0lizskprzj1n2"; - libraryHaskellDepends = [ - base collect-errors hspec hspec-smallcheck mtl QuickCheck - smallcheck template-haskell - ]; - testHaskellDepends = [ - base collect-errors hspec hspec-smallcheck QuickCheck smallcheck - ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_5_10" = callPackage ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl , QuickCheck, smallcheck, template-haskell }: @@ -188619,7 +188504,6 @@ self: { ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -197201,13 +197085,13 @@ self: { }) {}; "nat-optics" = callPackage - ({ mkDerivation, base, optics-core, text }: + ({ mkDerivation, base, hspec, optics-core, text }: mkDerivation { pname = "nat-optics"; - version = "1.0.0.2"; - sha256 = "12m6267dirzykj4d0rjqq5h3n2zrnp7ixavryvbgqdvrnk6y2ik4"; + version = "1.0.0.3"; + sha256 = "1anvn1p4zp8qwc7pasvx1xvglncjbz7p45x4i7rzj2zdz7qcs4nq"; libraryHaskellDepends = [ base optics-core text ]; - testHaskellDepends = [ base optics-core text ]; + testHaskellDepends = [ base hspec optics-core text ]; description = "Refinement types for natural numbers with an optics interface"; license = lib.licenses.mit; }) {}; @@ -197990,8 +197874,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.2.1"; - sha256 = "052y6mqj8bgfyjv7bxm5vyhd14bpg694ybji2ar2zww30jx5g6ib"; + version = "0.8.2.2"; + sha256 = "1aadyks5id0pb9kz2ydqvy0sp6v5kliv9khmn1s47vvsb920zqy3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200267,23 +200151,6 @@ self: { }) {}; "nfc" = callPackage - ({ mkDerivation, base, bytestring, c2hs, nfc }: - mkDerivation { - pname = "nfc"; - version = "0.1.0"; - sha256 = "0rqin2my3g44xnjvilgri03ip1wqw3235dcay0fhrqn96kag3f33"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ nfc ]; - libraryToolDepends = [ c2hs ]; - description = "libnfc bindings"; - license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {nfc = null;}; - - "nfc_0_1_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, libnfc }: mkDerivation { pname = "nfc"; @@ -200871,8 +200738,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.3.0.0"; - sha256 = "11fn65swyj7b3l7xs6rws81nnccr2hcf81igqmna5bwck3g2gklw"; + version = "0.4.0.0"; + sha256 = "06l897sl59pq5qvqwic2w57cd9s5b9iimzlx4l6d9krwsqzqipy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202093,8 +201960,8 @@ self: { }: mkDerivation { pname = "notmuch"; - version = "0.3.0.0"; - sha256 = "0f4sq7wajxr9d614gyw727g2zbsbfbaw4spni1hgs9c9rllxrmsn"; + version = "0.3.0.1"; + sha256 = "0dns7h8fh5ddd77wysys5x9qialz7bqj9h76qj3fy34145d7wlq4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203051,6 +202918,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "numhask-array_0_10_1" = callPackage + ({ mkDerivation, adjunctions, base, distributive, numhask, vector + }: + mkDerivation { + pname = "numhask-array"; + version = "0.10.1"; + sha256 = "0c8zvlx5w6zjjxcnsc6jl7pbmfr1p4823jpcyzvx72kzzms16x5b"; + libraryHaskellDepends = [ + adjunctions base distributive numhask vector + ]; + description = "Multi-dimensional arrays"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "numhask-free" = callPackage ({ mkDerivation, attoparsec, base, containers, doctest, free , numhask, text @@ -204461,8 +204343,8 @@ self: { }: mkDerivation { pname = "om-elm"; - version = "2.0.0.0"; - sha256 = "0xg9wcmgsxc0rn9fvdma8zs3a588qsppcrxbvpnaa5j1h70nh2qb"; + version = "2.0.0.2"; + sha256 = "0p9g6638z693jd2gz0bq7i03zqyfq5dql5ym8jagszhdygrccy98"; libraryHaskellDepends = [ base bytestring Cabal containers directory http-types safe safe-exceptions template-haskell text unix wai @@ -204929,6 +204811,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_9_3_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.9.3.1"; + sha256 = "1mgyjg2gzs2l6941561bhk29wqv9fj81g7q4wlkkaxszg9w2lkww"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -207297,8 +207209,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ordering-util"; - version = "0.1.3.1"; - sha256 = "1f9dkrap8v9fpkj0s2991gqzi6hwascmx2g3n44njg4nn8r2an69"; + version = "0.1.3.2"; + sha256 = "1na61sq78r190lcn4lw437mj5wcdq9p53zn3vbz16w3b1vwdwfii"; libraryHaskellDepends = [ base ]; description = "Utilities for Orderings"; license = lib.licenses.mit; @@ -209282,28 +209194,6 @@ self: { }) {}; "pandoc-lua-marshal" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, hslua - , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty - , tasty-hunit, tasty-lua, tasty-quickcheck, text - }: - mkDerivation { - pname = "pandoc-lua-marshal"; - version = "0.1.6.1"; - sha256 = "0di12wk3hfz85gyqypaxk3lsl0w3lylmza0lip0d7a257vis2lpz"; - libraryHaskellDepends = [ - base bytestring containers exceptions hslua hslua-marshalling lua - pandoc-types safe text - ]; - testHaskellDepends = [ - base bytestring containers exceptions hslua hslua-marshalling lua - pandoc-types QuickCheck safe tasty tasty-hunit tasty-lua - tasty-quickcheck text - ]; - description = "Use pandoc types in Lua"; - license = lib.licenses.mit; - }) {}; - - "pandoc-lua-marshal_0_1_7" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hslua , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty , tasty-hunit, tasty-lua, tasty-quickcheck, text @@ -209323,7 +209213,6 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -209888,6 +209777,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_6" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.6"; + sha256 = "18xz441274hrlrwbwfd39baddrmi95dg9ykcnhwmh37yhkvm1i1z"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -212437,20 +212368,6 @@ self: { }) {}; "pava" = callPackage - ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: - mkDerivation { - pname = "pava"; - version = "0.1.1.3"; - sha256 = "07k8kgzz4rscpg716f72my1xcl1sr1g4laky3xjrk3vh1gzn1g88"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec vector ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - description = "Greatest convex majorants and least concave minorants"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - - "pava_0_1_1_4" = callPackage ({ mkDerivation, base, criterion, hspec, mwc-random, random, vector }: mkDerivation { @@ -212464,7 +212381,6 @@ self: { ]; description = "Greatest convex majorants and least concave minorants"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.dschrempf ]; }) {}; @@ -214254,7 +214170,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_0_2" = callPackage + "persistent_2_14_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -214265,8 +214181,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.0.2"; - sha256 = "05sa38bmzkd12lrv6lzyj0mgd65sj81prpkyy9z0qsjywxksw8d5"; + version = "2.14.0.3"; + sha256 = "0r0pz7badjb2m47prhgs3hpwfcwqg07nimbwhnhc7mx3n0n2sjp6"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -214931,6 +214847,24 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-stm" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , extra, filelock, filepath, focus, hspec, stm, stm-containers + , temporary + }: + mkDerivation { + pname = "persistent-stm"; + version = "0.1.0.2"; + sha256 = "1z1nb0k2kdy9bd5jbkm2gw78n5qyc61wgpb6iq5wpz7rnvvvplj0"; + libraryHaskellDepends = [ + base binary bytestring containers directory extra filelock filepath + focus stm stm-containers + ]; + testHaskellDepends = [ base hspec stm temporary ]; + description = "STM transactions involving persistent storage"; + license = lib.licenses.bsd3; + }) {}; + "persistent-template" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -228497,25 +228431,24 @@ self: { "purebred-email" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , case-insensitive, concise, deepseq, hedgehog, lens, QuickCheck - , quickcheck-instances, random, semigroupoids, semigroups - , stringsearch, tasty, tasty-golden, tasty-hedgehog, tasty-hunit - , tasty-quickcheck, text, time + , quickcheck-instances, random, semigroupoids, stringsearch, tasty + , tasty-golden, tasty-hedgehog, tasty-hunit, tasty-quickcheck, text + , time }: mkDerivation { pname = "purebred-email"; - version = "0.5"; - sha256 = "0ibnykfqs438fhpwcq0yqkdnr67rql7ss07fcr5qckr4zxaw8ba1"; + version = "0.5.1"; + sha256 = "1g64z0ibbp5sq9m1jmxks5l89rdmdg8szidclxwz2xs0ilzsy65m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive - concise deepseq lens random semigroupoids semigroups stringsearch - text time + concise deepseq lens random semigroupoids stringsearch text time ]; testHaskellDepends = [ attoparsec base bytestring case-insensitive hedgehog lens - QuickCheck quickcheck-instances random semigroups tasty - tasty-golden tasty-hedgehog tasty-hunit tasty-quickcheck text time + QuickCheck quickcheck-instances random tasty tasty-golden + tasty-hedgehog tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; @@ -236360,8 +236293,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.2.0.0"; - sha256 = "1l7ksf11352llcy6fzap3hsq9vgv99gs948ha5i1vvz9bjvn2qwg"; + version = "0.2.0.1"; + sha256 = "1ch5k278sd7dqx1fhd0ginbm3xn7x70jazniycvy7n6z1nqbr8lk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236992,20 +236925,19 @@ self: { "regex-tdfa" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, mtl, parsec, regex-base, text, utf8-string + , doctest-parallel, filepath, mtl, parsec, regex-base, text + , utf8-string }: mkDerivation { pname = "regex-tdfa"; - version = "1.3.1.2"; - sha256 = "0qka53m4xirlb2cjzr68rhybm31i4x2f78b8724a0askvb4phyn4"; - revision = "1"; - editedCabalFile = "02hq7zymsybnmm9qmlsj7fdh02dch6001nm348ymabvlwjndxbwv"; + version = "1.3.1.4"; + sha256 = "0ksdfkf2avjfvd4g0mm6kacgrd7sclj7z9zd7vgkwj7q5vafhpgy"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; testHaskellDepends = [ - array base bytestring containers directory filepath mtl regex-base - text utf8-string + array base bytestring containers directory doctest-parallel + filepath mtl regex-base text utf8-string ]; description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"; license = lib.licenses.bsd3; @@ -239282,6 +239214,31 @@ self: { license = lib.licenses.mit; }) {}; + "reroute_0_7_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, graph-core, hashable + , hspec, http-api-data, hvect, mtl, random, regex-compat, text + , unordered-containers, vector + }: + mkDerivation { + pname = "reroute"; + version = "0.7.0.0"; + sha256 = "046pszxz2mp0glss03ifk1617i1w15cm5x0jy2iwg5a905vdis3s"; + libraryHaskellDepends = [ + base deepseq hashable http-api-data hvect mtl text + unordered-containers + ]; + testHaskellDepends = [ + base hspec hvect mtl text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq graph-core hashable http-api-data hvect mtl + random regex-compat text unordered-containers vector + ]; + description = "abstract implementation of typed and untyped web routing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rescue" = callPackage ({ mkDerivation, base, criterion, directory, directory-tree , doctest, exceptions, ghc, Glob, hlint, hspec, hspec-core @@ -240200,26 +240157,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl - , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time - , transformers - }: - mkDerivation { - pname = "retry"; - version = "0.9.2.1"; - sha256 = "0x6aa0mrj7m68wrbnml6bv852xxy5992qc69c2v5ipbjli560ak5"; - libraryHaskellDepends = [ - base exceptions ghc-prim mtl mtl-compat random transformers - ]; - testHaskellDepends = [ - base exceptions ghc-prim hedgehog HUnit mtl mtl-compat random stm - tasty tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = lib.licenses.bsd3; - }) {}; - - "retry_0_9_3_0" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , mtl-compat, random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers, unliftio-core @@ -240238,7 +240175,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "retryer" = callPackage @@ -245044,49 +244980,6 @@ self: { }) {}; "sandwich" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lens, lifted-async, microlens - , microlens-th, monad-control, monad-logger, mtl - , optparse-applicative, pretty-show, process, safe, safe-exceptions - , stm, string-interpolate, template-haskell, text, time - , transformers, transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; - version = "0.1.0.9"; - sha256 = "07knl1kpbg85df08q07byjid26bkgk514pngkf58h9wy4y5l5il7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_0_10" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lens, lifted-async, microlens @@ -245127,7 +245020,6 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-hedgehog" = callPackage @@ -252699,8 +252591,8 @@ self: { }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.4"; - sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z"; + version = "1.0.5"; + sha256 = "185s39b1km45zf5ghzwl5vpbwwpna1xrfqcqdfgxv88zlksr9vfb"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -252722,8 +252614,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.5"; - sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0"; + version = "2.0.0"; + sha256 = "11zcncppswgx7cd9ihr6nm91574f7azsqbdcra9p2c2fqm191dvg"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -252748,8 +252640,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.4"; - sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5"; + version = "1.0.5"; + sha256 = "0kwarhb9xgffw4jdmvz8zc6k67swz1v6dphb8xx9kngbxq9z44in"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -252798,6 +252690,24 @@ self: { license = lib.licenses.mit; }) {}; + "serversession-frontend-wai_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, cookie, data-default + , path-pieces, serversession, text, time, transformers + , unordered-containers, vault, wai, wai-session + }: + mkDerivation { + pname = "serversession-frontend-wai"; + version = "1.0.1"; + sha256 = "0n6id58ppf8lmjndkgji0qbkw8427zg89sgv1vgnhh4z9ydfh0zm"; + libraryHaskellDepends = [ + base bytestring cookie data-default path-pieces serversession text + time transformers unordered-containers vault wai wai-session + ]; + description = "wai-session bindings for serversession"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "serversession-frontend-yesod" = callPackage ({ mkDerivation, base, bytestring, containers, cookie, data-default , path-pieces, serversession, text, time, transformers @@ -254680,8 +254590,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.3.0"; - sha256 = "0n5miyicjirpkh5p9vgcxb75jh4n6g8lxhrzxpm8fggmv8z0gm1s"; + version = "0.1.3.1"; + sha256 = "1j7skcylpsi4xjh3icp5mvcr1434bcsf8dvha3wd6znn2s2k7wgb"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec ]; description = "Parse strings into words, like a shell would"; @@ -275829,8 +275739,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.2"; - sha256 = "0lksanhb1nsk45vqg1h9jigllfg0lrqsynxkplh8lyx6g8k0naav"; + version = "0.1.0.3"; + sha256 = "0qq8q31vzmh1ssiiwkaacw0n7kmjqff8w74n8vyjypbxmsq4gwq1"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -292181,16 +292091,16 @@ self: { license = lib.licenses.mit; }) {}; - "universum_1_8_0" = callPackage + "universum_1_8_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, gauge , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl - , safe-exceptions, stm, tasty, tasty-hedgehog, text, transformers - , unordered-containers, utf8-string, vector + , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text + , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.0"; - sha256 = "0kq41glz96318bxgwy8l5vqn9d9ha6bsbzgd2kjzlxxn6y7zvwr6"; + version = "1.8.1"; + sha256 = "1193xyz1n8ma4l2p07g764zd87yzr3qv8lnfxhih7zh9r0lywd6y"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -292199,6 +292109,7 @@ self: { testHaskellDepends = [ base bytestring hedgehog tasty tasty-hedgehog text ]; + testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base containers gauge text unordered-containers ]; @@ -298918,6 +298829,8 @@ self: { pname = "wai-middleware-auth"; version = "0.2.6.0"; sha256 = "0ji0jywippk9vqdcbv79fy79xl20p91h8wdadmxa684m5mj95b6x"; + revision = "1"; + editedCabalFile = "0jivjypzh6331hk2y5rb1cyf27qmxdmwc2a3p1cjmc7636h1il4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309786,8 +309699,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.23.1"; - sha256 = "1s9wa9xw9ximivwv9bk7lf4w20yhlcy8vyp2i3j6w4fig918qxg9"; + version = "1.6.24.0"; + sha256 = "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra From aa41b54e51af9683b7f8e60563e6a0642ae2e6fa Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 21 Jul 2022 14:59:47 -0700 Subject: [PATCH 04/13] haskellPackages.aeson-typescript: fix the testsuite and unbreak --- .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 10 ++++++++++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e1b480c5b026..499ae9bf956b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -94,7 +94,6 @@ broken-packages: - aeson-streams - aeson-t - aeson-toolkit - - aeson-typescript - aeson-utils - aeson-via - aeson-with diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f16a2c439f1a..09336b009cf0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -858,6 +858,16 @@ self: super: builtins.intersectAttrs super { ); hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; }; + # the testsuite fails because of not finding tsc without some help + aeson-typescript = overrideCabal (drv: { + testToolDepends = drv.testToolDepends or [] ++ [ pkgs.nodePackages.typescript ]; + # the testsuite assumes that tsc is in the PATH if it thinks it's in + # CI, otherwise trying to install it. + # + # https://github.com/codedownio/aeson-typescript/blob/ee1a87fcab8a548c69e46685ce91465a7462be89/test/Util.hs#L27-L33 + preCheck = "export CI=true"; + }) super.aeson-typescript; + # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. # Flag added in Agda 2.6.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4a8d1e8711ce..d8b4362a7e21 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26172,8 +26172,6 @@ self: { ]; description = "Generate TypeScript definition files from your ADTs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-typescript_0_4_0_0" = callPackage From 8d90d114b2a5639e21531c7f1d0ab1ff7b6feb0e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 24 Jul 2022 19:11:35 +0200 Subject: [PATCH 05/13] haskellPackages.doctest-parallel: Disable defective doctests --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d3ace213c00b..3e5834f67dcd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2577,6 +2577,14 @@ self: super: { # https://github.com/klapaucius/vector-hashtables/issues/11 vector-hashtables = doJailbreak super.vector-hashtables; + # doctests don‘t work. + doctest-parallel = dontCheck super.doctest-parallel; + + # Disabling doctests. + regex-tdfa = overrideCabal { + testTarget = "regex-tdfa-unittest"; + } super.regex-tdfa; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 335397c4ea72..79765953e2e2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1176,7 +1176,6 @@ broken-packages: - dockerfile-creator - docrecords - doctest-discover-configurator - - doctest-parallel - doctest-prop - docusign-example - docvim diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7bdfe3bc4618..90ae511dee2b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26153,7 +26153,6 @@ self: { description = "Generate TypeScript definition files from your ADTs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-utils" = callPackage @@ -83586,8 +83585,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "doctest-prop" = callPackage From 759fed34c0edd7749d394534a5bd1a7f5f8ff9f7 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 25 Jul 2022 22:58:13 +0200 Subject: [PATCH 06/13] haskellPackages.hls-ormolu-plugin: Disable flaky test --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 09336b009cf0..c39a4d59d1a0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -988,7 +988,6 @@ self: super: builtins.intersectAttrs super { hls-floskell-plugin hls-fourmolu-plugin hls-module-name-plugin - hls-ormolu-plugin hls-pragmas-plugin hls-splice-plugin; # Tests have file permissions expections that don‘t work with the nix store. @@ -1004,6 +1003,7 @@ self: super: builtins.intersectAttrs super { hls-tactics-plugin = dontCheck super.hls-tactics-plugin; hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; + hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; # Wants to execute cabal-install to (re-)build itself hint = dontCheck super.hint; From f39aee2d8b8cf527a4a13f90bd57c8ceb345f3d7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 25 Jul 2022 23:42:29 +0200 Subject: [PATCH 07/13] haskellPackages.terminfo: not a core pkg if cross compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GHC's cross build flavours disable the terminfo package, so it will never be included if we are cross-compiling – setting it to null thus breaks all builds depending on the package. To fix this problem, we use the versioned attribute generated by hackage2nix, just like we do for xhtml. Closes #182785. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-head.nix | 3 ++- pkgs/top-level/release-haskell.nix | 2 ++ 7 files changed, 14 insertions(+), 6 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 48972849cf6a..fb976a7b331a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -38,7 +38,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 11c3677913ea..48c63f8b723f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -37,7 +37,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; 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 a6fad258cf85..8174307b7e6c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -37,7 +37,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 127f3225c297..a5914433a448 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -39,7 +39,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index caef6641164a..53e604fbff30 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -39,7 +39,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index ad3aea047ae3..a2546c3dc5f4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -47,7 +47,8 @@ self: super: { rts = null; stm = null; template-haskell = null; - terminfo = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5; text = null; time = null; transformers = null; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 17ec8528e408..6ab31c747477 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -326,6 +326,7 @@ let random QuickCheck cabal2nix + terminfo # isn't bundled for cross xhtml # isn't bundled for cross ; }; @@ -337,6 +338,7 @@ let random QuickCheck cabal2nix + terminfo # isn't bundled for cross xhtml # isn't bundled for cross ; }; From 062084413669bbb7e80294cc5384f58f772c1aa1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 26 Jul 2022 11:15:03 +0200 Subject: [PATCH 08/13] haskellPackages.regex-tdfa: Disable disfunctional tests for older ghcs --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 2 files changed, 6 insertions(+) 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 48972849cf6a..5a3235dce6f9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -139,4 +139,7 @@ self: super: { # Not possible to build in the main GHC 9.0 package set # https://github.com/awakesecurity/spectacle/issues/49 spectacle = doDistribute (markUnbroken super.spectacle); + + # doctest-parallel dependency requires newer Cabal + regex-tdfa = dontCheck super.regex-tdfa; } 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 a6fad258cf85..cbe90d1b54b5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -167,4 +167,7 @@ self: super: { # Depends on OneTuple for GHC < 9.0 universe-base = addBuildDepends [ self.OneTuple ] super.universe-base; + + # doctest-parallel dependency requires newer Cabal + regex-tdfa = dontCheck super.regex-tdfa; } From 57055b681f48bdc408753b828e7d5f3ae0e99f07 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 12:51:15 +0200 Subject: [PATCH 09/13] haskellPackages.Spock-core: build with correct reroute version Spock-core 0.14.0.1 now only supports reroute >= 0.7 because it exports the new AltVar type (in an [PVP violation]). We can luckily accomodate Spock-core, since all other [reverse deps] of reroute are marked broken in nixpkgs at the moment. [PVP violation]: https://github.com/agrafix/Spock/issues/180#issuecomment-1195328647 [reverse deps]: https://packdeps.haskellers.com/reverse/reroute --- .../haskell-modules/configuration-common.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3e5834f67dcd..b762c5495635 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1406,16 +1406,11 @@ self: super: { superbuffer = dontCheck super.superbuffer; stm-containers = dontCheck super.stm-containers; - # Fails with "supports custom headers" - # Patch for GHC 9.0 support - Spock-core = dontCheck (appendPatches [ - (fetchpatch { - name = "Spock-core-GHC-9.0.patch"; - url = "https://github.com/agrafix/Spock/commit/25c75961c4aaaa2e81c9e2afd3d758f2b643f9df.patch"; - sha256 = "sha256-JlliIpVYh2CYjJF2I119ab4/1oh6uvxMbRoxlUkKiGw="; - relative = "Spock-core"; - }) - ] super.Spock-core); + # https://github.com/agrafix/Spock/issues/180 + # Ignore Stackage LTS bound so we can compile Spock-core again. All other + # reverse dependencies of reroute are marked as broken in nixpkgs, so + # upgrading reroute is probably unproblematic. + reroute = doDistribute self.reroute_0_7_0_0; # Test suite fails to compile https://github.com/agrafix/Spock/issues/177 Spock = dontCheck super.Spock; From ae78f717238970ae9bf5e4dee4bc08ee7177ed1b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 13:20:35 +0200 Subject: [PATCH 10/13] haskellPackages.{superbuffer,list-t,stm-containers}: reenable tests HTF has been fixed a while ago actually, so these test suites can be built and executed again. For stm-containers, a bounds issue persists, though. --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b762c5495635..327f850c0470 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1400,11 +1400,9 @@ self: super: { # $PWD/dist/build/haskeline-examples-Test to $PATH. haskeline_0_8_2 = dontCheck super.haskeline_0_8_2; - # Tests for list-t, superbuffer, and stm-containers - # depend on HTF and it is broken, 2020-08-23 - list-t = dontCheck super.list-t; - superbuffer = dontCheck super.superbuffer; - stm-containers = dontCheck super.stm-containers; + # Too strict upper bound on HTF + # https://github.com/nikita-volkov/stm-containers/issues/29 + stm-containers = doJailbreak super.stm-containers; # https://github.com/agrafix/Spock/issues/180 # Ignore Stackage LTS bound so we can compile Spock-core again. All other From ff7abeabe9c2b8e9ef0d47d8ef8cafc64b6d609f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 13:33:07 +0200 Subject: [PATCH 11/13] haskellPackages.hasql-dynamic-statements: downgrade to 0.3.1.1 We still ship hasql 1.5 due to stackage which is not compatible with 0.3.1.2. --- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a79e09403710..fb0aacb4ef4e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -89,6 +89,8 @@ default-package-overrides: - patch < 0.0.7 - reflex < 0.8.2.1 - reflex-dom-core < 0.7.0.2 + # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage + - hasql-dynamic-statements < 0.3.1.2 extra-packages: - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 90ae511dee2b..f8c9c7191f05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -130176,6 +130176,26 @@ self: { }) {}; "hasql-dynamic-statements" = callPackage + ({ mkDerivation, base, bytestring, containers, hasql + , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "hasql-dynamic-statements"; + version = "0.3.1.1"; + sha256 = "1bc7l6l6ss9grgphnb0sks08v0wx0aalja4rkjzp49p5m6g82rc6"; + libraryHaskellDepends = [ + base bytestring containers hasql hasql-implicits ptr + ]; + testHaskellDepends = [ + hasql QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Toolkit for constructing Hasql statements dynamically"; + license = lib.licenses.mit; + }) {}; + + "hasql-dynamic-statements_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, hasql , hasql-implicits, ptr, QuickCheck, quickcheck-instances, rerebase , tasty, tasty-hunit, tasty-quickcheck @@ -130193,6 +130213,7 @@ self: { ]; description = "Toolkit for constructing Hasql statements dynamically"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-explain-tests" = callPackage From ef9826a13b9499851c62c67d0bc4b40f0bfd34f6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 16:54:27 +0200 Subject: [PATCH 12/13] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 3 --- pkgs/development/haskell-modules/hackage-packages.nix | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 79765953e2e2..d2832752465b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3858,6 +3858,7 @@ broken-packages: - persistent-odbc - persistent-protobuf - persistent-ratelimit + - persistent-stm - persistent-template-classy - persistent-typed-db - persistent-zookeeper diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index b7b512edeab1..060f0dc0b275 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1033,7 +1033,6 @@ dont-distribute-packages: - condor - conductive-hsc3 - conductive-song - - conduit-aeson - conduit-throttle - conduit-vfs-zip - confcrypt @@ -3311,7 +3310,6 @@ dont-distribute-packages: - regex-genex - regex-pcre-text - regex-pderiv - - regex-tdfa_1_3_2 - regex-xmlschema - regexchar - regexp-tries @@ -3534,7 +3532,6 @@ dont-distribute-packages: - servant-streaming-server - servant-swagger-tags - servant-to-elm - - servant-typescript - servant-util - servant-util-beam-pg - servant-waargonaut diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f8c9c7191f05..e1d8c5b6464a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -64788,7 +64788,6 @@ self: { ]; description = "Short description"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -214879,6 +214878,8 @@ self: { testHaskellDepends = [ base hspec stm temporary ]; description = "STM transactions involving persistent storage"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persistent-template" = callPackage @@ -252240,7 +252241,6 @@ self: { ]; description = "TypeScript client generation for Servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "servant-typescript-exe"; }) {}; From f28e8302f4216f40d7f13315648f3de6c028f0f7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 26 Jul 2022 18:40:11 +0200 Subject: [PATCH 13/13] haskellPackages.conduit-aeson: unbreak * Work around broken Setup.hs which fails to parse * Disable doctest-parallel suite * Group doctest-parallel overrides and link the upstream issue for the failure; basically it does not work unless you are using cabal v2 commands. --- .../haskell-modules/configuration-common.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 327f850c0470..9d4876533a11 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2570,8 +2570,21 @@ self: super: { # https://github.com/klapaucius/vector-hashtables/issues/11 vector-hashtables = doJailbreak super.vector-hashtables; - # doctests don‘t work. + # doctest-parallel is broken with v1-style cabal-install / Setup.hs + # https://github.com/martijnbastiaan/doctest-parallel/issues/22 doctest-parallel = dontCheck super.doctest-parallel; + clash-prelude = dontCheck super.clash-prelude; + + # Ships a broken Setup.hs + # https://github.com/lehins/conduit-aeson/issues/1 + conduit-aeson = overrideCabal (drv: { + postPatch = '' + ${drv.postPatch or ""} + rm Setup.hs + ''; + # doctest suite uses doctest-parallel which still doesn't work in nixpkgs + testTarget = "tests"; + }) super.conduit-aeson; # Disabling doctests. regex-tdfa = overrideCabal { @@ -2626,7 +2639,4 @@ in { purescript-ast = purescriptStOverride super.purescript-ast; purenix = purescriptStOverride super.purenix; - - # tests use doctest-parallel which produces some errors during testing - clash-prelude = dontCheck super.clash-prelude; })