From bc833b3521767028fcbb80d150ad845fd7b0bd18 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 11:37:01 +0100 Subject: [PATCH 01/84] haskellPackages: stackage LTS 20.12 -> LTS 20.14 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 96 ++++++++++--------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index eb450fd1d6b6..332292c587ac 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 20.12 +# Stackage LTS 20.14 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -134,7 +134,7 @@ default-package-overrides: - aws-xray-client-persistent ==0.1.0.5 - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.8 + - bank-holidays-england ==0.2.0.9 - barbies ==2.0.4.0 - base16 ==0.3.2.1 - base16-bytestring ==1.0.2.0 @@ -149,7 +149,7 @@ default-package-overrides: - base-compat ==0.12.2 - base-compat-batteries ==0.12.2 - basement ==0.0.15 - - base-orphans ==0.8.7 + - base-orphans ==0.8.8.2 - base-prelude ==1.6.1 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 @@ -174,7 +174,7 @@ default-package-overrides: - between ==0.11.0.0 - bhoogle ==0.1.4.2 - bibtex ==0.1.0.6 - - bifunctors ==5.5.14 + - bifunctors ==5.5.15 - bimap ==0.5.0 - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 @@ -184,9 +184,9 @@ default-package-overrides: - binaryen ==0.0.6.0 - binary-generic-combinators ==0.4.4.0 - binary-ieee754 ==0.1.0.0 - - binary-instances ==1.0.3 + - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - - binary-orphans ==1.0.3 + - binary-orphans ==1.0.4.1 - binary-parser ==0.5.7.3 - binary-search ==2.0.0 - binary-shared ==0.8.3 @@ -215,7 +215,7 @@ default-package-overrides: - blaze-html ==0.9.1.2 - blaze-markup ==0.8.2.8 - blaze-svg ==0.3.6.1 - - blaze-textual ==0.2.2.1 + - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bm ==0.1.0.2 - bmp ==1.2.6.3 @@ -297,7 +297,7 @@ default-package-overrides: - cairo ==0.13.8.2 - calendar-recycling ==0.0.0.1 - call-alloy ==0.4.0.2 - - calligraphy ==0.1.3 + - calligraphy ==0.1.4 - call-plantuml ==0.0.1.1 - call-stack ==0.4.0 - can-i-haz ==0.3.1.1 @@ -332,7 +332,7 @@ default-package-overrides: - Chart ==1.9.4 - Chart-cairo ==1.9.3 - Chart-diagrams ==1.9.4 - - chart-svg ==0.3.2 + - chart-svg ==0.3.3 - ChasingBottoms ==1.3.1.12 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 @@ -383,7 +383,7 @@ default-package-overrides: - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 - commonmark ==0.2.2 - - commonmark-extensions ==0.2.3.3 + - commonmark-extensions ==0.2.3.4 - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - comonad ==5.0.8 @@ -449,7 +449,7 @@ default-package-overrides: - core-data ==0.3.9.0 - core-program ==0.6.5.0 - core-telemetry ==0.2.8.0 - - core-text ==0.3.8.0 + - core-text ==0.3.8.1 - countable ==1.2 - country ==0.2.3 - covariance ==0.2.0.1 @@ -574,7 +574,7 @@ default-package-overrides: - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.9 - - deriving-compat ==0.6.2 + - deriving-compat ==0.6.3 - detour-via-sci ==1.0.0 - df1 ==0.4.1 - dhall ==1.41.2 @@ -589,7 +589,7 @@ default-package-overrides: - diagrams-contrib ==1.4.5 - diagrams-core ==1.5.0.1 - diagrams-lib ==1.4.5.2 - - diagrams-postscript ==1.5.1 + - diagrams-postscript ==1.5.1.1 - diagrams-rasterific ==1.4.2.2 - diagrams-solve ==0.1.3 - diagrams-svg ==1.4.3.1 @@ -597,7 +597,7 @@ default-package-overrides: - dictionary-sharing ==0.1.0.0 - di-df1 ==1.2.1 - Diff ==0.4.1 - - digest ==0.0.1.5 + - digest ==0.0.1.6 - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 @@ -713,7 +713,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.8.2 + - esqueleto ==3.5.9.0 - essence-of-live-coding ==0.2.7 - essence-of-live-coding-gloss ==0.2.7 - essence-of-live-coding-pulse ==0.2.7 @@ -817,7 +817,7 @@ default-package-overrides: - ForestStructures ==0.0.1.0 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.2.1 + - formatn ==0.2.2 - format-numbers ==0.1.0.1 - formatting ==7.1.3 - fortran-src ==0.12.0 @@ -858,7 +858,7 @@ default-package-overrides: - generic-constraints ==1.1.1.1 - generic-data ==1.0.0.1 - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.14.2 + - generic-deriving ==1.14.3 - generic-functor ==1.1.0.0 - generic-lens ==2.2.1.0 - generic-lens-core ==2.2.1.0 @@ -914,8 +914,8 @@ default-package-overrides: - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.2.6.20230211 - - ghc-lib-parser ==9.2.6.20230211 + - ghc-lib ==9.2.7.20230228 + - ghc-lib-parser ==9.2.7.20230228 - ghc-lib-parser-ex ==9.2.0.4 - ghc-parser ==0.2.4.0 - ghc-paths ==0.1.0.12 @@ -978,7 +978,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.4 - gnuplot ==0.5.7 - - goldplate ==0.2.0 + - goldplate ==0.2.1.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gotyno-hs ==1.1.0 @@ -1028,7 +1028,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.3.1 - haskeline ==0.8.2.1 - - haskell-gi ==0.26.2 + - haskell-gi ==0.26.3 - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 @@ -1046,7 +1046,7 @@ default-package-overrides: - hasktags ==0.72.0 - hasql ==1.6.3 - hasql-dynamic-statements ==0.3.1.2 - - hasql-implicits ==0.1.0.5 + - hasql-implicits ==0.1.1 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.3 - hasql-optparse-applicative ==0.5 @@ -1206,7 +1206,7 @@ default-package-overrides: - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - htaglib ==1.2.0 - - HTF ==0.15.0.0 + - HTF ==0.15.0.1 - html ==1.0.1.2 - html-conduit ==1.3.2.2 - html-email-validate ==0.2.0.0 @@ -1309,7 +1309,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1 - indexed-traversable ==0.1.2 - - indexed-traversable-instances ==0.1.1.1 + - indexed-traversable-instances ==0.1.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.6 - influxdb ==1.9.2.2 @@ -1333,7 +1333,7 @@ default-package-overrides: - IntervalMap ==0.6.2.0 - intervals ==0.9.2 - intset-imperative ==0.1.0.0 - - invariant ==0.6 + - invariant ==0.6.1 - invert ==1.0.0.2 - invertible-grammar ==0.1.3.3 - io-machine ==0.2.0.0 @@ -1440,6 +1440,7 @@ default-package-overrides: - leancheck ==0.9.12 - leancheck-instances ==0.0.5 - leapseconds-announced ==2017.1.0.1 + - learn-physics ==0.6.5 - leb128-cereal ==1.2 - lens ==5.1.1 - lens-action ==0.2.6 @@ -1452,7 +1453,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.0.0 - - lentil ==1.5.4.2 + - lentil ==1.5.5.0 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 @@ -1712,7 +1713,7 @@ default-package-overrides: - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.11 - - network ==3.1.2.7 + - network ==3.1.2.8 - network-bsd ==2.8.1.0 - network-byte-order ==0.1.6 - network-conduit-tls ==1.3.2 @@ -1747,6 +1748,7 @@ default-package-overrides: - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 - normalization-insensitive ==2.0.2 + - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.4 @@ -1756,9 +1758,9 @@ default-package-overrides: - numeric-limits ==0.1.0.0 - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - - numhask ==0.10.1.0 - - numhask-array ==0.10.1 - - numhask-space ==0.10.0.0 + - numhask ==0.10.1.1 + - numhask-array ==0.10.2 + - numhask-space ==0.10.0.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 @@ -1886,7 +1888,7 @@ default-package-overrides: - persistent-mongoDB ==2.13.0.1 - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.5.1 + - persistent-postgresql ==2.13.5.2 - persistent-qq ==2.12.0.2 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 @@ -2044,7 +2046,7 @@ default-package-overrides: - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.28 + - quickcheck-instances ==0.3.29.1 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 @@ -2091,13 +2093,12 @@ default-package-overrides: - reactive-banana ==1.3.2.0 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - reanimate-svg ==0.13.0.1 - rebase ==1.16.1 - rec-def ==0.2.1 - - record-dot-preprocessor ==0.2.15 + - record-dot-preprocessor ==0.2.16 - record-hasfield ==1.0 - rec-smallarray ==0.1.0.0 - - recursion-schemes ==5.2.2.3 + - recursion-schemes ==5.2.2.4 - recv ==0.0.0 - redact ==0.4.0.0 - reddit-scrape ==0.0.1 @@ -2106,7 +2107,7 @@ default-package-overrides: - refact ==0.3.0.2 - ref-fd ==0.5 - refined ==0.8 - - reflection ==2.1.6 + - reflection ==2.1.7 - reform ==0.2.7.5 - reform-blaze ==0.2.4.4 - reform-hamlet ==0.0.5.3 @@ -2375,6 +2376,7 @@ default-package-overrides: - sox ==0.2.3.2 - spacecookie ==1.0.0.2 - sparse-linear-algebra ==0.3.1 + - spatial-math ==0.2.7.0 - spdx ==1.0.0.3 - special-values ==0.1.0.0 - speculate ==0.4.14 @@ -2419,7 +2421,7 @@ default-package-overrides: - stitch ==0.6.0.0 - stm-chans ==3.0.0.6 - stm-conduit ==4.0.1 - - stm-containers ==1.2 + - stm-containers ==1.2.0.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.9 @@ -2600,8 +2602,8 @@ default-package-overrides: - text-regex-replace ==0.1.1.5 - text-rope ==0.2 - text-short ==0.1.5 - - text-show ==3.10 - - text-show-instances ==3.9.4 + - text-show ==3.10.2 + - text-show-instances ==3.9.5 - text-zipper ==0.12 - tfp ==1.0.2 - tf-random ==0.5 @@ -2619,7 +2621,7 @@ default-package-overrides: - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.6 - th-lego ==0.3.0.2 - - th-lift ==0.8.2 + - th-lift ==0.8.3 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 - th-orphans ==0.13.14 @@ -2704,7 +2706,7 @@ default-package-overrides: - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - typecheck-plugin-nat-simple ==0.1.0.7 - - typed-process ==0.2.10.1 + - typed-process ==0.2.11.0 - typed-uuid ==0.2.0.0 - type-equality ==1 - type-errors ==0.2.0.1 @@ -2767,7 +2769,7 @@ default-package-overrides: - unix-compat ==0.5.4 - unix-time ==0.4.8 - unjson ==0.15.4 - - unliftio ==0.2.23.0 + - unliftio ==0.2.24.0 - unliftio-core ==0.2.1.0 - unliftio-path ==0.0.2.0 - unliftio-pool ==0.2.2.0 @@ -2900,7 +2902,7 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==1.1.6.1 -with-compiler: ghc-9.2.6 +with-compiler: ghc-9.2.7 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -2918,7 +2920,7 @@ with-compiler: ghc-9.2.6 - word-wrap ==0.5 - world-peace ==1.0.2.0 - wrap ==0.0.0 - - wreq ==0.5.3.3 + - wreq ==0.5.4.0 - wreq-stringless ==0.5.9.1 - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 @@ -2970,12 +2972,12 @@ with-compiler: ghc-9.2.6 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - yesod-alerts ==0.1.3.0 - - yesod-auth ==1.6.11 + - yesod-auth ==1.6.11.1 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.0.3 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.1 + - yesod-core ==1.6.24.2 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.4 @@ -3006,7 +3008,7 @@ with-compiler: ghc-9.2.6 - zim-parser ==0.2.1.0 - zio ==0.1.0.2 - zip ==1.7.2 - - zip-archive ==0.4.2.2 + - zip-archive ==0.4.3 - zipper-extra ==0.1.3.2 - zippers ==0.3.2 - zip-stream ==0.2.2.0 From b645a1d84a95c48d33de712a6ce58d7acd0aa7e0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 11:37:18 +0100 Subject: [PATCH 02/84] all-cabal-hashes: 2023-03-01T16:43:25Z -> 2023-03-13T08:59:39Z 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 71c87c15ea2f..3930777b8829 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "083bd4855df26eb1db1c38c31fdf79ccf67c2f13", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/083bd4855df26eb1db1c38c31fdf79ccf67c2f13.tar.gz", - "sha256": "0m0d33xd1zfpcdbyhq7akq73dpgwggi39l1wp99vpfgpi220ad5a", - "msg": "Update from Hackage at 2023-03-01T16:43:25Z" + "commit": "4a67d2eace63deeaec7dd3553d04e892b39b63a7", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4a67d2eace63deeaec7dd3553d04e892b39b63a7.tar.gz", + "sha256": "12y659k8qs0rnajcfdwwwwz5ywcnf3ygxi2kmv8b31x4znll1gfs", + "msg": "Update from Hackage at 2023-03-13T08:59:39Z" } From df547d23fb5424d3513c4bfbfd64626a4a006095 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Mar 2023 11:39:06 +0100 Subject: [PATCH 03/84] 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 | 2421 +++++++++-------- 1 file changed, 1294 insertions(+), 1127 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bff5cd98c46f..a33bd14bc037 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2137,6 +2137,8 @@ self: { pname = "BlogLiterately"; version = "0.8.8.2"; sha256 = "1m4l5p8qg1mqg612x43gip5gp10x4avrm36b9iw2r2ny32rvwkdy"; + revision = "1"; + editedCabalFile = "0dqdqqbl6hvdpxn6zdcy6yfvjx3q1ch1kfs512rr3nl2kwd6lrs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2901,17 +2903,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_8_1_0" = callPackage + "Cabal_3_10_1_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.8.1.0"; - sha256 = "0236fddzhalsr2gjbjsk92rgh8866fks28r04g8fbmzkqbkcnr3l"; - revision = "2"; - editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; + version = "3.10.1.0"; + sha256 = "1vlqrh75s1n82ymd7yxbmy9py1n35fvdhw7hn1ph2y1i9j7apnqb"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2961,17 +2961,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "Cabal-syntax_3_8_1_0" = callPackage + "Cabal-syntax_3_10_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers, unix }: mkDerivation { pname = "Cabal-syntax"; - version = "3.8.1.0"; - sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; - revision = "3"; - editedCabalFile = "14zm8h7sfawysr9g37in8by8aj1p87fywj83hmshp8n6lrxr6bgd"; + version = "3.10.1.0"; + sha256 = "08pmafs761bk892s2arf8s17wswhxr8ar642vsh6hxrjalihk01v"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -3294,6 +3292,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.12"; sha256 = "1vy9yq07p95qiap1pcp2bbbn1mqvp3spyrswpdz0qfcn06656650"; + revision = "1"; + editedCabalFile = "0ra041bg2m04niqzi0y468cfmv2bkjh8ckix2i8xf2shw7v2zn4r"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -9708,44 +9708,6 @@ self: { }) {}; "HTF" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff - , directory, filepath, haskell-src, HUnit, lifted-base - , monad-control, mtl, old-time, pretty, process, QuickCheck, random - , regex-compat, template-haskell, temporary, text, time, unix - , unordered-containers, vector, xmlgen - }: - mkDerivation { - pname = "HTF"; - version = "0.15.0.0"; - sha256 = "16sbz9rr1v8p3b0qi6b9rvzqgbd4rr05qp2wiiy0nc2gh1qca4nq"; - revision = "1"; - editedCabalFile = "1rd9iwchb4pg441hvqi7qn41v0ihd8sh2ma1h8incyswn527m1ml"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson array base base64-bytestring bytestring containers cpphs Diff - directory haskell-src HUnit lifted-base monad-control mtl old-time - pretty process QuickCheck random regex-compat text time unix vector - xmlgen - ]; - libraryToolDepends = [ cpphs ]; - executableHaskellDepends = [ - array base cpphs directory HUnit mtl old-time random text - ]; - executableToolDepends = [ cpphs ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath HUnit mtl - process random regex-compat template-haskell temporary text - unordered-containers - ]; - description = "The Haskell Test Framework"; - license = lib.licenses.lgpl21Only; - mainProgram = "htfpp"; - }) {}; - - "HTF_0_15_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff , directory, filepath, haskell-src, HUnit, lifted-base @@ -9778,7 +9740,6 @@ self: { ]; description = "The Haskell Test Framework"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; mainProgram = "htfpp"; }) {}; @@ -16961,10 +16922,8 @@ self: { }: mkDerivation { pname = "PropaFP"; - version = "0.1.1.0"; - sha256 = "0r69x9i5iq740y6r7v3i86q7vx19qwrad0klmi3iy7a0g7wa5ldy"; - revision = "1"; - editedCabalFile = "0sx7198rx2ajcp6mn0ym474h24fizf1cbw0skyw8fanri7jr2i41"; + version = "0.1.2.0"; + sha256 = "1mp5dw7yhcqazqnlg6wd0ygd7ck869cwsqh6kgkv10cpxjy94v39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25257,6 +25216,8 @@ self: { pname = "adjunctions"; version = "4.4.2"; sha256 = "06354xzgf78jl4g1xw11rp74gi7zh94rgvsji7ma1g0hp26myyql"; + revision = "1"; + editedCabalFile = "0ii8818fr1h3wpyaqwa44gn1kv7lafbw9b4qdj7r86w5k5q00ypp"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -25504,8 +25465,8 @@ self: { pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; - revision = "5"; - editedCabalFile = "01mbxj0cqbf20pwgx2021r79xwp8r3sjpvhxlpay5lk0s9pvn0sh"; + revision = "6"; + editedCabalFile = "0bc55wc1ad5qvaf8kf8gbwvzd4i0qmgwykidcl5gb2bam3scb870"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -25756,18 +25717,21 @@ self: { }) {}; "aeson-decode" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, containers, data-default - , hedgehog, text, time, unordered-containers, vector + ({ mkDerivation, aeson, aeson-qq, base, containers + , data-default-class, hspec, quaalude, text, time + , unordered-containers, vector }: mkDerivation { pname = "aeson-decode"; - version = "0.1.0.0"; - sha256 = "0x5gjp86554p09r8r73wpmv840d6dkc7vmqyq60nj6v6spq5v7bx"; + version = "0.1.0.1"; + sha256 = "0n2bs07v5xb7qmx6rg3dzp0iwf2dwpq3ymg7myhggh1088xkchki"; libraryHaskellDepends = [ - aeson base containers data-default text unordered-containers vector + aeson base containers data-default-class quaalude text + unordered-containers vector ]; testHaskellDepends = [ - aeson-qq base containers hedgehog text time + aeson aeson-qq base containers data-default-class hspec quaalude + text time unordered-containers vector ]; description = "Easy functions for converting from Aeson.Value"; license = lib.licenses.asl20; @@ -32957,10 +32921,8 @@ self: { }: mkDerivation { pname = "api-tools"; - version = "0.10.0.0"; - sha256 = "0hz4pa0n4wf9kd8r98xd0c39p790fn9iaqzjj2m653641acjbm0w"; - revision = "1"; - editedCabalFile = "13c5qg7f1a0hh1x2dmw6hnpi2vkmcasg38wl3lzf2plfcibqb01m"; + version = "0.10.0.1"; + sha256 = "14qmjmxp7bbf94wjkvz2fxvn08vqm1n8l3vjh2rw9mj518lx8ga3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33875,8 +33837,8 @@ self: { pname = "approximate"; version = "0.3.5"; sha256 = "1f168ac9xryrv50k7gvh89xv0mj6c42cxw7pj01pqcbppbs0rm3g"; - revision = "1"; - editedCabalFile = "1dv6jk6hin5bvzdvdz10nlk4xfhn03mdd90f8g94ah4gyqsx6sfk"; + revision = "2"; + editedCabalFile = "1yak9kv090502q8kqszmrjdp13dd737klppp78983yipd9k2h5gv"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens log-domain pointed safecopy semigroupoids semigroups vector @@ -34418,8 +34380,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.6"; - sha256 = "1s6fmz4mz333q8blj0x9c8wl8hh7zxq7b7jz0icdkc53ncghbfhv"; + version = "1.7.7"; + sha256 = "13ixjxzfq3f25an3z7ahrav9nr84f93wb95pwjykybm2vjnn3dkv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -35333,15 +35295,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_6_0_0" = callPackage + "ascii_1_7_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.6.0.0"; - sha256 = "0ax8gn1nbb9p6ai8rq48jf98vn952q4xl7h1mxi377rywcpfy9y5"; + version = "1.7.0.0"; + sha256 = "0rwkj0ncsan0r1v70afqwj2mdhdg9qyawp2nm01056iwj88kgg9p"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -36379,8 +36341,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "2"; - editedCabalFile = "1j93w1krkadqijn59yjiws1366yhcn2mad1irqrk50in6l10k51b"; + revision = "3"; + editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -36882,6 +36844,18 @@ self: { license = lib.licenses.asl20; }) {}; + "atomic-modify-general" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "atomic-modify-general"; + version = "0.1.0.0"; + sha256 = "0xrjnd31aq5ajga5n6lq1rm7wdyxqqnmc90z0zb4zp97b6vjsa2v"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base ]; + description = "Generalizations of atomicModifyIORef"; + license = lib.licenses.bsd2; + }) {}; + "atomic-primops" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { @@ -37159,8 +37133,8 @@ self: { pname = "attenuation"; version = "0.2.0"; sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; - revision = "4"; - editedCabalFile = "1cp14r4i8zv3c93y78d61fxbwn8y2p7fqfp20192xy8zbnn3hdhy"; + revision = "5"; + editedCabalFile = "0269x7gl1a0vca6qd31fv4cdrq77dl1kxwg9dini6cgg2x794kfs"; libraryHaskellDepends = [ base constraints ]; description = "Subtyping relations and variance roles"; license = lib.licenses.asl20; @@ -37172,8 +37146,8 @@ self: { pname = "attenuation-profunctors"; version = "0.1.0"; sha256 = "11zhh9iwb7r2jfp9bn8bqx1wzl4mln9v80gb2jijp0rryag25ili"; - revision = "2"; - editedCabalFile = "1vwavg3c478r36qv1sz800b689cmpmldn3lyr9jl0ag1vmrff6y6"; + revision = "3"; + editedCabalFile = "1s6fbn0wy5vxv7kb09ph11m8hjbcxxpr1rfbp3907ggpwfh43zha"; libraryHaskellDepends = [ attenuation base constraints profunctors ]; @@ -40085,6 +40059,28 @@ self: { broken = true; }) {}; + "balkon" = callPackage + ({ mkDerivation, base, bytestring, filepath, harfbuzz-pure, hspec + , hspec-discover, hspec-golden, text, text-icu + , unicode-data-scripts + }: + mkDerivation { + pname = "balkon"; + version = "0.1.0.0"; + sha256 = "0qv3b1y1m7aqnl17g0gpabs24s1h46jnvrpf1n9an2b5mhb41k8q"; + libraryHaskellDepends = [ + base harfbuzz-pure text text-icu unicode-data-scripts + ]; + testHaskellDepends = [ + base bytestring filepath harfbuzz-pure hspec hspec-discover + hspec-golden text text-icu + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Text layout engine built on top of HarfBuzz"; + license = lib.licenses.gpl3Only; + }) {}; + "ballast" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, hspec , hspec-expectations, http-client, http-client-tls, http-types @@ -40292,18 +40288,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.2.0.8"; - sha256 = "1n2ddf60q2g1yjwq754irxq9nzmx5i2z3r2rnw263bppcldkizkj"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_9" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -40313,7 +40297,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "banwords" = callPackage @@ -40519,12 +40502,12 @@ self: { broken = true; }) {}; - "base_4_17_0_0" = callPackage + "base_4_18_0_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.17.0.0"; - sha256 = "1ma01nc34knldpp1mb0j5mv07sy28kih6529kfkm1w0c7apc0aiy"; + version = "4.18.0.0"; + sha256 = "0wx6a14k4gp7kmsy3bpz752q5gvnka0k69bi65zn2arpq89s8nsn"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -40542,6 +40525,18 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat_0_13_0" = callPackage + ({ mkDerivation, base, ghc-prim, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.13.0"; + sha256 = "03d3rr7v27giv90dz8128mzfa76qxkbvkzm7fiwh76l4v9sn1xlb"; + libraryHaskellDepends = [ base ghc-prim unix ]; + description = "A compatibility layer for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-batteries" = callPackage ({ mkDerivation, base, base-compat, ghc-prim, hspec, hspec-discover , QuickCheck @@ -40557,6 +40552,24 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat-batteries_0_13_0" = callPackage + ({ mkDerivation, base, base-compat, foldable1-classes-compat + , ghc-prim, hspec, hspec-discover, OneTuple, QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.13.0"; + sha256 = "161g4g8ncnwbqafxp5hdbmv4qfmscf7b3pd88l49nkyns50ays1p"; + libraryHaskellDepends = [ + base base-compat foldable1-classes-compat ghc-prim OneTuple + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -40648,8 +40661,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.8.7"; - sha256 = "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8"; + version = "0.8.8.2"; + sha256 = "14jhh848q3451hqi4knslc7nnvw9dn77vawnhp4qs4l4703fgjk1"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -40657,6 +40670,21 @@ self: { license = lib.licenses.mit; }) {}; + "base-orphans_0_9_0" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.9.0"; + sha256 = "0qkfs49gm0zv946h47bi8nshp6b2d6d5drlslm4adm8y4kcd8gk1"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41442,8 +41470,8 @@ self: { pname = "batching"; version = "0.1.0.0"; sha256 = "1mks6w3zfvkdgi9didf94jp1hac9ps4pli75vn79p9hxjwc2fm27"; - revision = "3"; - editedCabalFile = "1gahl1kia0ivs12hms380fjk1jdpnmrbns2kgf3csznfc7nbkv1c"; + revision = "4"; + editedCabalFile = "1dnh8pv0g1n4wrrvvkm70j04hqna8i6hj4v5w6zgza4hbxc8mp59"; libraryHaskellDepends = [ base primitive short-vec sint ]; testHaskellDepends = [ base primitive QuickCheck short-vec sint test-framework @@ -42989,8 +43017,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.14"; - sha256 = "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak"; + version = "5.5.15"; + sha256 = "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -43004,18 +43032,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "bifunctors_5_5_15" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat + "bifunctors_5_6" = callPackage + ({ mkDerivation, base, bifunctor-classes-compat, comonad + , containers, foldable1-classes-compat, hspec, hspec-discover + , QuickCheck, tagged, template-haskell, th-abstraction + , transformers, transformers-compat }: mkDerivation { pname = "bifunctors"; - version = "5.5.15"; - sha256 = "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"; + version = "5.6"; + sha256 = "1fjinhbp0pbrnpcpzgbwbvghigq09akz013m0jl5d3kmdypl4fml"; libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers + base bifunctor-classes-compat comonad containers + foldable1-classes-compat tagged template-haskell th-abstraction + transformers ]; testHaskellDepends = [ base hspec QuickCheck template-haskell transformers @@ -43465,31 +43495,6 @@ self: { }) {}; "binary-instances" = callPackage - ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring - , case-insensitive, hashable, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck - , text, text-binary, time-compat, unordered-containers, vector - , vector-binary-instances - }: - mkDerivation { - pname = "binary-instances"; - version = "1.0.3"; - sha256 = "00wwdk744x762p39jkg0azswxj0qy1lxjw8h9z2c0cvfam934987"; - libraryHaskellDepends = [ - aeson base binary binary-orphans case-insensitive hashable - primitive scientific tagged text text-binary time-compat - unordered-containers vector vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary bytestring case-insensitive hashable primitive - QuickCheck quickcheck-instances scientific tagged tasty - tasty-quickcheck text time-compat unordered-containers vector - ]; - description = "Orphan instances for binary"; - license = lib.licenses.bsd3; - }) {}; - - "binary-instances_1_0_4" = callPackage ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring , case-insensitive, data-array-byte, hashable, primitive , QuickCheck, quickcheck-instances, scientific, tagged, tasty @@ -43513,7 +43518,6 @@ self: { ]; description = "Orphan instances for binary"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-io" = callPackage @@ -43565,32 +43569,14 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, base, binary, OneTuple, QuickCheck - , quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "binary-orphans"; - version = "1.0.3"; - sha256 = "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2"; - libraryHaskellDepends = [ base binary transformers ]; - testHaskellDepends = [ - base binary OneTuple QuickCheck quickcheck-instances tagged tasty - tasty-quickcheck - ]; - description = "Compatibility package for binary; provides instances"; - license = lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_4" = callPackage ({ mkDerivation, base, binary, data-array-byte, OneTuple , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck , transformers }: mkDerivation { pname = "binary-orphans"; - version = "1.0.4"; - sha256 = "08999f7c9l3dck59k1p9jj2nbbdj99i3gwmrqj24la5rywgw8rd0"; + version = "1.0.4.1"; + sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; libraryHaskellDepends = [ base binary data-array-byte transformers ]; @@ -43600,7 +43586,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -46457,8 +46442,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "10"; - editedCabalFile = "0ligm4x3anq0z5nvkm0jql14jbvrim7wh34ih5li4cdwb5nlpyhn"; + revision = "11"; + editedCabalFile = "1dyg4f4ji23lvq8ma7j7423z5ssd4ahbb1qgw1w586abbhziicn2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -46859,15 +46844,15 @@ self: { "blaze-textual" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, double-conversion , ghc-prim, integer-gmp, old-locale, QuickCheck, test-framework - , test-framework-quickcheck2, text, time, vector + , test-framework-quickcheck2, text, vector }: mkDerivation { pname = "blaze-textual"; - version = "0.2.2.1"; - sha256 = "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs"; + version = "0.2.3.1"; + sha256 = "1chpaynfqiykqdk4jrmwxczj01wph8qfb411600l0gj3g34wlanx"; libraryHaskellDepends = [ base blaze-builder bytestring ghc-prim integer-gmp old-locale text - time vector + vector ]; testHaskellDepends = [ base blaze-builder bytestring double-conversion QuickCheck @@ -48688,16 +48673,15 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant , dlist, exceptions, kan-extensions, mtl, profunctors - , semigroupoids, stm, text, time, transformers + , semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.0"; - sha256 = "1b4lbagj0pp19sms4q6p4gq27sf7yrzlcgcgl3zlmh3hh0wrrw14"; + version = "0.9.1"; + sha256 = "1dd82rf1fpmhgryws67phgpfy4kfy4q1anh5l37g162dgy6kyi0z"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time - transformers ]; description = "boxes"; license = lib.licenses.bsd3; @@ -48723,8 +48707,8 @@ self: { }: mkDerivation { pname = "box-socket"; - version = "0.4.0"; - sha256 = "0svbqs00db6kvd81b5zk7k6v7fmy12c11d933z12zsslxp8ncp91"; + version = "0.4.1"; + sha256 = "111xbdyavpwjjzyn4y5gmva0izzinjfmb5qs1id4z2qvx43cjk8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49211,14 +49195,13 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "0.2.0.1"; - sha256 = "1rqmpk45fy9w6jqmaxdbg8giv3dv72qd522yz1wsj4zmkfjrhw41"; + version = "1.0.0.1"; + sha256 = "02y7jzvy47ay88c7pc776z2vbsmdljac2avzx0477bg5z99rmyx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers generic-lens microlens optics-core vty ]; - doHaddock = false; description = "Tabular list widgets for brick"; license = lib.licenses.bsd0; hydraPlatforms = lib.platforms.none; @@ -50327,6 +50310,30 @@ self: { broken = true; }) {}; + "build-env" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, filepath, optparse-applicative, process, temporary + , text, time, transformers + }: + mkDerivation { + pname = "build-env"; + version = "1.1.0.0"; + sha256 = "07gw9wzyx92as7didf32b6q8nmjifsxg4z27gqb61dnq7hrrjhf4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath process + temporary text time transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath optparse-applicative + text + ]; + description = "Compute, fetch and install Cabal build plans into a local environment"; + license = lib.licenses.bsd3; + mainProgram = "build-env"; + }) {}; + "buildable" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { @@ -51717,6 +51724,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-trie_0_2_7_1" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-trie"; + version = "0.2.7.1"; + sha256 = "13s973qah41awyh3sa5s2nnpm11q1klz50dasa798q9ciihwzj96"; + libraryHaskellDepends = [ base binary bytestring deepseq ]; + testHaskellDepends = [ + base binary bytestring deepseq QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq QuickCheck + ]; + description = "An efficient finite map from bytestrings to values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-typenats" = callPackage ({ mkDerivation, base, binary, blake2, bytestring, cereal , criterion, cryptohash, deepseq, entropy, QuickCheck @@ -52831,10 +52860,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.8.1.0"; - sha256 = "1rk7xb86c1vgarv1m16d2i82fiig6q119j51gvq2pq8l5rpl7kk1"; - revision = "3"; - editedCabalFile = "14l2jvyrzhgkmgkrkhmb6cb1vy4pgcg3q8dgyg8vszpm0mb1ws77"; + version = "3.10.1.0"; + sha256 = "13c3qx0qw7kizaj2dpgl2y3pj86pgqvmkck20w726jalamlf6pcr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53000,10 +53027,8 @@ self: { }: mkDerivation { pname = "cabal-install-solver"; - version = "3.8.1.0"; - sha256 = "1rzzi3jx5ivxy43vdg460fsbn1p2v5br1havcara65vmqgv6j8yz"; - revision = "1"; - editedCabalFile = "1g487j20pj03pc10yaha18v73wh3ackxjgfpfqaj7xznqcbm5xwm"; + version = "3.10.1.0"; + sha256 = "0dwzyjk9382wxxkmqf99mrpgbqpzxjqr4kxbz2dnwx6d9kfrw39c"; libraryHaskellDepends = [ array base bytestring Cabal Cabal-syntax containers edit-distance filepath mtl pretty transformers @@ -53870,16 +53895,16 @@ self: { }) {}; "cached-io" = callPackage - ({ mkDerivation, base, stm, time, transformers }: + ({ mkDerivation, base, exceptions, stm, time, transformers }: mkDerivation { pname = "cached-io"; - version = "1.1.0.0"; - sha256 = "0c0zg2x85mc3whlrllal4v4wfgb8fyfwxi0wh788wlyyqjznfcim"; + version = "1.2.0.0"; + sha256 = "066ccn6vgrf5s8blqk2wdmm5lkk8rjf4p43ng1i5nhd16z71kc1a"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base stm time transformers ]; + libraryHaskellDepends = [ base exceptions stm time transformers ]; executableHaskellDepends = [ base ]; - description = "A simple library to cache a single IO action with timeout"; + description = "A simple library to cache IO actions"; license = lib.licenses.asl20; mainProgram = "test-cachedIO"; }) {}; @@ -53953,37 +53978,38 @@ self: { "cachix" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , cachix-api, concurrent-extra, conduit, conduit-extra - , conduit-zstd, containers, cookie, cryptonite, dhall, directory - , ed25519, either, extra, filepath, fsnotify - , hercules-ci-cnix-store, here, hnix-store-core, hspec + , cachix-api, concurrent-extra, conduit, conduit-concurrent-map + , conduit-extra, conduit-zstd, containers, cookie, cryptonite + , deepseq, dhall, directory, ed25519, either, extra, filepath + , fsnotify, hercules-ci-cnix-store, here, hnix-store-core, hspec , hspec-discover, http-client, http-client-tls, http-conduit , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec - , memory, mmorph, netrc, nix, optparse-applicative, pretty-terminal - , prettyprinter, process, protolude, resourcet, retry - , safe-exceptions, servant, servant-auth, servant-auth-client - , servant-client, servant-client-core, servant-conduit, stm - , stm-chans, stm-conduit, systemd, temporary, text, time, unix - , unordered-containers, uri-bytestring, uuid, vector, versions - , websockets, wuss + , memory, mmorph, netrc, network-uri, nix, optparse-applicative + , pretty-terminal, prettyprinter, process, protolude, resourcet + , retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary + , text, time, unix, unordered-containers, uri-bytestring, uuid + , vector, versions, websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.2"; - sha256 = "1fvm565651rd0wlx3rhsrm3x8fa1jjvpkp9xgrcj8pnpi5dsn07w"; + version = "1.3.1"; + sha256 = "0d21m3fy2ncci06l72bmb5l6sbhmc0a7ncimkgynnh4jjpah4c3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring cachix-api - concurrent-extra conduit conduit-extra conduit-zstd containers - cookie cryptonite dhall directory ed25519 either extra filepath - fsnotify hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types inline-c-cpp katip lukko - lzma-conduit megaparsec memory mmorph netrc optparse-applicative - pretty-terminal prettyprinter process protolude resourcet retry - safe-exceptions servant servant-auth servant-auth-client - servant-client servant-client-core servant-conduit stm stm-chans - stm-conduit systemd temporary text time unix unordered-containers + concurrent-extra conduit conduit-concurrent-map conduit-extra + conduit-zstd containers cookie cryptonite deepseq dhall directory + ed25519 either extra filepath fsnotify hercules-ci-cnix-store here + hnix-store-core http-client http-client-tls http-conduit http-types + inline-c-cpp katip lukko lzma-conduit megaparsec memory mmorph + netrc network-uri optparse-applicative pretty-terminal + prettyprinter process protolude resourcet retry safe-exceptions + servant servant-auth servant-auth-client servant-client + servant-client-core servant-conduit stm stm-chans stm-conduit + systemd temporary text time unix unordered-containers uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; @@ -54013,8 +54039,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.2"; - sha256 = "1i3z0arn8cwglbsq8kxzcpp2ghypv7i03crpplbn0myk8wzflxdy"; + version = "1.3.1"; + sha256 = "1sp8884lbn86yqjm3f6d43qy3af3hd1zivdbgarvyfxxc16aqd6v"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring conduit cookie cryptonite deepseq deriving-aeson exceptions http-api-data @@ -54591,8 +54617,8 @@ self: { }: mkDerivation { pname = "calligraphy"; - version = "0.1.3"; - sha256 = "0fkjvvisrnadli5i8l7b8d8n7z3lwhzrihfrl3h9jkgham54f5mp"; + version = "0.1.4"; + sha256 = "02rx9paly04213m314wb85kahf8s6yp1d16ykhsm7v6ia79jh13j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56598,8 +56624,8 @@ self: { pname = "cborg"; version = "0.2.8.0"; sha256 = "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f"; - revision = "1"; - editedCabalFile = "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6"; + revision = "2"; + editedCabalFile = "0pvnzanysxiikq3kghhax9v2m693s23v9pas03iaggw0h098yns4"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -57818,8 +57844,8 @@ self: { }: mkDerivation { pname = "chart-svg"; - version = "0.3.2"; - sha256 = "1i2abnjr0nl5kwmb2lspqn80hnfdps3iw3ynzgw7klxm8vk6asvw"; + version = "0.3.3"; + sha256 = "1zfdjk502wi71app9k73igz38ykrgh75qxm9v9906md2wizfdv63"; libraryHaskellDepends = [ adjunctions attoparsec base Color containers cubicbezier foldl formatn lucid mtl neat-interpolation numhask numhask-array @@ -61591,31 +61617,24 @@ self: { }) {}; "clplug" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , containers, directory, fgl, fmt, format-numbers, lens, lens-aeson - , mtl, network, text, time + ({ mkDerivation, aeson, attoparsec, base, blitz, bytestring + , conduit, mtl, network, text }: mkDerivation { pname = "clplug"; - version = "0.1.0.0"; - sha256 = "1p8mpk0bk657xcnjxgz9jyv6ihx9l5fykw082ja5i0qsa55xindp"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "1fvbc3ply0kylrplq7d9jfyqin7wax506x9123qfldxwgfq6r2cq"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit mtl network text ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory fgl - fmt format-numbers lens lens-aeson mtl network text time - ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec base blitz bytestring conduit mtl network text ]; description = "Create Core Lightning Plugins"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {}; + }) {blitz = null;}; "clr-bindings" = callPackage ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes @@ -63273,8 +63292,8 @@ self: { pname = "collate"; version = "0.1.0.0"; sha256 = "1fh335mwk51gyhyxilv83z66ilz5ws3ni8cbr4qmpfpgf9m1jp5s"; - revision = "2"; - editedCabalFile = "08jzbmws1mj9cchn59pnbyrkia4kzz02sl8jhp7rmby2irm9vx1x"; + revision = "3"; + editedCabalFile = "1834l0p3brqlsv69cxwb6c4mxh655mmvzcj1sxnrz5zwlqvm7fjx"; libraryHaskellDepends = [ base containers lens primitive transformers vector ]; @@ -64209,8 +64228,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.3.3"; - sha256 = "009yrsb2xxna73q6nnijfx5ngffaz369mildvqvn91qbrkrzq7pl"; + version = "0.2.3.4"; + sha256 = "0pk6ckpb01pr9i2xyx2bm1sbkzbxy5vfy8l67pca1y0i0glyz150"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -64684,6 +64703,8 @@ self: { pname = "compdata"; version = "0.12.1"; sha256 = "0ksa3bgqjvshkrpd74420z9kkb3asq4flszzwrqswd4qw1yn9f05"; + revision = "2"; + editedCabalFile = "1809imnjf80b080qcmym9vln56pna41w9vv6aiqf7j3dxjhdp4i4"; libraryHaskellDepends = [ base containers deepseq mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -64841,8 +64862,8 @@ self: { pname = "compensated"; version = "0.8.3"; sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; - revision = "2"; - editedCabalFile = "0nr81fm5b8pavgyf0n34199jvr2zp18y0cdlzas240xwpgxn6k1p"; + revision = "3"; + editedCabalFile = "0fccjb5q07w1k3pl6x0jrglvbkfycqfjhbd121h3bxg6y5c3fs40"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive hashable lens log-domain safecopy semigroupoids semigroups vector @@ -69148,18 +69169,19 @@ self: { "copilot" = callPackage ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language - , copilot-libraries, copilot-theorem, directory, filepath - , optparse-applicative + , copilot-libraries, copilot-prettyprinter, copilot-theorem + , directory, filepath, optparse-applicative }: mkDerivation { pname = "copilot"; - version = "3.13"; - sha256 = "1a6r3r1q6vqxmwdj89bmvbzrlkfyyzq6i84ydg756wsvm6mipq7a"; + version = "3.14"; + sha256 = "1mmdb07da5hnldg438zaapx9c1j4sf8nay5fjyiqw24bzgilgm54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base copilot-c99 copilot-core copilot-language copilot-libraries - copilot-theorem directory filepath optparse-applicative + copilot-prettyprinter copilot-theorem directory filepath + optparse-applicative ]; description = "A stream DSL for writing embedded C programs"; license = lib.licenses.bsd3; @@ -69172,8 +69194,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.13"; - sha256 = "112lmmylylq9jwcj0diy3fqn9kbs8xkyqc9l7n5jjy5h3yak8d2c"; + version = "3.14"; + sha256 = "0jfy06m8zgk6wqispyi1idcb9f3azajw53hq416glip2j7ld8nby"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -69205,8 +69227,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.13"; - sha256 = "0i05bpiag7prr3xn361psda7ncfyrgbd6rjsy23rkf4ygmb2908p"; + version = "3.14"; + sha256 = "109qy41yajzii5kha2z030g9hq8rwsg3lq0i3fas490909r8b7yd"; libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit @@ -69240,8 +69262,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.13"; - sha256 = "0z03qlafv53sxp50j9ccp1pgfs3nqm4l7m18cxzflzzn6j3bnrjy"; + version = "3.14"; + sha256 = "0zjy9lr6ndsijvh2rvjm4dbbswrxdnxcb8x7wfnx55z8x237l49j"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -69253,17 +69275,17 @@ self: { "copilot-language" = callPackage ({ mkDerivation, array, base, containers, copilot-core - , copilot-interpreter, copilot-prettyprinter, copilot-theorem - , data-reify, HUnit, mtl, pretty, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl + , pretty, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "copilot-language"; - version = "3.13"; - sha256 = "060lr6m9kp204qyjga6xl879ypv648wm6gh33w10x5jlzghabl4d"; + version = "3.14"; + sha256 = "0aakm38hjp8rwpqnrlccq4pajcb93h6wrsam288y92akys7h9sj9"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter - copilot-prettyprinter copilot-theorem data-reify mtl + copilot-theorem data-reify mtl ]; testHaskellDepends = [ base copilot-core copilot-interpreter HUnit pretty QuickCheck @@ -69278,8 +69300,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.13"; - sha256 = "05ffpp2h83l0wvddfmi6m42c79qsw07dfmx8bmj2zwfhhikp043r"; + version = "3.14"; + sha256 = "0wxifm2x94hvi2c5il3yz16p6y09vmxwkmhd9zmfnpay4ymd00rq"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -69292,8 +69314,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.13"; - sha256 = "04ivmsrb51j7agmb1nimzxp0srkkv52qi49qxishf8gj4jnhm10p"; + version = "3.14"; + sha256 = "1c7ckq7mllfm1ycqsf9h9vm0ckzl5lsi5s2pxrmypj8gyzj8wxfj"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -69323,8 +69345,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.13"; - sha256 = "0q0pfnaayldy1h62qj25ksfc9v2vyp5aiy3b2lxw436lw2brl4jf"; + version = "3.14"; + sha256 = "158s55ybvhw9yiam4kwn02r76mlsvxsw14cxff9bkcryqdx6vlby"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -69527,23 +69549,6 @@ self: { }) {}; "core-text" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq - , fingertree, hashable, prettyprinter, template-haskell, text - , text-short - }: - mkDerivation { - pname = "core-text"; - version = "0.3.8.0"; - sha256 = "1vl463wdgnfb795nbir355w1cgy5ndqnwgfiiyr1j73xmngmvw04"; - libraryHaskellDepends = [ - ansi-terminal base bytestring colour deepseq fingertree hashable - prettyprinter template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = lib.licenses.mit; - }) {}; - - "core-text_0_3_8_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text , text-short @@ -69558,7 +69563,6 @@ self: { ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-warn" = callPackage @@ -71127,6 +71131,8 @@ self: { pname = "criterion"; version = "1.6.0.0"; sha256 = "1c2jl881bb3g4w037dx4bs3s164s306vayw2jxd9k3hmrnffyaa0"; + revision = "1"; + editedCabalFile = "1sq1izskw1j1dxrdak8zxv22q3cvxg7s9wvxx3l2gj0165xj83bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75377,8 +75383,8 @@ self: { pname = "data-fix"; version = "0.3.2"; sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs"; - revision = "3"; - editedCabalFile = "0z77i9y86wlc13396akl8qxq39rwpkhhcs5fadzk47bwn7v1gsmx"; + revision = "4"; + editedCabalFile = "1s9xivrnsp5n7jhflz4h4vzwwdcxal7kwchpaa982m8pfr23ayy2"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -75999,8 +76005,8 @@ self: { pname = "data-reify"; version = "0.6.3"; sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; - revision = "1"; - editedCabalFile = "137z993v7af9ym468vprys09416c7l7pys5hrng7k5vafga73y3b"; + revision = "2"; + editedCabalFile = "1ajrndp9251b3pnfm2g56pdp4jynlgbyd8i3qjlsi3wqpngwlhw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79438,29 +79444,6 @@ self: { }) {}; "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.6.2"; - sha256 = "18kpai3jrazcnxcfqqjxkv2ghrz8xyg73rn5x0ipim3z09grj6ki"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat void - ]; - testToolDepends = [ hspec-discover ]; - description = "Backports of GHC deriving extensions"; - license = lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_6_3" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -79481,7 +79464,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "deriving-openapi3" = callPackage @@ -80533,8 +80515,8 @@ self: { }: mkDerivation { pname = "dhall-secret"; - version = "0.5.52"; - sha256 = "1dxnn77kjab3vwf6p1pk000aila9m5jgalnba0g54prcj9rgca6q"; + version = "0.5.53"; + sha256 = "0mhq3xdgikkjq7z0cy0ir9mil7nzw57f453ic80v4r65fyyvzs44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81354,10 +81336,8 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.5.1"; - sha256 = "11h2s33y6p1xd1d0kp281nz8iq5rpm0wj63wrzdha874qf79wz9g"; - revision = "2"; - editedCabalFile = "0w662h38pjmxz029ffxzv2cj6hx2mpzzr180m2340phxjflxr07g"; + version = "1.5.1.1"; + sha256 = "1kwb100k3qif9gc8kgvglya5by61522128cxsjrxk5a8dzpgwal4"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib hashable lens monoid-extras mtl semigroups split @@ -81968,14 +81948,27 @@ self: { ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; - version = "0.0.1.5"; - sha256 = "1lpj16hazg8yh2rxspc1y7da9vgmz6jw9fx9qrvwv1hzmv8mvnvv"; + version = "0.0.1.6"; + sha256 = "1kygg0zwwgwsmv39hq507dp56389vm8vsam6jbm582gai8dpdwmi"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; license = lib.licenses.bsd2; }) {inherit (pkgs) zlib;}; + "digest_0_0_1_7" = callPackage + ({ mkDerivation, base, bytestring, zlib }: + mkDerivation { + pname = "digest"; + version = "0.0.1.7"; + sha256 = "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ zlib ]; + description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "digest-pure" = callPackage ({ mkDerivation, array, base, bytestring, digest, QuickCheck }: mkDerivation { @@ -85376,7 +85369,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest-parallel_0_3_0" = callPackage + "doctest-parallel_0_3_0_1" = callPackage ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random @@ -85385,8 +85378,8 @@ self: { }: mkDerivation { pname = "doctest-parallel"; - version = "0.3.0"; - sha256 = "121ql1pygbs1cars5mva7lxa96aq0fhn27n3vnn5zqrvdypn3ys4"; + version = "0.3.0.1"; + sha256 = "17azfkx2hl48gfxhln710lngzbcwfmxv24jqj8h59ydrah9cba11"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions filepath ghc ghc-paths Glob process random syb @@ -86284,16 +86277,16 @@ self: { "downhill" = callPackage ({ mkDerivation, base, containers, hedgehog, reflection, tasty - , tasty-hedgehog, tasty-hunit, template-haskell, th-abstraction - , transformers, unordered-containers, vector-space + , tasty-hedgehog, tasty-hunit, transformers, unordered-containers + , vector-space }: mkDerivation { pname = "downhill"; - version = "0.3.0.0"; - sha256 = "1y4idkv093zlvlr9wc30cmyi7qn16sk73p8cx3ivyvq3j36dgw0l"; + version = "0.4.0.0"; + sha256 = "1qqcp4yybbfvh3r3v53ac42f5lmyy55nfz6mc3c2jsj0r8457a0c"; libraryHaskellDepends = [ - base containers reflection template-haskell th-abstraction - transformers unordered-containers vector-space + base containers reflection transformers unordered-containers + vector-space ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit vector-space @@ -89331,6 +89324,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_2_2_2" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control + , primitive, transformers-base, unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.2.2.2"; + sha256 = "1ykscrp24n6cfwh9n051wj8zcza522jwfcw48fnxh3gvgyn43vaq"; + libraryHaskellDepends = [ + base containers exceptions monad-control primitive + transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc , ghc-tcplugins-extra @@ -89349,14 +89359,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-plugin_1_1_0_0" = callPackage + "effectful-plugin_1_1_0_1" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc , ghc-tcplugins-extra }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.0"; - sha256 = "13m63lidazn8cp2f0y801nwri48h5mny3azsz5gpz1c7jj072xaa"; + version = "1.1.0.1"; + sha256 = "1clm190xhf9wibck7i5slzchbq926f2xfxij6zxqv656fx9l5vf6"; libraryHaskellDepends = [ base containers effectful-core ghc ghc-tcplugins-extra ]; @@ -89387,8 +89397,8 @@ self: { pname = "effectful-th"; version = "1.0.0.1"; sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; - revision = "1"; - editedCabalFile = "0vj46wzmc2diydx3cfn5sbv25bjcg6gw1cy0q1rqlxbhggm9zk94"; + revision = "2"; + editedCabalFile = "15s8yvxf7sbi1vx5ylnrnxc1b694ndmdac0f5bi8v0cg6sjijkzw"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -89796,6 +89806,8 @@ self: { pname = "either"; version = "5.0.2"; sha256 = "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z"; + revision = "1"; + editedCabalFile = "1w2rxrj0gc3a7p74pybji8yy2zsjnhxyi4zhlmx4qsyz6w616ggv"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids ]; @@ -90334,15 +90346,15 @@ self: { broken = true; }) {}; - "eliminators_0_9_2" = callPackage + "eliminators_0_9_3" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.2"; - sha256 = "0j0k1lw6b5yqz7kxckb5s0phqcnzdis0b469nxryawsv12wvv335"; + version = "0.9.3"; + sha256 = "0pmh4ds1xmk464988airlwdj47mbq9xzgvfmpsp7dw84k0226pyg"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -92541,6 +92553,8 @@ self: { pname = "eq"; version = "4.3"; sha256 = "0p3189kq045vxh0h7is81q0qahaghni810x68g31yml05md37giz"; + revision = "1"; + editedCabalFile = "1b2k97n787730p3k4fsp16f2i9ddqf5k90cq4r7s2lddmdq0cshr"; libraryHaskellDepends = [ base semigroupoids ]; description = "Leibnizian equality"; license = lib.licenses.bsd3; @@ -93294,8 +93308,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.8.2"; - sha256 = "058f79z5sm6ifw54a3x0cm6k59cpj78z0p2lxrbcv754z60dms63"; + version = "3.5.9.0"; + sha256 = "0r9p4kg3m9g4cpd9lcw9ljzf9wrl8wwdcp4gqwidg75wbpy3fy47"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -94576,8 +94590,8 @@ self: { }: mkDerivation { pname = "eventuo11y"; - version = "0.9.0.0"; - sha256 = "0ayzk79z2xvkhlmr6yg9q52kdjh68ahsi9hhc0bi58zg46dnq18i"; + version = "0.9.0.1"; + sha256 = "0ihz8j8nfwnsz7a3vg5qbvajyngaph8bby8g942i0kbc24gsrymi"; libraryHaskellDepends = [ base exceptions general-allocate monad-control mtl primitive time transformers transformers-base unliftio-core @@ -94597,8 +94611,8 @@ self: { }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.4.0.0"; - sha256 = "04b1rigdxv5v2j8r7lfbl15a1hr9ifra9lnkxxc1j1symbpq620m"; + version = "0.4.0.1"; + sha256 = "1516005y2qjybil094scnv27446fbm588yhb95n7h2sqbdx183ff"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y eventuo11y-json general-allocate http-media http-types @@ -97236,15 +97250,15 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; - "fast-logger_3_2_0" = callPackage + "fast-logger_3_2_1" = callPackage ({ mkDerivation, array, async, auto-update, base, bytestring , directory, easy-file, filepath, hspec, hspec-discover, stm, text , unix-compat, unix-time }: mkDerivation { pname = "fast-logger"; - version = "3.2.0"; - sha256 = "1f0ac7b3irmc4967jrbjnkh8y89gdv57r6vv7m6fkbbjxyyp4nqp"; + version = "3.2.1"; + sha256 = "1qsy9x14sv1718anmqwj46p2cwjqxbzqnvai47sj9kkfi2r71l49"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -99896,10 +99910,8 @@ self: { }: mkDerivation { pname = "fin-int"; - version = "0.2.0"; - sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; - revision = "4"; - editedCabalFile = "1gs61m3qllgapsn7rhix1c0l91l6878glks6xdwy545byphr92cf"; + version = "0.2.0.1"; + sha256 = "02k1lx5f8vh0acp4ali81y8byvg2fzpyjk24jmk75ci32ljcfzd2"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint @@ -100213,8 +100225,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; - revision = "5"; - editedCabalFile = "0lrpv4nqipdxyd1iw3x6y5fi0bkl28yd0nh1r3m39qzdd8v99b5g"; + revision = "6"; + editedCabalFile = "1ynflgdp9mrl38v9bnfvma2g4bwx3gf89gq1d10354j7jismf8sy"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -102448,6 +102460,8 @@ self: { pname = "foldable1-classes-compat"; version = "0.1"; sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; + revision = "2"; + editedCabalFile = "05sdpi0c503xgrgg2cg4922r5ja5154lfwzi9mgcmxncsk02a4l5"; libraryHaskellDepends = [ base containers ghc-prim tagged transformers ]; @@ -102604,8 +102618,8 @@ self: { pname = "folds"; version = "0.7.8"; sha256 = "11278546mq05rhyjfmhg0iasqjsn898l44dhp5qgaw1zwzywir2i"; - revision = "1"; - editedCabalFile = "1gxb8469w12afd1adf5cn32wxvnvndavxwr65dyc6icqvalbkirn"; + revision = "2"; + editedCabalFile = "13agcwgdwbs4kclgmrdqlj3m0bndad98wznk363y54psgqqrl9cx"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant @@ -103153,8 +103167,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "formatn"; - version = "0.2.1"; - sha256 = "1l6xzwxbddalz33ppyy9wcb0i0n9vz17s0c4j15ji96ql11k3hm7"; + version = "0.2.2"; + sha256 = "0vi29difvl87q7mr088viv3fff2p9nym8gjd20ndh0kwykhjfr8s"; libraryHaskellDepends = [ base containers QuickCheck text ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; @@ -104187,8 +104201,8 @@ self: { pname = "free"; version = "5.1.10"; sha256 = "0whff0r0nvii5l9z9crw7v0rj0wwblwbnfp99515siyxjkzs9phj"; - revision = "1"; - editedCabalFile = "0kpb7vfhl29c15miln3wsgqwjd8bz43v500dyaprwsglmgprwbdw"; + revision = "2"; + editedCabalFile = "1qpn9sy2bpngkr9zdi0dvy5knnhbsli3d0nw1ljvw12pisv6njaq"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -104198,6 +104212,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "free_5_2" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.2"; + sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; + revision = "1"; + editedCabalFile = "0gpz9jlvdnds3988naqxn1dn1hr4zk3md1dhkky4hv0a2b69z7nh"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -106501,15 +106536,15 @@ self: { , futhark-manifest, futhark-server, githash, half, happy, haskeline , language-c-quote, lens, lsp, mainland-pretty, megaparsec, mtl , mwc-random, neat-interpolation, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, process-extras, QuickCheck - , random, regex-tdfa, srcloc, statistics, tasty, tasty-hunit + , prettyprinter-ansi-terminal, process-extras, QuickCheck, random + , regex-tdfa, srcloc, statistics, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, terminal-size , text, time, transformers, vector, versions, zlib }: mkDerivation { pname = "futhark"; - version = "0.23.1"; - sha256 = "0si4si74d8y9dgsqiixj6cfblpr2l02dwijbngwv5xdyfpbdfgq6"; + version = "0.24.1"; + sha256 = "1j459dhh2670p985rsbqjc37vhw87dymk8hy9fhx6gf0yvxkmg08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106520,9 +106555,9 @@ self: { futhark-manifest futhark-server githash half haskeline language-c-quote lens lsp mainland-pretty megaparsec mtl mwc-random neat-interpolation parallel prettyprinter - prettyprinter-ansi-terminal process process-extras random - regex-tdfa srcloc statistics template-haskell temporary - terminal-size text time transformers vector versions zlib + prettyprinter-ansi-terminal process-extras random regex-tdfa srcloc + statistics template-haskell temporary terminal-size text time + transformers vector versions zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; @@ -106563,8 +106598,8 @@ self: { }: mkDerivation { pname = "futhark-manifest"; - version = "1.1.0.0"; - sha256 = "1y1f3b6rz6m778izvi6n7ylinr6m41fy19h4by0bb6hdmcazaxpn"; + version = "1.2.0.1"; + sha256 = "17sb3598yb88fj3ndffpd7a75vas16vfw6gl6n79rckgibrl8gh6"; libraryHaskellDepends = [ aeson base bytestring containers text ]; testHaskellDepends = [ base QuickCheck quickcheck-instances tasty tasty-hunit @@ -106580,8 +106615,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.1.0"; - sha256 = "0i5jc7lddc8s938qh4jq61i33l13yfknppxi6q9n7yqig0rl3lbv"; + version = "1.2.2.0"; + sha256 = "1b81mgb69fj9sir9zp5a60rqzpvzxwyg8h9cw97njxhaps81ysmd"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -107098,8 +107133,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "gambler"; - version = "0.2.0.0"; - sha256 = "0hr3ig4cwlaq09z852lmfmr9sakxyrpfydkslps8zv95pbr15yhz"; + version = "0.4.1.0"; + sha256 = "1r3bn5ijrp3gp0f66pphii4s9nfbnh0507n3kg7r4hcavs1n2h60"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Composable, streaming, and efficient left folds"; @@ -108124,8 +108159,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.1.2"; - sha256 = "0dnv96wnhp648ydhy883i13lsgmirqlrc62ijgisi66dpkwxmcm3"; + version = "0.2.1.4"; + sha256 = "1ds89izz3m53wr8qk4d3x3y3pgw7y1j3na2sy7yjgzy857j6xxp6"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -108341,23 +108376,6 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "generic-deriving"; - version = "1.14.2"; - sha256 = "0bxacg6b1vz135x93vf7jk6129m08hdyj7426ymaylfl2w8kapi6"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_14_3" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: @@ -108372,7 +108390,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -108818,8 +108835,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generically"; - version = "0.1"; - sha256 = "0w9b7yynq0gk44jvdp1c8760lqpa1c38v5r1qav282yhw602idym"; + version = "0.1.1"; + sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; libraryHaskellDepends = [ base ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -110317,22 +110334,21 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_4_4" = callPackage + "ghc_9_6_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc - , process, stm, template-haskell, terminfo, time, transformers - , unix + , process, stm, template-haskell, time, transformers, unix }: mkDerivation { pname = "ghc"; - version = "9.4.4"; - sha256 = "0s97l24miwwi0i9c1jgf7rqlmlc13qfncvp56d8wax4jzjlaa99c"; + version = "9.6.1"; + sha256 = "1jrcqhg4qc1lj8cfv8apzpw0479g42lv5pw8dr3dvmhg21njp386"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory exceptions filepath ghc-boot ghc-heap ghci hpc process stm - template-haskell terminfo time transformers unix + template-haskell time transformers unix ]; libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; @@ -110405,14 +110421,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_4_1" = callPackage + "ghc-boot_9_6_1" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.4.1"; - sha256 = "0jm28sisgc0sggf3jgbf7v387xllfv0fnm0bdb0m0lfrqr4w3xmc"; + version = "9.6.1"; + sha256 = "1vmlkp0sh5jlqgjj137kz02gb362913bzhvl3ij8vhdvd76r9116"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -110423,12 +110439,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_4_1" = callPackage + "ghc-boot-th_9_6_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.4.1"; - sha256 = "0qnhnyavbm44aiq8x0cf1q7rylpv6gv4bjfiir7s2g950vdab8il"; + version = "9.6.1"; + sha256 = "1swd7wwjn80fvinfixqavd3akfdsxm7i3ymy1gyccbj03md4wz2b"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -110966,12 +110982,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_4_1" = callPackage + "ghc-heap_9_6_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.4.1"; - sha256 = "0zfz389vv7pwxivlvrf3ykij31saafk9vm32fa9xl2b4kvgc8my2"; + version = "9.6.1"; + sha256 = "1ksbhlddq6s4r5mvg7q8xvpa02rq6al5768ca3qkqha8ssnziw53"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -111123,27 +111139,6 @@ self: { }) {}; "ghc-lib" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-lib-parser - , ghc-prim, happy, hpc, parsec, pretty, process, rts, time - , transformers, unix - }: - mkDerivation { - pname = "ghc-lib"; - version = "9.2.6.20230211"; - sha256 = "1f0sf922yh5n8057c14vs362pka7kq0c6h87kmarmrz8mjp19c37"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory - exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty - process rts time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-lib_9_2_7_20230228" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -111162,10 +111157,9 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_4_4_20221225" = callPackage + "ghc-lib_9_6_1_20230312" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -111173,8 +111167,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.4.20221225"; - sha256 = "0cl2w63gafv64q8v4ymvwa79yxwx9jh285zr68qncchmm67cnzql"; + version = "9.6.1.20230312"; + sha256 = "1g31mjshz4nh552sawffpfjd550qv58s7hy1xw7ylaqhp7dylqgv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -111208,26 +111202,6 @@ self: { }) {}; "ghc-lib-parser" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec - , pretty, process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib-parser"; - version = "9.2.6.20230211"; - sha256 = "0q0n9nsi8hxd9pjsrn7vdkwrjvsig8100dd1w5v7hka2dryffi6z"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory - exceptions filepath ghc-prim parsec pretty process time - transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser_9_2_7_20230228" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix @@ -111245,18 +111219,17 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_4_4_20221225" = callPackage + "ghc-lib-parser_9_6_1_20230312" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.4.20221225"; - sha256 = "0av5c7phk0lc8nnaacm5v0cah1hiihw3kqf7cavphhadw06dixk7"; + version = "9.6.1.20230312"; + sha256 = "0a2zfsjbw5gip7gp09r41vxgfvssyga9hfrrrv2s58fvscx1k7bh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -111329,14 +111302,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser-ex_9_4_0_0" = callPackage + "ghc-lib-parser-ex_9_6_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.4.0.0"; - sha256 = "06qrfg4icp66lyhzncvsaqdcmsijayrlgi91x65a2nd2l0wz6gyf"; + version = "9.6.0.0"; + sha256 = "0k84r37xfj9xhx2rl4kxx9imlnwpmxvnf3kadh8ysz3pl4hknnl5"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -115102,6 +115075,8 @@ self: { pname = "github"; version = "0.28.0.1"; sha256 = "16ahq2ng52ypkkgqbbmizr486px3dh709hw3jdn7jzglgvn20712"; + revision = "1"; + editedCabalFile = "1irbqis6iv62nqc75fy87mv1lahrnybq1j8mal15n129sxyyvz56"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -119474,29 +119449,6 @@ self: { }) {}; "goldplate" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff - , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, unordered-containers - }: - mkDerivation { - pname = "goldplate"; - version = "0.2.0"; - sha256 = "1f2n981676ykrv08fgdj87mj5r4841a18ywvgpc2hgapsgwbgma1"; - revision = "3"; - editedCabalFile = "0h1ayys29md2nbiqshdrhr8kz06dikiwkb4ikcg3wfzb4k1lpzvl"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text - unordered-containers - ]; - description = "A lightweight golden test runner"; - license = lib.licenses.asl20; - mainProgram = "goldplate"; - }) {}; - - "goldplate_0_2_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process , regex-pcre-builtin, text, unordered-containers @@ -119515,7 +119467,6 @@ self: { testHaskellDepends = [ base process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "goldplate"; }) {}; @@ -123448,8 +123399,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.5.3.1"; - sha256 = "042milcmyimk5xirxhs0f5a8gmawp6d2a718zd0ccs162db4691g"; + version = "4.5.3.2"; + sha256 = "0ni3vw7kd25w5kvvxvpgyq1d1s3c41z1a66zs6dv75mly57svacb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -125028,8 +124979,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.8.1.0"; - sha256 = "05amkgk4yy7b440g8lllz5j91x278f5hwq6kjn9dzbh83qw3ccl0"; + version = "0.8.2.0"; + sha256 = "0wpjr9l5nzggdkqhsw16b5p8gnkaz2pfmh7wab1m5kphyaky88nz"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -126450,6 +126401,30 @@ self: { broken = true; }) {}; + "halide-haskell" = callPackage + ({ mkDerivation, base, bytestring, constraints, filepath, Halide + , hspec, HUnit, inline-c, inline-c-cpp, primitive, QuickCheck + , template-haskell, temporary, text, unix, vector + }: + mkDerivation { + pname = "halide-haskell"; + version = "0.0.1.0"; + sha256 = "0glal3f23bvvpilczcvy4wsdcnl23xqavyy0ms8hmqk1nbp5is96"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring constraints filepath inline-c inline-c-cpp + primitive template-haskell temporary text unix vector + ]; + librarySystemDepends = [ Halide ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base hspec HUnit inline-c inline-c-cpp QuickCheck text vector + ]; + description = "Haskell bindings to Halide"; + license = lib.licenses.bsd3; + }) {Halide = null;}; + "halipeto" = callPackage ({ mkDerivation, base, directory, HaXml, pandoc }: mkDerivation { @@ -128619,8 +128594,8 @@ self: { pname = "hash-addressed"; version = "0.2.0.1"; sha256 = "1j4zr63if21g208zyhdk2mz8v3pfp23s33mrqzig0rryw3f0kby7"; - revision = "2"; - editedCabalFile = "0iaaby674182cxwdzpsaz52skzs3klgkid9c7sajz4pi6kh921xl"; + revision = "4"; + editedCabalFile = "0rvij61sng451nh4r17zzjn5gwjr25gw6r5i74njj32gfbzhrrv5"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptohash-sha256 directory filepath gambler mtl pipes quaalude resourcet temporary @@ -128700,6 +128675,8 @@ self: { pname = "hashable"; version = "1.4.2.0"; sha256 = "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v"; + revision = "1"; + editedCabalFile = "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq"; libraryHaskellDepends = [ base bytestring containers data-array-byte deepseq filepath ghc-bignum ghc-prim text @@ -129965,28 +129942,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.2"; - sha256 = "05r84czb05n69g7p7jazljh95yzdh2lpzgjjypgpg75mh83igr2w"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_3" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -130006,7 +129961,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -133561,22 +133515,6 @@ self: { }) {}; "hasql-implicits" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hasql - , network-ip, scientific, text, time, uuid, vector - }: - mkDerivation { - pname = "hasql-implicits"; - version = "0.1.0.5"; - sha256 = "10mfl1sa23zv7hgc0k1xykjxgrs4qjlmwdkxw38y0wn9b7zzpnlh"; - libraryHaskellDepends = [ - aeson base bytestring containers hasql network-ip scientific text - time uuid vector - ]; - description = "Implicit definitions for Hasql, such as default codecs for standard types"; - license = lib.licenses.mit; - }) {}; - - "hasql-implicits_0_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hasql , network-ip, scientific, text, time, uuid, vector }: @@ -133590,7 +133528,6 @@ self: { ]; description = "Implicit definitions for Hasql, such as default codecs for standard types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-interpolate" = callPackage @@ -133802,15 +133739,15 @@ self: { }) {}; "hasql-resource-pool" = callPackage - ({ mkDerivation, base-prelude, clock, hasql, hspec - , resource-pool-fork-avanov, time + ({ mkDerivation, base-prelude, clock, hasql, hspec, resource-pool + , time }: mkDerivation { pname = "hasql-resource-pool"; - version = "0.5.3.2"; - sha256 = "07j293mivq4gfqaaclb80kbr413nwb8f18jf683pjj66d4ql5j01"; + version = "0.6.0.0"; + sha256 = "05xvmcrlxp8gksizsx916awsxhbh4a9svnirhnibn9cp1bqcr11i"; libraryHaskellDepends = [ - base-prelude clock hasql resource-pool-fork-avanov time + base-prelude clock hasql resource-pool time ]; testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql based on resource-pool"; @@ -135881,6 +135818,22 @@ self: { license = lib.licenses.mit; }) {}; + "headed-megaparsec_0_2_1_2" = callPackage + ({ mkDerivation, base, case-insensitive, megaparsec + , parser-combinators, selective + }: + mkDerivation { + pname = "headed-megaparsec"; + version = "0.2.1.2"; + sha256 = "1k89p1kpsf6hgd2z9b9alza0ha8xxwmwn9pwd4iih0211l8bs2c1"; + libraryHaskellDepends = [ + base case-insensitive megaparsec parser-combinators selective + ]; + description = "More informative parser"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "headergen" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, haskeline, time @@ -136424,8 +136377,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.3.0.3"; - sha256 = "1jrzijk8b4hnglsghja1aad482sc7zq0g9g0zyjxgwr4pjj7sc6f"; + version = "0.4.0.1"; + sha256 = "05skqhcf51dv6g171vq29pca48n0hbnl8b5xrzalr77a19s77ba3"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq directory exceptions filepath hedgehog hw-aeson mmorph mtl network process @@ -137484,8 +137437,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.10"; - sha256 = "1sbp3jjn54z6hwkfgb83g0zgn1dm8qi9254g2yc8r4msm6n3nzww"; + version = "0.9.11"; + sha256 = "1y0n4vfxf84r5jw02vciwks6snj35zhy789nsixxv8jba6scnf66"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137531,15 +137484,16 @@ self: { "hercules-ci-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cookie - , exceptions, hashable, hercules-ci-api-core, http-api-data + , exceptions, hashable, hercules-ci-api-core, hspec, http-api-data , http-media, lens, lens-aeson, memory, network-uri, profunctors - , servant, servant-auth, servant-auth-swagger, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid + , protolude, QuickCheck, quickcheck-classes, servant, servant-auth + , servant-auth-swagger, servant-swagger, servant-swagger-ui-core + , string-conv, swagger2, text, time, uuid, vector }: mkDerivation { pname = "hercules-ci-api"; - version = "0.7.2.1"; - sha256 = "1nkmiyfmidrfqvlfy9k75y4asrrbrs2511kdzhrpb3zlrlaw4zb8"; + version = "0.8.0.0"; + sha256 = "1ivlh6gxjdrrzgyafwglv145wz8ss77ayjv6lwfanaiq26x25vqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137555,6 +137509,12 @@ self: { servant servant-auth servant-auth-swagger servant-swagger servant-swagger-ui-core string-conv swagger2 text time uuid ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hashable + hercules-ci-api-core hspec http-api-data http-media protolude + QuickCheck quickcheck-classes servant servant-auth string-conv text + time uuid vector + ]; description = "Hercules CI API definition with Servant"; license = lib.licenses.asl20; mainProgram = "hercules-gen-swagger"; @@ -137571,8 +137531,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.4.6.1"; - sha256 = "07gvmcag36ai945j7bxnvy2x8fsx9apkabcikp6x1a2anvkgws24"; + version = "0.5.0.0"; + sha256 = "0j1yb091i4whlf8brj2n0x0dnqm01p56i2ns4p59xsx6k0z7hprv"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -137629,8 +137589,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.5"; - sha256 = "0mk6q6ccgpdpjfc7mdms28dbhh1bawy4jnnqcfcb6vxg4cj83f44"; + version = "0.3.6"; + sha256 = "1wsgjj7asq6a0p8aja6mqcjy1qxpbwbii65fw9w6ilmmacpfh6yy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137669,8 +137629,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.5.0"; - sha256 = "0r70kjn8a1wiw1zndahrg2gc88k52dscm4yjmms2caf22pkh562a"; + version = "0.3.5.1"; + sha256 = "0l4267n0h272snfrbw6phhlrdn8vmiv363b33iv0yh9mnp0d3ya2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -137699,8 +137659,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.3.3"; - sha256 = "1w4azya8phkk3gmkifcv2pc6jh8zanwk9m2vwqsdgk7kr8zkkzws"; + version = "0.3.3.5"; + sha256 = "0mzpa1apijap1mbfshrw7dan897kikhdp5hpb2r0p1p5w7qxrl9l"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -137776,22 +137736,22 @@ self: { "hermes-json" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base - , bytestring, containers, deepseq, dlist, hedgehog, mtl, scientific - , tasty, tasty-hedgehog, text, time, time-compat, transformers - , unliftio, unliftio-core + , bytestring, containers, deepseq, dlist, hedgehog, primitive + , scientific, tasty, tasty-hedgehog, text, time, time-compat + , transformers, vector }: mkDerivation { pname = "hermes-json"; - version = "0.2.0.1"; - sha256 = "1i10nmblh6zxbqpqk5z5r97334j6x37kgw459i4icm6c4hi55k4l"; + version = "0.5.0.0"; + sha256 = "0d0vy74z0m9vcs5rngigsqd6642dfx40a8bzh5finwrwgjb9k2dk"; libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base bytestring deepseq dlist mtl - scientific text time time-compat transformers unliftio - unliftio-core + attoparsec attoparsec-iso8601 base bytestring containers deepseq + dlist primitive scientific text time time-compat transformers + vector ]; testHaskellDepends = [ aeson base bytestring containers hedgehog scientific tasty - tasty-hedgehog text time + tasty-hedgehog text time vector ]; description = "Fast JSON decoding via simdjson C++ bindings"; license = lib.licenses.mit; @@ -139923,8 +139883,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.4.2.0"; - sha256 = "01hl63wq6rb2wgml850wawq07sn9vl8d2hv1jc3m366dxdqqhy8j"; + version = "0.4.2.1"; + sha256 = "0gwlksxqfngd3ikc5nlbh7jq42l8siriqmgbravkvk1f78p1rcy3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ barbies base generic-lens generic-lens-core named QuickCheck @@ -141716,19 +141676,19 @@ self: { ]; }) {}; - "hledger_1_28" = callPackage + "hledger_1_29" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid , math-functions, megaparsec, microlens, mtl, process, regex-tdfa , safe, shakespeare, split, tabular, tasty, temporary, terminfo - , text, time, timeit, transformers, unordered-containers + , text, text-ansi, time, timeit, transformers, unordered-containers , utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.28"; - sha256 = "0lagm7wk0k8jyk6kqggw7qka0jigqzjyqrrl4pr6cm0wd7x34cd8"; + version = "1.29"; + sha256 = "0f0mz1x54q31y8wbad2maq7rr1wd15msgbg99ldvmqpw760wflcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141736,22 +141696,24 @@ self: { Decimal Diff directory extra filepath githash hashable haskeline hledger-lib lucid math-functions megaparsec microlens mtl process regex-tdfa safe shakespeare split tabular tasty temporary terminfo - text time timeit transformers unordered-containers utf8-string - utility-ht wizards + text text-ansi time timeit transformers unordered-containers + utf8-string utility-ht wizards ]; executableHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers data-default Decimal directory extra filepath githash haskeline hledger-lib math-functions megaparsec microlens mtl process regex-tdfa safe - shakespeare split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; testHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers data-default Decimal directory extra filepath githash haskeline hledger-lib math-functions megaparsec microlens mtl process regex-tdfa safe - shakespeare split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; description = "Command-line interface for the hledger accounting system"; license = lib.licenses.gpl3Only; @@ -141963,37 +141925,37 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_28" = callPackage + "hledger-lib_1_29" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec - , cmdargs, containers, data-default, Decimal, deepseq, directory - , doclayout, doctest, extra, file-embed, filepath, Glob, hashtables - , megaparsec, microlens, microlens-th, mtl, parser-combinators - , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit - , template-haskell, text, time, timeit, transformers, uglymemo - , unordered-containers, utf8-string + , cmdargs, colour, containers, data-default, Decimal, deepseq + , directory, doclayout, doctest, extra, file-embed, filepath, Glob + , hashtables, megaparsec, microlens, microlens-th, mtl, pager + , parser-combinators, pretty-simple, regex-tdfa, safe, tabular + , tasty, tasty-hunit, template-haskell, text, text-ansi, time + , timeit, transformers, uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.28"; - sha256 = "098c36vx16xnjs27sn9h2794hyf7py5bhn1kaw8ira6akljgzh4k"; + version = "1.29"; + sha256 = "1k2a9xahp8g99gdvdqj42q6y332x6c7bjdyhjc6lln4szly6xy38"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base blaze-markup bytestring - call-stack cassava cassava-megaparsec cmdargs containers + call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory doclayout extra file-embed filepath Glob hashtables megaparsec microlens microlens-th mtl - parser-combinators pretty-simple regex-tdfa safe tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - unordered-containers utf8-string + pager parser-combinators pretty-simple regex-tdfa safe tabular + tasty tasty-hunit template-haskell text text-ansi time timeit + transformers uglymemo unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base blaze-markup bytestring - call-stack cassava cassava-megaparsec cmdargs containers + call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory doclayout doctest extra file-embed filepath Glob hashtables megaparsec microlens - microlens-th mtl parser-combinators pretty-simple regex-tdfa safe - tabular tasty tasty-hunit template-haskell text time timeit - transformers uglymemo unordered-containers utf8-string + microlens-th mtl pager parser-combinators pretty-simple regex-tdfa + safe tabular tasty tasty-hunit template-haskell text text-ansi time + timeit transformers uglymemo unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; license = lib.licenses.gpl3Only; @@ -142077,7 +142039,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_28" = callPackage + "hledger-ui_1_29" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -142086,8 +142048,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.28"; - sha256 = "04jq73ra4gv5q5lj0ivhrabkxkvp278c0sqyv6sa9sks0iwlgm3p"; + version = "1.29"; + sha256 = "0k4zzi8ns15gwwzjm9z3gajczvsk6s0fblxbl5g1hfp9aglf1cxy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142160,7 +142122,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_28" = callPackage + "hledger-web_1_29" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory @@ -142173,8 +142135,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.28"; - sha256 = "143340249wbcq4nsykk2d32xv9r89znzl8fr9yhaab68zlppfyh1"; + version = "1.29"; + sha256 = "04bhnvzn1l58f2g90baj28csksv2dfb16vh2qx5ni1x8r068h2w5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145774,25 +145736,19 @@ self: { "horizon-spec" = callPackage ({ mkDerivation, base, containers, dhall, path, path-dhall-instance - , prettyprinter, sydtest, template-haskell, text, th-lift + , template-haskell, text, th-lift }: mkDerivation { pname = "horizon-spec"; - version = "0.6.4"; - sha256 = "0bxpgx1ybk4klhd193yzli3qqbhlbbx40kj18nz1scvd75yzyah9"; - isLibrary = true; - isExecutable = true; + version = "0.9.0"; + sha256 = "0w183j05qfig31m58wq78glyjjb5zh26zw8ghld53b8x7971127q"; libraryHaskellDepends = [ base containers dhall path path-dhall-instance template-haskell text th-lift ]; - executableHaskellDepends = [ - base dhall prettyprinter sydtest text - ]; description = "Horizon Stable Package Set Type Definitions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "horizon-spec-tests"; }) {}; "horizon-spec-lens" = callPackage @@ -148049,8 +148005,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-awsxray"; - version = "0.1.0.0"; - sha256 = "17qps8qhniq8nzldnhisv0i2d1gc5lfhbzrawhisadgjsbwlxryj"; + version = "0.1.0.1"; + sha256 = "0zd40v359lflyvlw6mas3gcd7wb1sppwaw6q1820x6zm7ww6hwfw"; libraryHaskellDepends = [ base bytestring errors hs-opentelemetry-api hs-opentelemetry-sdk http-types memory microlens random text time unliftio unliftio-core @@ -151384,14 +151340,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_9" = callPackage + "hspec_2_10_10" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.9"; - sha256 = "0vbi07wpf7nvg2bxlp91gi7c7hkq29q8va83wawzlb0mzaxbsccl"; + version = "2.10.10"; + sha256 = "1903bm001vh9cxmhh87p3c76136dl6aq82srqgvdb5hpsmimwjws"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -151400,6 +151356,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hspec-api" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "hspec-api"; + version = "2.10.0"; + sha256 = "00yfz30qfzzgb95z6bpq8s65yigqq9zg0b8icpyjk03rff2s44ch"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -151516,7 +151485,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_9" = callPackage + "hspec-core_2_10_10" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -151525,8 +151494,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.9"; - sha256 = "1aby2axr9pqbb75va2n1szkl6jw402kin39xv2m8i6f14fy2hzpz"; + version = "2.10.10"; + sha256 = "1djmiy5xjnx71bjagmvipc5dsnvhakm03y72g3vyg7iggxqr6iv4"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -151607,14 +151576,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_9" = callPackage + "hspec-discover_2_10_10" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.9"; - sha256 = "16ahgiwgj1nkp0bhyvpvz5avaimigja0gz78576066rsgf6kcygj"; + version = "2.10.10"; + sha256 = "0cig2l1l8wgxrg2s2srzsrws5vqa0fgf249gb1g222x91s63h2d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -156098,6 +156067,8 @@ self: { pname = "hurl"; version = "2.3.0.0"; sha256 = "1kmgakji3mp3d1i1jm6w5yh412ajd42klikcz0q8f4q75zprmb6i"; + revision = "1"; + editedCabalFile = "0frzlrdkfb8n99rb9yjw853q14p00kimszz0indmxjmmzk7ciaaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158715,8 +158686,8 @@ self: { pname = "hyperloglog"; version = "0.4.6"; sha256 = "0zwg4dhgasa9sx7pbjjjb9kz2bnhb3r2daij2b572cszv65l91nv"; - revision = "1"; - editedCabalFile = "1vpzs2sj0p4y0dy88fvb0imfks84655ilw1n56dpkfz3kn4dqaq8"; + revision = "2"; + editedCabalFile = "0al93mhfhng8vwvhz8721gkzjjdblycpv4pi9lygbj8ay129djpr"; libraryHaskellDepends = [ approximate base binary bits bytes bytestring cereal cereal-vector comonad cpu deepseq distributive hashable lens reflection @@ -161653,29 +161624,19 @@ self: { license = lib.licenses.bsd2; }) {}; - "indexed-traversable-instances" = callPackage - ({ mkDerivation, base, containers, indexed-traversable, OneTuple - , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers, unordered-containers, vector - }: + "indexed-traversable_0_1_2_1" = callPackage + ({ mkDerivation, array, base, containers, transformers }: mkDerivation { - pname = "indexed-traversable-instances"; - version = "0.1.1.1"; - sha256 = "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9"; - libraryHaskellDepends = [ - base indexed-traversable OneTuple tagged unordered-containers - vector - ]; - testHaskellDepends = [ - base containers indexed-traversable OneTuple QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + pname = "indexed-traversable"; + version = "0.1.2.1"; + sha256 = "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; - "indexed-traversable-instances_0_1_1_2" = callPackage + "indexed-traversable-instances" = callPackage ({ mkDerivation, base, containers, indexed-traversable, OneTuple , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck , transformers, unordered-containers, vector @@ -161684,6 +161645,8 @@ self: { pname = "indexed-traversable-instances"; version = "0.1.1.2"; sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; + revision = "1"; + editedCabalFile = "1vyfs8xwxm2ipgiinzrp41pl0cy2xrmx7a9iim4vlz1sca1yv4xl"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -161695,7 +161658,6 @@ self: { ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indextype" = callPackage @@ -163841,30 +163803,6 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, hspec-discover, profunctors - , QuickCheck, StateVar, stm, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.6"; - sha256 = "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm"; - revision = "1"; - editedCabalFile = "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37"; - libraryHaskellDepends = [ - array base bifunctors comonad containers contravariant ghc-prim - profunctors StateVar stm tagged template-haskell th-abstraction - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell98 invariant functors"; - license = lib.licenses.bsd2; - }) {}; - - "invariant_0_6_1" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors , QuickCheck, StateVar, stm, tagged, template-haskell @@ -163884,7 +163822,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "inventory" = callPackage @@ -165059,26 +164996,21 @@ self: { }) {}; "iris" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, colourista - , directory, hspec, mtl, optparse-applicative, process, text - , unliftio-core + ({ mkDerivation, ansi-terminal, base, directory, hspec, mtl + , optparse-applicative, process, text, unliftio-core }: mkDerivation { pname = "iris"; - version = "0.0.0.0"; - sha256 = "15khmxdhc7mxlps2kgr82m29xy9b5nwcxsl3wfw6xiigjw1w2m0b"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.0"; + sha256 = "18nsmpka72597ipy3dijcbaqayykslwszv7ascp83gy7ppfx70l4"; libraryHaskellDepends = [ - ansi-terminal base bytestring directory mtl optparse-applicative - process text unliftio-core + ansi-terminal base directory mtl optparse-applicative process text + unliftio-core ]; - executableHaskellDepends = [ base colourista mtl ]; - testHaskellDepends = [ base hspec text ]; + testHaskellDepends = [ base hspec optparse-applicative text ]; description = "Haskell CLI framework"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - mainProgram = "iris-example"; broken = true; }) {}; @@ -166442,8 +166374,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.1.0"; - sha256 = "1qi494yn7krnrlq4g083zj1cw16qa9r1al9wqz4b42s33igiw2is"; + version = "0.1.2.0"; + sha256 = "1wc16b61vbvh2bigcva11qbjpqg7kwvzgc0znxzsilywrl3iv1nf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -170005,6 +169937,8 @@ self: { pname = "kan-extensions"; version = "5.2.5"; sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; + revision = "1"; + editedCabalFile = "1rbcmvgkw714v3296pdkpk7726ghc43czsaxm8ygvanshzd87qi2"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -171570,8 +171504,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "8"; - editedCabalFile = "1a8a51sz670cfh73q9l2dckfqgv59lpxk8dg5xd9fnvi2ba7wdf1"; + revision = "9"; + editedCabalFile = "17k52bhfyx2vpj6wpsmfjw9gbxwhc1zi1jq005lfa7hgc4ly5iw2"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -171699,8 +171633,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; - revision = "2"; - editedCabalFile = "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp"; + revision = "4"; + editedCabalFile = "16s7yj70fms01ab8x2f3262p576lwqdxlkq798qf9pjxfg95jvy9"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -171963,6 +171897,18 @@ self: { mainProgram = "kif-parser"; }) {}; + "kill-bool" = callPackage + ({ mkDerivation, base, hspec, hspec-core }: + mkDerivation { + pname = "kill-bool"; + version = "0.1.0.0"; + sha256 = "15ylnlwrh1fkkp6xsjqxm6plykrnr116n9j78mdm00jznp6a0ns6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Boolean strong typing"; + license = lib.licenses.isc; + }) {}; + "kind-apply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -175781,45 +175727,48 @@ self: { }) {}; "large-anon" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , ghc, ghc-tcplugin-api, hashable, large-generics, mtl, optics-core - , parsec, primitive, QuickCheck, record-dot-preprocessor - , record-hasfield, sop-core, syb, tagged, tasty, tasty-hunit - , tasty-quickcheck, text, typelet, validation-selective + ({ mkDerivation, aeson, aeson-pretty, arrows, base, bytestring + , containers, deepseq, fourmolu, ghc, ghc-tcplugin-api, hashable + , large-generics, mtl, optics-core, parsec, primitive, QuickCheck + , record-dot-preprocessor, record-hasfield, sop-core, Stream, syb + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, typelet + , validation-selective }: mkDerivation { pname = "large-anon"; - version = "0.1.1"; - sha256 = "15fgmh1nnm3xc04sw0gk7a456fa1j8gij8av4h22g98pp4dap4wb"; + version = "0.2"; + sha256 = "0ym7awxla6lq4gxx6j110cgc3mmfh286nhm7cis7vail8fzbqqf3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers ghc ghc-tcplugin-api hashable large-generics - mtl optics-core primitive record-hasfield sop-core syb tagged - typelet + aeson base containers deepseq ghc ghc-tcplugin-api hashable + large-generics mtl optics-core primitive record-hasfield sop-core + syb tagged typelet ]; + executableHaskellDepends = [ base fourmolu text ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring large-generics mtl optics-core - parsec QuickCheck record-dot-preprocessor record-hasfield sop-core - tasty tasty-hunit tasty-quickcheck text typelet - validation-selective + aeson aeson-pretty arrows base bytestring large-generics mtl + optics-core parsec QuickCheck record-dot-preprocessor + record-hasfield sop-core Stream tasty tasty-hunit tasty-quickcheck + text typelet validation-selective ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; "large-generics" = callPackage - ({ mkDerivation, aeson, base, generic-deriving, generics-sop - , microlens, mtl, primitive, QuickCheck, sop-core, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, base, deepseq, generic-deriving + , generics-sop, microlens, mtl, primitive, QuickCheck, sop-core + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "large-generics"; - version = "0.2.0.0"; - sha256 = "0pyydzwybccwaliajzaddgirrffv0sskkyf5zp84rs8kp2yqz9z1"; - revision = "1"; - editedCabalFile = "07hr73lv367ga0m3knrhwcafr6g7sa7p24689zfn4n1z4ja1cm8q"; + version = "0.2.1"; + sha256 = "0av3j1a1400fsvdmmfji358nknf54n7592fvlilm4kahm4grjl1z"; libraryHaskellDepends = [ - aeson base generics-sop primitive sop-core + aeson base deepseq generics-sop primitive sop-core ]; testHaskellDepends = [ aeson base generic-deriving generics-sop microlens mtl QuickCheck @@ -175869,11 +175818,12 @@ self: { }: mkDerivation { pname = "large-records"; - version = "0.3"; - sha256 = "1s11zk2bgi85q18hp01pkjvp8l3f1plb78cblyi4j0cvs6ra4q4w"; + version = "0.4"; + sha256 = "0g09ly8fck613lbs3g2w1slqrxp6fvvrn7i232w5g7nafgsdalfy"; libraryHaskellDepends = [ - base containers ghc large-generics mtl primitive record-hasfield - syb template-haskell transformers + base containers ghc large-generics mtl primitive + record-dot-preprocessor record-hasfield syb template-haskell + transformers ]; testHaskellDepends = [ base generic-deriving large-generics mtl newtype @@ -177526,6 +177476,8 @@ self: { pname = "lens"; version = "5.2.1"; sha256 = "0vr6wpq6g8cc24dqi5qzslhkkq1l99pzk8yd7vl3r2i5wyfw3l82"; + revision = "2"; + editedCabalFile = "0l64ydsqfla32xm3vwdjkyzn6f4cv7h68cxx3l0cpfrk61r9w3ra"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -177569,8 +177521,8 @@ self: { pname = "lens-action"; version = "0.2.6"; sha256 = "0cdprc5j6r976dmrga2zwvcr7qsv7nqy3nvncp66yyy0dk2qlwm3"; - revision = "1"; - editedCabalFile = "1nj5a48vpwdaq2vg0c5sniwnyw7ansvhvkvg163damg9cjzysji7"; + revision = "2"; + editedCabalFile = "0rrrv7k0fz98j99a6gzw858v5w3i378g0b7ijj30dz2am6p6rfnm"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids transformers @@ -178062,8 +178014,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.4.2"; - sha256 = "198ajay44aapyn8zw3416lhv7wdkb8p6y3a77w2m3p9ly9sj5hgc"; + version = "1.5.5.0"; + sha256 = "09qbaz4l6c77j427kfxyxvi68lgh1w2xxnp4cqbyhi39z38k3yl0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178145,8 +178097,8 @@ self: { }: mkDerivation { pname = "less-arbitrary"; - version = "0.1.7.0"; - sha256 = "0j1qnd3qz6kiivhmbs5a4hnw1wm13q794s7b5rrin62x8dz7kcp0"; + version = "0.1.8.0"; + sha256 = "0kq8i39pm1by83q3qaqrdjcisrnf4bgwvzp9j0h6zskpjbvba85v"; libraryHaskellDepends = [ base containers email-validate generic-arbitrary genvalidity genvalidity-hspec genvalidity-property hashable hspec mtl @@ -179331,8 +179283,8 @@ self: { }: mkDerivation { pname = "libsodium"; - version = "1.0.18.2"; - sha256 = "021167kkpii8szx32m5ljgmy5vhvhdijasnz350b14wr047n5iww"; + version = "1.0.18.3"; + sha256 = "0kc5g0yi1c8vvd5v3w73pmxsgc47q1lm1g4cd239354dj33wg46s"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ libsodium ]; libraryToolDepends = [ c2hs ]; @@ -179757,8 +179709,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; - revision = "3"; - editedCabalFile = "0birp7ibzvil7m9ra0ixgaz9z0liixbw9z1j22x4r8x5r6hyaqik"; + revision = "4"; + editedCabalFile = "07nf6d1fb0vc3fyldrgysmbc67hd94npp5f2hclrr3rhklfm7k91"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -180372,6 +180324,8 @@ self: { pname = "linear"; version = "1.22"; sha256 = "1ddr0c54kbi9bw7d62i6h3jiss3q0qmrdpkvckajz6qf5lwkxr6g"; + revision = "1"; + editedCabalFile = "1p94bq3pwqvj4qd1lp0w84k514xd9vib76gw0d16q1xh27c2sz4h"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -181370,8 +181324,8 @@ self: { ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-base"; - version = "4.15.0.0"; - sha256 = "1f1lqdd65a3z0by0i3dr51hahcsq8s3vcc0xyxlvb5pp3vsz89vm"; + version = "4.15.1.0"; + sha256 = "0mzv7l1w54wvwcqzy94kwlf6srh4vg1fi4lddm19ysrvfrw7r0pc"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; @@ -181386,8 +181340,8 @@ self: { }: mkDerivation { pname = "liquid-bytestring"; - version = "0.10.10.0"; - sha256 = "1fkl637zdxpsginnr0gqv68kch0dkr4yhmmmryzqy2h8fxm8gmg7"; + version = "0.10.12.1"; + sha256 = "0zzcbpsli9bcf94z42lg1yg1bkaa09vgpcbak0fq4fm9ws12yisf"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; @@ -181402,8 +181356,8 @@ self: { }: mkDerivation { pname = "liquid-containers"; - version = "0.6.2.1"; - sha256 = "07k9sg1q5xvsab2dvikkjb9rpx9rcabs4szm5rbh1m5mqnwivr1l"; + version = "0.6.4.1"; + sha256 = "0529qxvmipw6yd6v1p9vgkbk9al9cqcbwp71zzaxg9y22kkxly6a"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; @@ -181416,31 +181370,31 @@ self: { ({ mkDerivation, aeson, ansi-terminal, array, ascii-progress, async , attoparsec, base, binary, boxes, bytestring, cereal, cmdargs , containers, deepseq, directory, fgl, filepath, git, hashable - , intern, megaparsec, mtl, nettools, parallel, parser-combinators - , pretty, process, rest-rewrite, stm, store, syb, tasty + , intern, lens-family, megaparsec, mtl, nettools + , optparse-applicative, parallel, parser-combinators, pretty + , process, rest-rewrite, stm, store, syb, tagged, tasty , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-rerun, text - , transformers, unordered-containers, z3 + , transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "8.10.7"; - sha256 = "02zih8q3kv94s1l4m9d8f3d60idm1an23kxx0ahjfg8cdqgi3gym"; - revision = "1"; - editedCabalFile = "0ddqrx1ffihwmfw1jy9cycj253zq0f9f7n7xvwl6k07q58nadaf4"; + version = "0.9.0.2.1"; + sha256 = "1gq867m9b48381zi3m5xari9j34xva4gchajahbpi4fvy54gp6h3"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array ascii-progress async attoparsec base binary boxes bytestring cereal cmdargs containers deepseq directory - fgl filepath hashable intern megaparsec mtl parallel + fgl filepath hashable intern lens-family megaparsec mtl parallel parser-combinators pretty process rest-rewrite stm store syb text - transformers unordered-containers + transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers directory filepath hashable mtl process stm tasty - tasty-ant-xml tasty-hunit tasty-quickcheck tasty-rerun transformers + base containers directory filepath hashable mtl + optparse-applicative process stm tagged tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-rerun text transformers unordered-containers ]; testSystemDepends = [ git nettools z3 ]; @@ -181456,8 +181410,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-ghc-prim"; - version = "0.7.0"; - sha256 = "0pyhdg0fcvg0hm6m541hkr9spl3mghf9s4nkl62vi0hfwp1gd5bb"; + version = "0.7.0.1"; + sha256 = "1a9k21krk2b32cmw6b193794wsh5kmpb3d0bvrrkyl0pbvz5jrg2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ ghc-prim liquidhaskell ]; @@ -181471,8 +181425,8 @@ self: { }: mkDerivation { pname = "liquid-parallel"; - version = "3.2.2.0"; - sha256 = "0dg0k1lx74p3lj3vc43wypy5a3lpnww5w456ccp4xy3k83b3c4xd"; + version = "3.2.2.0.1"; + sha256 = "0c9qf1achk9n6l6rlncsm7harmdxph90by61lmjk3fw251c9ib03"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; @@ -181482,18 +181436,18 @@ self: { }) {}; "liquid-platform" = callPackage - ({ mkDerivation, cmdargs, liquid-base, liquid-bytestring + ({ mkDerivation, cmdargs, filepath, liquid-base, liquid-bytestring , liquid-containers, liquid-prelude, liquid-vector, liquidhaskell , process }: mkDerivation { pname = "liquid-platform"; - version = "0.8.10.2"; - sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf"; + version = "0.9.0.2"; + sha256 = "1y2vwjs00k786diwmzljrzwaj3nnmsm4kysq49hdzl9vkfx8nvca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - cmdargs liquid-base liquid-bytestring liquid-containers + cmdargs filepath liquid-base liquid-bytestring liquid-containers liquid-prelude liquid-vector liquidhaskell process ]; description = "A battery-included platform for LiquidHaskell"; @@ -181508,8 +181462,8 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.8.10.2"; - sha256 = "0s52kd2x4h24j6z7cjkrarnqr7kp198qal55y84740rllskv3ijh"; + version = "0.9.0.2"; + sha256 = "176iwwsnx80x716qym2i6hjyq7v38lq2nkwnmhdb1v3c5wrp4z67"; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring containers liquid-base liquidhaskell @@ -181523,8 +181477,8 @@ self: { ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: mkDerivation { pname = "liquid-vector"; - version = "0.12.1.2"; - sha256 = "1kpa7c5a774ixqky3msp2xnq1nl16hh95azvaxdk0bhizfi3zjy3"; + version = "0.12.3.1"; + sha256 = "15v4prdf35b11iym05dmr3n58i260zk69yzf31cha7rqbgr5lhd7"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; @@ -183326,8 +183280,8 @@ self: { pname = "log-domain"; version = "0.13.2"; sha256 = "0i4fx9k8cwjvmj0pgfnbici1b68zmif1jmmqxplpjqy32ksnyifa"; - revision = "1"; - editedCabalFile = "0nbfbp7a6x3vppavra7pf28l2wwlci3qgps60igqgjkbdcvq7w8c"; + revision = "2"; + editedCabalFile = "1hddf1q0gvpx7ic0qynjl9nk9g37kjh352yfk5axi36k49zfpw8d"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable semigroupoids semigroups vector @@ -184223,10 +184177,8 @@ self: { ({ mkDerivation, base, integer-gmp }: mkDerivation { pname = "long-double"; - version = "0.1.1"; - sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g"; - revision = "2"; - editedCabalFile = "0lnzxn18rwpw7idc4pkpn0y4nhlvfxjcnxylgs8il394rig6idxh"; + version = "0.1.1.1"; + sha256 = "0xq2f0ziinlw1drgg3q6p7303rkzbasc9jwrz8lgjfl3wv24qk8l"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; @@ -186171,8 +186123,8 @@ self: { pname = "machines"; version = "0.7.3"; sha256 = "1cmflvd0xphs15ip61347ph9w4hnhmsa4nlp425i53x1ld99l23c"; - revision = "1"; - editedCabalFile = "00mp54mb9br390cnk3i60j4i2byp625swjcnq92csxscj86i0awd"; + revision = "2"; + editedCabalFile = "13msrrbravjx51j40jn5namgbkfc44dv565ry5pdb5l389gzfl1k"; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed profunctors semigroupoids semigroups transformers @@ -189674,8 +189626,8 @@ self: { }: mkDerivation { pname = "mealy"; - version = "0.4.0"; - sha256 = "06pl768xlg0jiqjs1m79zhdqk29sdh1jmcywdn7whq1sxwc5hlhn"; + version = "0.4.1"; + sha256 = "1qr3pbskcsk8hpw8fb39hcqq9ms7a01cvk44bh1fg35cy826hdhv"; libraryHaskellDepends = [ adjunctions base containers mwc-probability numhask numhask-array optics-core primitive profunctors tdigest text vector @@ -190714,6 +190666,18 @@ self: { mainProgram = "memscript"; }) {}; + "memzero" = callPackage + ({ mkDerivation, base, safe-exceptions, transformers }: + mkDerivation { + pname = "memzero"; + version = "0.1"; + sha256 = "15ipi1vxd8gq8w8qb1cdpkmkj41clk70pyl5r6pkzaq46ap7y9fx"; + libraryHaskellDepends = [ base safe-exceptions ]; + testHaskellDepends = [ base safe-exceptions transformers ]; + description = "Securely erase memory contents by writing zeros to it"; + license = lib.licenses.asl20; + }) {}; + "menoh" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , filepath, JuicyPixels, menoh, monad-control, optparse-applicative @@ -195082,6 +195046,8 @@ self: { pname = "monad-logger"; version = "0.3.39"; sha256 = "19992zh63axs0q86fgznk04dan8h3hbs72cjp1s3yynsgl23pwnk"; + revision = "1"; + editedCabalFile = "0nj4qpmp6i5lmfbk7f1shljx8g2062fq6y857y4f9avp1cb9zm7d"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -196506,6 +196472,18 @@ self: { license = lib.licenses.mit; }) {}; + "monocypher" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "monocypher"; + version = "4.0.0.1"; + sha256 = "1hcmzr6px8kmdv63gg1d34vvgprzzj3dlf26hv010xc872qwfiiy"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Low level bindings to the monocypher C library"; + license = "(CC0-1.0 OR BSD-2-Clause)"; + }) {}; + "monoid" = callPackage ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { @@ -196632,15 +196610,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "monoid-subclasses_1_2_1" = callPackage + "monoid-subclasses_1_2_2" = callPackage ({ mkDerivation, base, bytestring, commutative-semigroups , containers, primes, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, vector }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.1"; - sha256 = "10q71zpj2q81q4dpb9mmsds0jwhcvlxqdgxk0kjiqf8i78qy54hn"; + version = "1.2.2"; + sha256 = "190cbknmcbjq3z3cx67nas6khb062zbh04ngnv6jkf7vrd31lyv2"; libraryHaskellDepends = [ base bytestring commutative-semigroups containers primes text vector @@ -196775,8 +196753,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.2.6"; - sha256 = "048zic4pkgdcrawg9npj8jdbd38d3qal45gdb6abxmcjqi5zapsg"; + version = "0.0.3.1"; + sha256 = "1fqm2cwgfs477bj83hcknbbyf7lrsk17ka6i0n11p6bxi9dg1mq1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -203666,8 +203644,8 @@ self: { }: mkDerivation { pname = "network"; - version = "3.1.2.7"; - sha256 = "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz"; + version = "3.1.2.8"; + sha256 = "08kqgiz5gvq5v22j8kzpicncb7mf555cc12hfmv4r67icnqd9qpx"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -205047,12 +205025,12 @@ self: { }) {}; "newline" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "newline"; - version = "0.0.1.0"; - sha256 = "1lnrcpbj5sqgqxg41hf3ppj4dz77jh978acni7ni1wqd3yycgh68"; - libraryHaskellDepends = [ base text ]; + version = "0.0.2.1"; + sha256 = "127fh7axlkkkg0zb83ah4xh7539xvj4ch4f9gyd0bynnirzy11d4"; + libraryHaskellDepends = [ base bytestring text ]; description = "newline specifications as values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -205684,8 +205662,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.21"; - sha256 = "1i4n706nrrd0mk34wrjgg597gsd95xslg8aqrhp3ijh4j4h2b8n2"; + version = "0.2.22"; + sha256 = "1np4n7fz6lg0dqxa1x8ksy9q2lkrrzg8182rd6mig2xy0dxa493s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -207962,8 +207940,8 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; - revision = "5"; - editedCabalFile = "005n9ax9dkkcqx9qm5kbga1a69rf78zqf3ld486136379h6qdi0h"; + revision = "6"; + editedCabalFile = "091gsnl0r7y25qb13r28ak39rz10p6ym3qvqdv24y3naxiplw8sq"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework @@ -208122,8 +208100,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.10.1.0"; - sha256 = "1zxp98svs872qpc0d8pycdbnf47phw4xbrvpi4vrzwyri5wahsxb"; + version = "0.10.1.1"; + sha256 = "1ar1qd75kxswwj8vkdxnixakw9hcj38jpxjjknfa9k27457aky2b"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "A numeric class hierarchy"; @@ -208131,15 +208109,17 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, distributive, numhask, vector + ({ mkDerivation, adjunctions, base, distributive, numhask + , QuickCheck, vector }: mkDerivation { pname = "numhask-array"; - version = "0.10.1"; - sha256 = "0c8zvlx5w6zjjxcnsc6jl7pbmfr1p4823jpcyzvx72kzzms16x5b"; + version = "0.10.2"; + sha256 = "09g8kfv5p82g50qag2n9hswf3wc8xjdbg6b8pgw32ywxa4yjgxd3"; libraryHaskellDepends = [ adjunctions base distributive numhask vector ]; + testHaskellDepends = [ base QuickCheck ]; description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; }) {}; @@ -208234,16 +208214,18 @@ self: { "numhask-space" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive - , numhask, random, semigroupoids, tdigest, text, time, vector + , numhask, QuickCheck, random, semigroupoids, tdigest, text, time + , vector }: mkDerivation { pname = "numhask-space"; - version = "0.10.0.0"; - sha256 = "09x53pmn2skbv1zhjmd4wq5wxhi7sshzg3ksjx1n0fy0x16d19lf"; + version = "0.10.0.1"; + sha256 = "04y849c5ghji734k98jbmf6dc4pmwx4ny73r493rwjcbdy31bscm"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector ]; + testHaskellDepends = [ base QuickCheck ]; description = "Numerical spaces"; license = lib.licenses.bsd3; }) {}; @@ -214317,7 +214299,7 @@ self: { ]; }) {}; - "pandoc_3_1" = callPackage + "pandoc_3_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -214335,8 +214317,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1"; - sha256 = "1dwnlvkisqr7lz6rnm89lh5dkg14kzd3bshqyvzg7c31gh45cygr"; + version = "3.1.1"; + sha256 = "0dw52slj7j1fxby9laj51hywi9bzd48fnj08k300pcal5ah5rgyq"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -219326,13 +219308,13 @@ self: { "perf" = callPackage ({ mkDerivation, base, containers, deepseq, formatn, gauge, mtl - , numhask-space, optparse-applicative, rdtsc, recursion-schemes - , text, time, vector + , numhask-space, optparse-applicative, QuickCheck, rdtsc + , recursion-schemes, text, time, vector }: mkDerivation { pname = "perf"; - version = "0.10.1"; - sha256 = "0r103y4xkl99ypiq3ps9cfplfpkd4lbs5w5cf6my2fpcza259zv2"; + version = "0.10.2"; + sha256 = "1ihqqpcvcl0aws3z9mxnz5gv8ghc4h3k0hr0v18x23z9d4x51487"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219342,6 +219324,7 @@ self: { executableHaskellDepends = [ base containers deepseq formatn gauge mtl optparse-applicative text ]; + testHaskellDepends = [ base QuickCheck ]; description = "Low-level run time measurement"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -219827,7 +219810,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_4_4" = callPackage + "persistent_2_14_5_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -219838,8 +219821,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.4.4"; - sha256 = "10i75da5rd5ydg17x93i3jkfx51cywxn37l4km1lr9p35lzhyfa3"; + version = "2.14.5.0"; + sha256 = "1vj67j2r1wc26fz1zk1l0f2b41bkazcz3f509amanmhjwwiqlq84"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers deepseq fast-logger http-api-data lift-type @@ -220155,8 +220138,8 @@ self: { pname = "persistent-mongoDB"; version = "2.13.0.1"; sha256 = "1ck74kpzkz623c43qb8r1cjq8chi2p721vx95zrpciz8jm496235"; - revision = "2"; - editedCabalFile = "169wvga2zkgq0znvpnmpcyz0wy92sspjsrg48vyj2fr58yvvhbz5"; + revision = "3"; + editedCabalFile = "163c5q6fwnp96y952qq5ya26z64lr6abblmpxfqxcsalfcgx3rad"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -220325,8 +220308,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.5.1"; - sha256 = "1snvzm01qgyiz3y12pzyy4phxwqpr7c47fi395w3cnl915y9i8rp"; + version = "2.13.5.2"; + sha256 = "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221249,6 +221232,71 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "phladiprelio-general-shared" = callPackage + ({ mkDerivation, base, phonetic-languages-phonetics-basics }: + mkDerivation { + pname = "phladiprelio-general-shared"; + version = "0.1.0.0"; + sha256 = "08k08584ylmfflrv3wsm00j8gcd3mj8lkqpp2mw3mv0x0bdb7hmb"; + libraryHaskellDepends = [ + base phonetic-languages-phonetics-basics + ]; + description = "A shared by different general implementations of the PhLADiPreLiO functionality"; + license = lib.licenses.mit; + }) {}; + + "phladiprelio-general-simple" = callPackage + ({ mkDerivation, base, cli-arguments, phladiprelio-general-shared + , phonetic-languages-phonetics-basics, rhythmic-sequences + }: + mkDerivation { + pname = "phladiprelio-general-simple"; + version = "0.1.1.0"; + sha256 = "0qz5f5w5fih0wc2d9dw29wya2vy8lfb02zhah26sh1x7w7bc9bih"; + libraryHaskellDepends = [ + base cli-arguments phladiprelio-general-shared + phonetic-languages-phonetics-basics rhythmic-sequences + ]; + description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms"; + license = lib.licenses.mit; + }) {}; + + "phladiprelio-ukrainian-shared" = callPackage + ({ mkDerivation, base, directory, mmsyn2-array + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phladiprelio-ukrainian-shared"; + version = "0.1.0.0"; + sha256 = "1k3a70ncffww0p78siikznwiwk7lbcdywyhdfl7si5i6g8g20p1g"; + libraryHaskellDepends = [ + base directory mmsyn2-array ukrainian-phonetics-basic-array + ]; + description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality"; + license = lib.licenses.mit; + }) {}; + + "phladiprelio-ukrainian-simple" = callPackage + ({ mkDerivation, base, cli-arguments, phladiprelio-ukrainian-shared + , phonetic-languages-ukrainian-array, rhythmic-sequences + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phladiprelio-ukrainian-simple"; + version = "0.1.2.0"; + sha256 = "1agbsxxg5zp6gsvqknl09vhapwbf2gl4cf7fpxxnsx6qyd4s1zig"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cli-arguments phladiprelio-ukrainian-shared + phonetic-languages-ukrainian-array rhythmic-sequences + ukrainian-phonetics-basic-array + ]; + description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes"; + license = lib.licenses.mit; + mainProgram = "phladiprelioUkr"; + }) {}; + "phoityne" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, conduit , conduit-extra, ConfigFile, containers, directory, filepath, gtk3 @@ -221676,8 +221724,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.5.1.0"; - sha256 = "0mgkgqf3rjjdrz85qxdjz6b0ivgc9h4k06gj5wnv3nbfjk5wpndk"; + version = "0.6.1.0"; + sha256 = "0cawd0193axygxs8sd85z2ljp32n4mhp2p8n71hv97932wdlnhvg"; libraryHaskellDepends = [ base heaps phonetic-languages-simplified-properties-array phonetic-languages-ukrainian-array ukrainian-phonetics-basic-array @@ -221725,8 +221773,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.5.1.0"; - sha256 = "0mdsn3clb422r02y87ix6bphggvg8m2yacar5y4ipj0vq2ky2m4a"; + version = "0.6.0.0"; + sha256 = "0qx0kym5ynbsc673kfjygy7vip6l4vqvhy7f74aw0ghlb04vcaap"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics phonetic-languages-simplified-generalized-properties-array @@ -221737,17 +221785,19 @@ self: { }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage - ({ mkDerivation, base, lists-flines, mmsyn2-array - , phonetic-languages-basis, phonetic-languages-phonetics-basics + ({ mkDerivation, base, lists-flines, logical-constraints + , mmsyn2-array, phonetic-languages-basis + , phonetic-languages-phonetics-basics , phonetic-languages-rhythmicity }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.12.0.0"; - sha256 = "14y4h8p43wrhxs110jn4idcvj441ai6qhhs86kfnhvrg3glw9nln"; + version = "0.13.0.0"; + sha256 = "11vqamjjy7vzfsx6j434yfk66jfkdydmvn86fhx9siyyggldmv7g"; libraryHaskellDepends = [ - base lists-flines mmsyn2-array phonetic-languages-basis - phonetic-languages-phonetics-basics phonetic-languages-rhythmicity + base lists-flines logical-constraints mmsyn2-array + phonetic-languages-basis phonetic-languages-phonetics-basics + phonetic-languages-rhythmicity ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; @@ -224077,6 +224127,8 @@ self: { pname = "pixiv"; version = "0.1.1"; sha256 = "1mzcnm1y0fsx66lk09j49mdw9hv4l0zsq4wqi9jcamr0jf5ffq0y"; + revision = "1"; + editedCabalFile = "0zfjbyqvh4azhcrmc8vwkyjq7qnqy4gpm0qp29fv0p5zhmqbn4ay"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash-md5 exceptions filepath http-client http-client-tls lens monad-control mtl process @@ -225208,6 +225260,8 @@ self: { pname = "pointed"; version = "5.0.4"; sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; + revision = "1"; + editedCabalFile = "14w5w6z2zk494mz5h1bm21a5rj8wlkyy37vi944ix4r7nrylv8bl"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -225927,6 +225981,51 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-account" = callPackage + ({ mkDerivation, base, chronos, elocrypt, password, polysemy + , polysemy-db, polysemy-plugin, prelate, random, servant-auth, sqel + }: + mkDerivation { + pname = "polysemy-account"; + version = "0.2.0.0"; + sha256 = "0j2b8jvjlqfmzajy2dq637xrznclk1zk5q7pv9yv17nni5hshg15"; + libraryHaskellDepends = [ + base chronos elocrypt password polysemy polysemy-db polysemy-plugin + prelate random servant-auth sqel + ]; + description = "Account management with Servant and Polysemy"; + license = "BSD-2-Clause-Patent"; + }) {}; + + "polysemy-account-api" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, exon, fast-logger + , http-types, jose, polysemy, polysemy-account, polysemy-conc + , polysemy-db, polysemy-hasql, polysemy-hasql-test, polysemy-plugin + , polysemy-test, prelate, servant, servant-auth + , servant-auth-server, servant-server, sqel, tasty, transformers + , uuid, wai, wai-extra, warp, zeugma + }: + mkDerivation { + pname = "polysemy-account-api"; + version = "0.2.0.0"; + sha256 = "08vnyagjgg0bj5d8zpkp5y76kn31nyx6381p9p7f93w8rf5fxp8n"; + libraryHaskellDepends = [ + aeson base exon fast-logger jose polysemy polysemy-account + polysemy-conc polysemy-db polysemy-hasql polysemy-plugin prelate + servant servant-auth servant-auth-server servant-server sqel + transformers uuid wai wai-extra warp + ]; + testHaskellDepends = [ + aeson base case-insensitive exon http-types polysemy + polysemy-account polysemy-db polysemy-hasql polysemy-hasql-test + polysemy-plugin polysemy-test prelate servant-auth + servant-auth-server servant-server sqel tasty uuid wai wai-extra + zeugma + ]; + description = "Account management with Servant and Polysemy"; + license = "BSD-2-Clause-Patent"; + }) {}; + "polysemy-check" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , kind-generics, kind-generics-th, polysemy, polysemy-plugin @@ -225992,6 +226091,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-db" = callPackage + ({ mkDerivation, base, exon, polysemy, polysemy-plugin, prelate + , random, sqel, uuid + }: + mkDerivation { + pname = "polysemy-db"; + version = "0.0.1.0"; + sha256 = "07xdkcb57l55ghkz4bgkwvl52fsi5qximx4zczp6gq1z3c831ih4"; + libraryHaskellDepends = [ + base exon polysemy polysemy-plugin prelate random sqel uuid + ]; + description = "Polysemy effects for databases"; + license = "BSD-2-Clause-Patent"; + }) {}; + "polysemy-extra" = callPackage ({ mkDerivation, base, containers, polysemy, polysemy-kvstore }: mkDerivation { @@ -226037,6 +226151,52 @@ self: { license = lib.licenses.mit; }) {}; + "polysemy-hasql" = callPackage + ({ mkDerivation, aeson, async, base, containers, exon, generics-sop + , hasql, hedgehog, polysemy, polysemy-db, polysemy-plugin + , polysemy-test, postgresql-libpq, prelate, sqel, stm-chans, tasty + , torsor, transformers, uuid, vector, zeugma + }: + mkDerivation { + pname = "polysemy-hasql"; + version = "0.0.1.0"; + sha256 = "1w408gjyjarbrlw0sibwzkv580awqxvg0zsb7c9r67cys4nv9zvp"; + libraryHaskellDepends = [ + async base containers exon generics-sop hasql polysemy polysemy-db + polysemy-plugin postgresql-libpq prelate sqel stm-chans torsor + transformers uuid + ]; + testHaskellDepends = [ + aeson base exon generics-sop hasql hedgehog polysemy polysemy-db + polysemy-plugin polysemy-test prelate sqel tasty uuid vector zeugma + ]; + description = "Polysemy effects for databases"; + license = "BSD-2-Clause-Patent"; + }) {}; + + "polysemy-hasql-test" = callPackage + ({ mkDerivation, aeson, base, chronos, exon, first-class-families + , generics-sop, hasql, hedgehog, path, polysemy, polysemy-db + , polysemy-hasql, polysemy-plugin, polysemy-test, prelate, sqel + , tasty, uuid + }: + mkDerivation { + pname = "polysemy-hasql-test"; + version = "0.0.1.0"; + sha256 = "0j4p3s13vgc92jbr83aybw2lbngk1qdswkfv317b14h9kv71d543"; + libraryHaskellDepends = [ + base hasql hedgehog path polysemy polysemy-db polysemy-hasql + polysemy-plugin polysemy-test prelate sqel uuid + ]; + testHaskellDepends = [ + aeson base chronos exon first-class-families generics-sop hasql + path polysemy polysemy-db polysemy-hasql polysemy-plugin + polysemy-test prelate sqel tasty + ]; + description = "Test utilities for polysemy-hasql"; + license = "BSD-2-Clause-Patent"; + }) {}; + "polysemy-http" = callPackage ({ mkDerivation, aeson, base, case-insensitive, exon, hedgehog , http-client, http-client-tls, http-types, network, polysemy @@ -226917,6 +227077,18 @@ self: { broken = true; }) {}; + "poolboy" = callPackage + ({ mkDerivation, base, hspec, hspec-core, safe-exceptions, stm }: + mkDerivation { + pname = "poolboy"; + version = "0.1.0.0"; + sha256 = "08p71z7apr1gb9q3bavwq9qvfddga5lny13kpll0x3ivncd0cvi5"; + libraryHaskellDepends = [ base safe-exceptions stm ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Simple work queue for bounded concurrency"; + license = lib.licenses.isc; + }) {}; + "pooled-io" = callPackage ({ mkDerivation, base, concurrent-split, containers, deepseq , transformers, unsafe, utility-ht @@ -227246,8 +227418,8 @@ self: { pname = "portray"; version = "0.3.0"; sha256 = "059lyc5p7726y9yj7c3by854czhbiwspgrgiqa6qp22pfbx2ycqn"; - revision = "1"; - editedCabalFile = "06bdmmfxav5ah20bdj09rbgvk4ncjicx1r48m3l9xjcczbm28y5m"; + revision = "2"; + editedCabalFile = "0yrkndi02ad65ag6q8753kjfraw2sx3pcm94fh5ivrydgnddlz6z"; libraryHaskellDepends = [ base bytestring containers text wrapped ]; @@ -227265,8 +227437,8 @@ self: { pname = "portray-diff"; version = "0.1.1"; sha256 = "1z09bs62hh9hsf88qkbsqp3ydxr66jdpbp9s8c7d142vcinmi3wm"; - revision = "1"; - editedCabalFile = "1p5ks82k2q59z20kc8nk5aj8n7isjnf0wc07lqv1djlalb3cwwy3"; + revision = "2"; + editedCabalFile = "0578hfn6fjjj7iywbicz9vi7aw9si8drmjgbqh79rcv65igjxy5b"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; @@ -227281,8 +227453,8 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; - revision = "5"; - editedCabalFile = "0yz9jfxsrnb5hb694bjgxc7gwl1dw2m54qnm9z9js51fc1kk2ppa"; + revision = "6"; + editedCabalFile = "1ch6icy7m7z7mmr42s7lih99vkgjdy2y78fy19fsgmrafiglp79c"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; @@ -227296,8 +227468,8 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; - revision = "4"; - editedCabalFile = "1jy6qviv8phj2dr79bkrqsaal1xb940hzhynq84vbkgk2szlcwqr"; + revision = "5"; + editedCabalFile = "0v31pb94cn8i5lazmhnzmlaqz73n7sracpjr6dqlijn85nfrzkia"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; @@ -227313,8 +227485,8 @@ self: { pname = "portray-pretty"; version = "0.1.0.3"; sha256 = "08gf384mqsxblxzmhr6ipskvipgbdgx72s3nmdhsld53spg5zhd5"; - revision = "1"; - editedCabalFile = "03r638j282ldxzkpw07l7cnp4kxwh3325bcljkn96hs1l6vy5q4j"; + revision = "2"; + editedCabalFile = "1mfpx3j543i1j7v1kf186r40jg0w4vqs5n29wrnpvl3v8x08jqsv"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework @@ -227333,8 +227505,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.1"; sha256 = "0dzhzrv6xq67sbf6ivisghlx4pq53h3qh859ai5rs6cikg6xfb7b"; - revision = "1"; - editedCabalFile = "1jz8jpi4in8znsgzcb9kcgv2zgrw2v99zkb311wjwrzk7vgjm9b7"; + revision = "2"; + editedCabalFile = "0ys9fxiw0gmg42hy5iqmhjkpkn4mhs1afmwvgqypq4v9w4bdak8s"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -227454,8 +227626,8 @@ self: { }: mkDerivation { pname = "posit"; - version = "3.2.0.4"; - sha256 = "1nr8269q2zqmsvb7zbv8ab56n52ag2q6gdj2mfpn2zn971z5bghs"; + version = "3.2.0.5"; + sha256 = "0xz8njcwjkazd6ap9a0aqgy0ilrpwnclwzy7715c2ngr17w426bw"; libraryHaskellDepends = [ base data-dword deepseq scientific ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base vector weigh ]; @@ -229606,8 +229778,8 @@ self: { }: mkDerivation { pname = "prelate"; - version = "0.5.0.0"; - sha256 = "0cg8qb6p52milhlh7l41y4fsl2jbkzmnv35ri7j13pniv48p3dkk"; + version = "0.5.1.0"; + sha256 = "1hrak2qylnd6dgla0zs9623qnlcyz7lm5mkiw6nqqzh66zn4yxqc"; libraryHaskellDepends = [ aeson base exon extra generic-lens incipit microlens microlens-ghc polysemy-chronos polysemy-conc polysemy-log polysemy-process @@ -231954,8 +232126,8 @@ self: { pname = "profunctors"; version = "5.6.2"; sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; - revision = "2"; - editedCabalFile = "1dhg8bys9qnfbvhy4cm4fivanmnik4rg0spshkwyp9s3j88qadix"; + revision = "3"; + editedCabalFile = "0y2g5dhmvkbd8zsckpgxd1g4hr3g56g0iqi6crjjc8wqd12bly71"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -234497,8 +234669,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.7"; - sha256 = "1krjkgmxpfqf5a1jqs7qbg6r7ball1464zw6vgrdfzl9057c6l4f"; + version = "0.15.8"; + sha256 = "1h5d5hjc9hrlk718lf62qzaq1l6ppr0l2b3fl78csyh86cihh750"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236509,32 +236681,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, data-fix, hashable, integer-logarithms, old-time - , OneTuple, primitive, QuickCheck, scientific, splitmix, strict - , tagged, text, text-short, these, time, time-compat, transformers - , transformers-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.28"; - sha256 = "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4"; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers data-fix hashable - integer-logarithms old-time OneTuple primitive QuickCheck - scientific splitmix strict tagged text text-short these time - time-compat transformers transformers-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - base containers primitive QuickCheck tagged uuid-types - ]; - benchmarkHaskellDepends = [ base bytestring QuickCheck ]; - description = "Common quickcheck instances"; - license = lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_29_1" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-array-byte, data-fix, hashable , integer-logarithms, old-time, OneTuple, primitive, QuickCheck @@ -236560,7 +236706,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -236604,8 +236749,8 @@ self: { }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.0.0.1"; - sha256 = "1x1jza5s1v89ik0h5m3kla5qwgh05j5dbd7f2m2miwyy1b75bqly"; + version = "0.1.0.0"; + sha256 = "19q4h9s1m72vd0yrk7a9ikjik17hcrcnpgy461zw2zkijg68a0sm"; libraryHaskellDepends = [ base containers monoid-subclasses pretty-show QuickCheck quickcheck-classes quickcheck-instances semigroupoids @@ -240558,7 +240703,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_18" = callPackage + "rebase_1_19" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -240567,8 +240712,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.18"; - sha256 = "07i5kkzwlgbdz1xikhn9smmv3ac65z3xzs1wflxrbf6v9fa77s5y"; + version = "1.19"; + sha256 = "02yvxdvjwb3dlwwb85i0sbadfjqxyv86pxkzylxidpw5qxb2g0ji"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -240689,8 +240834,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.15"; - sha256 = "0avdisbl1faqpny1r6ljm5gb8xz1yghmls7pgs2nshjkxd94i761"; + version = "0.2.16"; + sha256 = "100s5gkpgpcbi5397bbcp10jw1n5i9aniqc8bzk632ihlrip21ic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -240924,23 +241069,6 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, data-fix - , free, HUnit, template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "recursion-schemes"; - version = "5.2.2.3"; - sha256 = "04233y5qw7vm0kyh4h44zpfk2zsd6kz9081ngvi098y0xiphrwm9"; - libraryHaskellDepends = [ - base base-orphans comonad containers data-fix free template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Representing common recursion patterns as higher-order functions"; - license = lib.licenses.bsd2; - }) {}; - - "recursion-schemes_5_2_2_4" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, data-fix , free, HUnit, template-haskell, th-abstraction, transformers }: @@ -240948,6 +241076,8 @@ self: { pname = "recursion-schemes"; version = "5.2.2.4"; sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; + revision = "1"; + editedCabalFile = "1sb3pc1z40ss6rmiqifhcawiw1qdxc1mahcbwgfsfvpxlbmzlrrb"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -240955,7 +241085,6 @@ self: { testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "recursion-schemes-ext" = callPackage @@ -241412,8 +241541,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "2"; - editedCabalFile = "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb"; + revision = "3"; + editedCabalFile = "00xd4pyg0p4z0alyg1zy193jc3smq50y73dkafiphd73rzszxy9g"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -241690,23 +241819,6 @@ self: { }) {}; "reflection" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-discover - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "reflection"; - version = "2.1.6"; - sha256 = "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz"; - revision = "1"; - editedCabalFile = "1bnpkfmagii4mc8258yjy4f4lykflmljkqcifnxpfqv99bszw6pl"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Reifies arbitrary terms into types that can be reflected back into terms"; - license = lib.licenses.bsd3; - }) {}; - - "reflection_2_1_7" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , QuickCheck, template-haskell }: @@ -241719,7 +241831,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reifies arbitrary terms into types that can be reflected back into terms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflection-extras" = callPackage @@ -245563,12 +245674,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_18" = callPackage + "rerebase_1_19" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.18"; - sha256 = "1y5xklpm2l92wfa1h4h5s78hks36n79b1ncvr46ljf545gywmp4m"; + version = "1.19"; + sha256 = "0lb84apgwxswx4y1k3n9l335qzzby96mcpsjlzfw116b3ayd3123"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -247137,8 +247248,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rhythmic-sequences"; - version = "0.1.3.0"; - sha256 = "1m74z445zjfimc8b7ga9y1jyp8v2hrirpd2ynh89dz6iwxbbkq5k"; + version = "0.2.1.0"; + sha256 = "0jgnz69h1xbv6dqgqnx71cslbs4g453n9gffvsdpqf4vhbacbzws"; libraryHaskellDepends = [ base ]; description = "Library to deal with rhythmicity of short sequences"; license = lib.licenses.mit; @@ -248009,8 +248120,8 @@ self: { pname = "rle"; version = "0.1.0.1"; sha256 = "05rbhm0lxrq7vdbq9s0q21m0f0hlzmknljmampcmdjnwbl4nvf3d"; - revision = "4"; - editedCabalFile = "10spdlsywcfljy0fxygd3ny0bw8g6icny9ymcbyvmvpihswqz7wi"; + revision = "5"; + editedCabalFile = "15y82cbg9pk9pf7jwiqi83gici1y6619vb67bbp8vkds40nnvrrx"; libraryHaskellDepends = [ base cereal deepseq portray portray-diff wrapped ]; @@ -250193,10 +250304,8 @@ self: { }: mkDerivation { pname = "rustls"; - version = "0.0.0.0"; - sha256 = "1j7qxmapz9znmbd02359qxbsh1pkprzcg2jjpsz80kfyb6bjj766"; - revision = "1"; - editedCabalFile = "18jh00sbyixqjm2y6048f83qpqq4jlbzrik5i62is93rmn4pnnc2"; + version = "0.0.1.0"; + sha256 = "0dx5swy6s2rsgb3ahpzwscmw9i50mnvmch0vxvirbi70inalvnj5"; libraryHaskellDepends = [ base bytestring derive-storable derive-storable-plugin network resourcet text transformers @@ -253150,8 +253259,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "4"; - editedCabalFile = "0667wh94s1sibpp7i7gkcys4b2lc6mwyza11ijaqbbv2gw51liap"; + revision = "5"; + editedCabalFile = "149d776lnss2ggsv3qpsdbx1vvi57m2q2401d19k8fln0s8i1n16"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -255005,12 +255114,14 @@ self: { license = lib.licenses.mit; }) {}; - "selective_0_6" = callPackage + "selective_0_7" = callPackage ({ mkDerivation, base, containers, QuickCheck, transformers }: mkDerivation { pname = "selective"; - version = "0.6"; - sha256 = "0fkwlrydg2whz54l816ayj4szg3m2nkkxq191dlqw9vwn4rjwx0q"; + version = "0.7"; + sha256 = "0dhwfhfp57fmg86h5hkizchnk94zdgbpxxfv0r3xp65a7aq546fg"; + revision = "1"; + editedCabalFile = "0ibky7kzs4rc0dz1m2116fb6q4ziwrb49vjbhfy6ns1qb205ag8f"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers QuickCheck transformers ]; description = "Selective applicative functors"; @@ -255311,6 +255422,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "semigroupoids_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, foldable1-classes-compat + , hashable, tagged, template-haskell, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "6"; + sha256 = "1rwnckhmn3h4rws3lps5kgy6dv3raqf08jk7hlbv7468kcbx3amn"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive foldable1-classes-compat hashable tagged + template-haskell transformers transformers-compat + unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -256084,8 +256216,8 @@ self: { pname = "serialise"; version = "0.2.6.0"; sha256 = "05m5h5vfjp4wvh6y7j2f3d4c3l6gxww2n1v38vqrjacpw641izwk"; - revision = "1"; - editedCabalFile = "0rlsi4jq2d1dak2fps5flcn27lywjlhvsi0x2k2lvnjqawnfb3f9"; + revision = "2"; + editedCabalFile = "0ng4gjxwv2arm1ybqkfl66p1lmcwacym8ygi6nnkygysgchwqa3b"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -257265,8 +257397,8 @@ self: { pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; - revision = "5"; - editedCabalFile = "1qjj2v95k800j9w8drc4fjcbazzdh2f7dl7s99g9r48dg9dk5cfz"; + revision = "6"; + editedCabalFile = "1sds0r9g9fjvf4g8sfwkn80hbsy1pjc4wpbimrk4adb4584wlg1m"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -261701,10 +261833,8 @@ self: { }: mkDerivation { pname = "short-vec"; - version = "0.1.0.0"; - sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "8"; - editedCabalFile = "1wvgdav62yixqarv0vlgwhfry7w6vb5z9w9y5330nbf6f286fqfj"; + version = "0.1.0.1"; + sha256 = "0vgdfpj40zlg32hxpp66fl2fa2srqk30i61va49409s733hrbq8l"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -261735,8 +261865,8 @@ self: { pname = "short-vec-lens"; version = "0.1.0.0"; sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; - revision = "3"; - editedCabalFile = "0vk9nzhk7bipvd09ww7j79xxkjffddprhgdybd8ins8fg6rcxlxx"; + revision = "4"; + editedCabalFile = "1aajdqvh7jb1rdf5j7p70z2v1n8mvdk78qyshv1v4632a91pi4rx"; libraryHaskellDepends = [ base fin-int indexed-traversable lens short-vec sint ]; @@ -263908,8 +264038,8 @@ self: { pname = "singleton-nats"; version = "0.4.6"; sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r"; - revision = "1"; - editedCabalFile = "0xgm43p5l9m80anc8qfxr9vdni3iphnkn8d3x3q6nqz7gjq5hypj"; + revision = "2"; + editedCabalFile = "044gxxa9j076p1g4vca4j8w5brx2qg5yqdvqjvmz6fv5kms4b8jd"; libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; @@ -263948,6 +264078,8 @@ self: { pname = "singletons"; version = "3.0.2"; sha256 = "10jy9phwx3gnl5dx6by7chsln1x3lizz2igi4m1qlhznkq9fws7m"; + revision = "1"; + editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; @@ -263979,15 +264111,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-base_3_1_1" = callPackage + "singletons-base_3_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty , tasty-golden, template-haskell, text, th-desugar, turtle }: mkDerivation { pname = "singletons-base"; - version = "3.1.1"; - sha256 = "0d32c1dmi8mlrli0927g3hy6gip4c9w0myza3x594nlb6cnwdj6f"; + version = "3.2"; + sha256 = "0m96dz9k5wls5m3vls65clws1yfd73skblv878yj06lw9nmwshy9"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -264057,14 +264189,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-th_3_1_1" = callPackage + "singletons-th_3_2" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.1.1"; - sha256 = "1bp9abhbk6ad27p0ksqx2nhrkp6r9dgx20dzyl3bq1zf6nz92ss6"; + version = "3.2"; + sha256 = "1r4m9h9wwq86lww3aq7jxzias78ix79kgnj24slaps848d7hhpkp"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -264130,8 +264262,8 @@ self: { pname = "sint"; version = "0.2.0"; sha256 = "108za6vamb75kd6s2m0iin1gk6b1azk11jzsj841r7j62rhjn1qx"; - revision = "3"; - editedCabalFile = "1jmy1na42y5mbq4gbk7bb2ny81si903l9wj4j0wvckbqllv3xqim"; + revision = "5"; + editedCabalFile = "0jwd4ky1ydfzrjb8h922v273mw0wpriacvsyqkcad5kmwysayjlw"; libraryHaskellDepends = [ base portray portray-diff ]; testHaskellDepends = [ base portray portray-diff QuickCheck test-framework @@ -264658,8 +264790,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.7"; - sha256 = "02yyiplcdjad3dzcv7x4npj5h93q756ck892kdhzdrm9qbr96z66"; + version = "1.0.8"; + sha256 = "09gn0bkia7rnhbbbh2a4qdbwmq1yjn67f8wfclv78fqia82b84yg"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -264902,8 +265034,8 @@ self: { ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { pname = "skylighting-lucid"; - version = "1.0.2"; - sha256 = "06gvc5d23aiah5yq4b9gks7x26iz6xcx0k4mfsmjv5v2ic2zrbzb"; + version = "1.0.3"; + sha256 = "04a0qh451nwkrmgi9a6vda0zpyq8q0jhm80ppfcyrdgr0wh7mhi6"; libraryHaskellDepends = [ base containers lucid skylighting-core text ]; @@ -268756,15 +268888,15 @@ self: { }) {}; "sorting-network" = callPackage - ({ mkDerivation, base, criterion, hspec, mwc-random, QuickCheck - , template-haskell, vector + ({ mkDerivation, base, criterion, hspec, mwc-random, primitive + , QuickCheck, template-haskell, vector }: mkDerivation { pname = "sorting-network"; - version = "0.1.0.0"; - sha256 = "1rrihqjrj4jnh3950illxb6yva092cz86xkhmr5p34wzpbz1vrpx"; - libraryHaskellDepends = [ base template-haskell vector ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "0.2.1.0"; + sha256 = "1x4g4y4d1568v5fwz25r3n1ksagwrb56a57iy7ybp70b0v01c2cw"; + libraryHaskellDepends = [ base primitive template-haskell vector ]; + testHaskellDepends = [ base hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion mwc-random ]; description = "Sort small lists with sorting network"; license = lib.licenses.asl20; @@ -269518,6 +269650,25 @@ self: { }) {}; "spatial-math" = callPackage + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens + , linear, QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "spatial-math"; + version = "0.2.7.0"; + sha256 = "0n98mpcr4s1c1p00mn04m7izffphsgzja2mins0lzgcycgckc1m4"; + libraryHaskellDepends = [ + base binary cereal ghc-prim lens linear + ]; + testHaskellDepends = [ + base doctest QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "3d math including quaternions/euler angles/dcms and utility functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "spatial-math_0_5_0_1" = callPackage ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens , linear, QuickCheck, test-framework, test-framework-quickcheck2 , TypeCompose @@ -270616,6 +270767,33 @@ self: { broken = true; }) {}; + "sqel" = callPackage + ({ mkDerivation, aeson, base, chronos, composition, containers + , contravariant, exon, extra, first-class-families, generic-lens + , generics-sop, hasql, hedgehog, incipit-base, invariant, microlens + , path, path-io, prettyprinter, scientific, singletons + , singletons-base, some, tasty, tasty-hedgehog, template-haskell + , time, transformers, type-errors, uuid, vector + }: + mkDerivation { + pname = "sqel"; + version = "0.0.1.0"; + sha256 = "0793yqrbja3vwljrrlavz0ypv85d4vj2gw7crgchkzkg5qys8qnv"; + libraryHaskellDepends = [ + aeson base chronos composition containers contravariant exon extra + first-class-families generic-lens generics-sop hasql incipit-base + invariant microlens path path-io prettyprinter scientific + singletons singletons-base some template-haskell time transformers + type-errors uuid vector + ]; + testHaskellDepends = [ + base exon generics-sop hedgehog incipit-base microlens tasty + tasty-hedgehog + ]; + description = "Guided derivation for Hasql statements"; + license = "BSD-2-Clause-Patent"; + }) {}; + "sql-simple" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, text , transformers, transformers-base @@ -272542,13 +272720,13 @@ self: { , conduit, containers, envparse, errors, exceptions, extra , filepath, Glob, hspec, lens, lens-aeson, monad-logger, mtl , optparse-applicative, QuickCheck, resourcet, rio, semigroups - , text, time, unliftio, unliftio-core, unordered-containers, uuid - , yaml + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, uuid, yaml }: mkDerivation { pname = "stackctl"; - version = "1.4.0.0"; - sha256 = "1w435rqmgcfxqddjds8bgzkbily97ga6hjhs0cbk15yjm0xswv08"; + version = "1.4.0.1"; + sha256 = "01lm870d7xji00kk15r025hxpwldqc2l03xj09bclix75yq6fsvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272557,7 +272735,7 @@ self: { bytestring cfn-flip conduit containers envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl optparse-applicative QuickCheck resourcet rio semigroups text time - unliftio unliftio-core unordered-containers uuid yaml + transformers unliftio unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -273839,19 +274017,19 @@ self: { "stm-containers" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable - , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt - , transformers + , list-t, quickcheck-instances, rerebase, stm-hamt, tasty + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "stm-containers"; - version = "1.2"; - sha256 = "0yhpnxj7v880fy7vgjz5idpqfg2sm4dflp13k7fs0bqqlfv9hkbc"; + version = "1.2.0.2"; + sha256 = "191yh7whd9x6vjn58saac8nq6rsi7fjq147nbmfmn3kfnxqgabdd"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; testHaskellDepends = [ - deferred-folds focus foldl free HTF list-t QuickCheck - quickcheck-text rerebase + deferred-folds focus foldl free list-t quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Containers for STM"; license = lib.licenses.mit; @@ -275571,6 +275749,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "streams_3_3_2" = callPackage + ({ mkDerivation, adjunctions, base, boring, comonad, distributive + , semigroupoids + }: + mkDerivation { + pname = "streams"; + version = "3.3.2"; + sha256 = "0m3ilic3m1xb6sq8mp227jy75sxmla3gbdkxfh5mmf0lgsqvyh5d"; + libraryHaskellDepends = [ + adjunctions base boring comonad distributive semigroupoids + ]; + description = "Various Haskell 2010 stream comonads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streamt" = callPackage ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty , tasty-hunit @@ -277567,8 +277761,8 @@ self: { pname = "successors"; version = "0.1.0.3"; sha256 = "15pydjb9f7ycjclv5qq0ll8iaf8vpb6241ja858vkkfpz4rsciyv"; - revision = "1"; - editedCabalFile = "10vsqfgpzrc1mr27956s0r84hy37vz2dvq7klskn74qisnhv52kz"; + revision = "2"; + editedCabalFile = "1w1k6rj9rpnx3ykkfm7k3pk87v5v77ah04rgq31cgxfzdnirik9y"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; @@ -278222,10 +278416,8 @@ self: { ({ mkDerivation, base, supply-chain-core }: mkDerivation { pname = "supply-chain"; - version = "0.0.0.1"; - sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; - revision = "1"; - editedCabalFile = "1nnc5k8fp5bd5na9sd9qk5cbra2zjjmddxcn4qs1ahw4lxfy9gxx"; + version = "0.0.1.0"; + sha256 = "0awmvfk9nx5bazgq76l4x6f0xh3paijmjp58bn4b00fv5ps0wkgr"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; @@ -278251,8 +278443,8 @@ self: { pname = "supply-next"; version = "0.0.1.2"; sha256 = "110j4ppkw155hdlz00wbzc9z3m0mqf4dl6pqcaigcqg624m0ppqk"; - revision = "2"; - editedCabalFile = "1amw867flf8260zmrr0wyd50mri60641smqdb1blmc0knwdydlqd"; + revision = "4"; + editedCabalFile = "02hbwyfw1lzcxgp8qh9fv07k9q0frc1inz1y6dd8gw021vr92n58"; libraryHaskellDepends = [ base gambler integer-types quaalude supply-chain transformers ]; @@ -278950,6 +279142,33 @@ self: { mainProgram = "Swish"; }) {}; + "swish_0_10_4_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, polyparse, semigroups + , test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.4.0"; + sha256 = "0p5xs17lzgsqgwnpglqav89ysnaagz532lz279cr7pyl3i5z2zdw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "Swish"; + }) {}; + "swiss" = callPackage ({ mkDerivation, base, bytestring, parallel, time }: mkDerivation { @@ -281555,6 +281774,8 @@ self: { pname = "tagged-transformer"; version = "0.8.2"; sha256 = "10wlwqxzm1xdyzxl6xyfsrb40zmvh7g0y3w0a69b1lw2rp6v4vyy"; + revision = "1"; + editedCabalFile = "01x7c98ag7wnmgyz7zkzz5109fp15v03lbkybp87x1zxlwh1rqg1"; libraryHaskellDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged @@ -282495,8 +282716,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.6.0.4"; - sha256 = "0m6h0ra868n7azxdj00sbhv2i9r5wr5rs10cyrzda7ss5n94aq8v"; + version = "0.6.0.5"; + sha256 = "1xyf6dd5npiypp6z7zs31vc9bsid4jm12lh4p415909vwfyp1c04"; libraryHaskellDepends = [ aeson base bytestring containers process random text time uuid ]; @@ -284190,7 +284411,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "telegram-bot-simple_0_10" = callPackage + "telegram-bot-simple_0_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant @@ -284200,8 +284421,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.10"; - sha256 = "1xkmmcxnv052hfc0bwr3w6ilrf173npdpc0v5pwrhkz0kd88xxvh"; + version = "0.11"; + sha256 = "0fsyd21dcbf5nx1a7pavl678yfnwkhy6502f88zl0sp7xpz8x38h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285777,6 +285998,8 @@ self: { pname = "test-framework-th-prime"; version = "0.0.10"; sha256 = "1x3iq4dqbnhb96rfzs7awdk5v2arr3fi3jgkkhnn4vjz43ixygg8"; + revision = "1"; + editedCabalFile = "0fhr4i69yb2d1rw7fg4q862x3s2f05q8kr3lvhx0zyijbs17g1vg"; libraryHaskellDepends = [ base cpphs haskell-src-exts template-haskell test-framework ]; @@ -287097,8 +287320,8 @@ self: { pname = "text-short"; version = "0.1.5"; sha256 = "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3"; - revision = "1"; - editedCabalFile = "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb"; + revision = "2"; + editedCabalFile = "0lkh1sl8vx11vjjkxs2fz3jmmw1fp1f2k74q2acz6nywi4ifp5n2"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -287121,8 +287344,10 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.10"; - sha256 = "1iq24lpy59c8wc62ss4bwsaks6wlcr73c8vdyd2xha2p4fswmfyf"; + version = "3.10.2"; + sha256 = "00vpyf753322fad02phkhc5njc3l2pnmw12lhyq67vganspsyd4w"; + revision = "2"; + editedCabalFile = "1scjd7gcl3kwv214hyyz6pppy8i46nigvy22945pi89n3ga0fqaz"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -287141,37 +287366,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show_3_10_1" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, QuickCheck, quickcheck-instances - , template-haskell, text, th-abstraction, th-lift, transformers - , transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.10.1"; - sha256 = "1big5iflll2zijzfvnlyni91ir157iwyq08kpmk96qsgwdmxdkca"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - template-haskell text th-abstraction th-lift transformers - transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -287183,8 +287377,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.4"; - sha256 = "154smhpc3l2h1iacdsywzirkv19w493yajhsiqg9pqmmiii7kwr5"; + version = "3.9.5"; + sha256 = "0i91yil7qlk0vv242prs178lvddzlzhh9d78lnmvyvalqrw7bib8"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -287665,6 +287859,8 @@ self: { pname = "th-compat"; version = "0.1.4"; sha256 = "1f5ssi24mnhmmi91dl5ddg2jwci6akwlznqggf56nyxl9b0pmyfq"; + revision = "2"; + editedCabalFile = "0c0p2qy78cwhdfw0hn8g16l5xidikdk5314gam4258pk7q47rbp5"; libraryHaskellDepends = [ base directory filepath template-haskell ]; @@ -287756,25 +287952,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_14" = callPackage + "th-desugar_1_15" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction - , th-lift, th-orphans, transformers-compat + , th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.14"; - sha256 = "1b57v15xx0z0xjlijv61dh07p6rvfkdpxnxiaaa1iv7zyg2x7cnz"; - revision = "2"; - editedCabalFile = "16i6x4w286mhhkxzjid5pfbnn51dzyxq6brawlppqb15qbnvs744"; + version = "1.15"; + sha256 = "167ybxp9233xlihmj28hmqmd82liyhjgl17310nn9bximgfjr7hp"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb - template-haskell th-abstraction th-lift th-orphans - transformers-compat + template-haskell th-abstraction th-orphans transformers-compat ]; testHaskellDepends = [ base containers hspec HUnit mtl syb template-haskell th-abstraction - th-lift th-orphans + th-orphans ]; description = "Functions to desugar Template Haskell"; license = lib.licenses.bsd3; @@ -288001,23 +288194,6 @@ self: { }) {}; "th-lift" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; - version = "0.8.2"; - sha256 = "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s"; - revision = "2"; - editedCabalFile = "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = lib.licenses.bsd3; - }) {}; - - "th-lift_0_8_3" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { @@ -288030,7 +288206,6 @@ self: { testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -288073,6 +288248,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; + revision = "1"; + editedCabalFile = "1lb3gi32gzy6ml8jxzyj6jp9gglgg2737aqc128gqz4g7wvbnasy"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -289290,17 +289467,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "tidal_1_9_3" = callPackage + "tidal_1_9_4" = callPackage ({ mkDerivation, base, bytestring, clock, colour, containers , criterion, deepseq, exceptions, hosc, microspec, mtl, network , parsec, primitive, random, text, tidal-link, transformers, weigh }: mkDerivation { pname = "tidal"; - version = "1.9.3"; - sha256 = "1p3k65rgxjv701nk30jqf614bk1zmblyq0vlishzza2cdld5rhbc"; - revision = "1"; - editedCabalFile = "0lxx3zb26winf19wl44bs4bqrac1r4yf1j5i77bhnqgwrap426j1"; + version = "1.9.4"; + sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -289588,8 +289763,8 @@ self: { pname = "time-compat"; version = "1.9.6.1"; sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; - revision = "4"; - editedCabalFile = "1n39yfk21xz8y1xvkh01651yysk2zp5qac22l5pq2hi7scczmxaw"; + revision = "5"; + editedCabalFile = "0ryv5p2hgq5a6iyvh2r30sdlr7jn70cw8ypw5sc0hwbb1pxf2kfx"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -296367,8 +296542,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "4"; - editedCabalFile = "0sajw67mmk5syhbrwx4bz82j5cjhm04n4kjl0pp3dnphxg1m5nbw"; + revision = "5"; + editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = lib.licenses.bsd3; @@ -297195,25 +297370,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.10.1"; - sha256 = "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_11_0" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -297230,7 +297386,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -297402,8 +297557,8 @@ self: { }: mkDerivation { pname = "typelet"; - version = "0.1.2"; - sha256 = "09vxpwiz3hf876a5ymwvcq2n5dcxkzpna5srdk817051m715ys99"; + version = "0.1.3"; + sha256 = "03igpnkrb5kxkjhlab8w6fpnbjv6xzc7mv8rczs1y8w3d7biz3r0"; libraryHaskellDepends = [ base containers ghc ghc-tcplugin-api ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; @@ -299309,25 +299464,31 @@ self: { }) {}; "uniform-algebras" = callPackage - ({ mkDerivation, base, numeric-prelude, test-invariant }: + ({ mkDerivation, base, extra, numeric-prelude, test-invariant }: mkDerivation { pname = "uniform-algebras"; - version = "0.1.3"; - sha256 = "0y5x89qkbmzda4xxmg9zdk573vjz89h8iqia8p555cmachf18lf7"; - libraryHaskellDepends = [ base numeric-prelude test-invariant ]; + version = "0.1.5.1"; + sha256 = "0z3kb1s02iqgwfax7mifb0xdd7ys1xin7fjzh0gpj5693yi0zcp6"; + libraryHaskellDepends = [ + base extra numeric-prelude test-invariant + ]; description = "Pointless functions and a simplistic zero and monoid"; license = lib.licenses.gpl2Only; }) {}; "uniform-error" = callPackage - ({ mkDerivation, base, HTF, safe, transformers, uniform-strings }: + ({ mkDerivation, base, data-default, HTF, safe, transformers + , uniform-strings + }: mkDerivation { pname = "uniform-error"; - version = "0.1.3.1"; - sha256 = "1gq3n9rjar3waddvs7w91y2wy2l2fqdqssd1bz2z2bvb27inggaf"; - libraryHaskellDepends = [ base safe transformers uniform-strings ]; + version = "0.1.5.1"; + sha256 = "0fj8p4s5np1irc7j7i39a1i8a94bp1cjf9nqng74x6nwj139hs4i"; + libraryHaskellDepends = [ + base data-default safe transformers uniform-strings + ]; testHaskellDepends = [ - base HTF safe transformers uniform-strings + base data-default HTF safe transformers uniform-strings ]; description = "Handling errors in the uniform framework"; license = lib.licenses.gpl2Only; @@ -299341,8 +299502,8 @@ self: { }: mkDerivation { pname = "uniform-fileio"; - version = "0.1.3"; - sha256 = "08drclzs1g7w2cqsa16izs2nxa4pdkz5v1c2qbkwl03in9ga9v1v"; + version = "0.1.5.1"; + sha256 = "1y92wxzgnj25v06mlx3a6dhkqxhbdr4d6dxa71n9g04zzcp2ghk6"; libraryHaskellDepends = [ base bytestring deepseq directory exceptions filepath monads-tf path path-io pipes pureMD5 safe text uniform-algebras uniform-error @@ -299401,8 +299562,8 @@ self: { }: mkDerivation { pname = "uniform-strings"; - version = "0.1.3.1"; - sha256 = "1bh0n41sn0sgss85r890n2lysnb33xkf1qqxhs9498pd7gjzk5q7"; + version = "0.1.5.1"; + sha256 = "0cqx5cd1cpkqnw2pka8znllwn7wsn42rjrd0zx00rbnzskpnidk9"; libraryHaskellDepends = [ base bytestring MissingH monads-tf network-uri pretty-show safe snap-core split text uniform-algebras @@ -299422,8 +299583,8 @@ self: { }: mkDerivation { pname = "uniform-time"; - version = "0.1.3"; - sha256 = "0lygmp71933gdnydqg6p8gdnwvzh25p8dkx3jwvc3c0nh4jb1j9d"; + version = "0.1.5.1"; + sha256 = "0ynw0aw1ipy5bxzlkarb999gw94aw6vp1ajmdn7bv43qk5yb8rlm"; libraryHaskellDepends = [ base convertible monads-tf time uniform-algebras uniform-error uniform-strings @@ -299438,8 +299599,8 @@ self: { }: mkDerivation { pname = "uniformBase"; - version = "0.1.4"; - sha256 = "1j2fra8p5svb2g9fl86innfghvkvcdqa7dy2w0nszi0lvn5hf86h"; + version = "0.1.5.1"; + sha256 = "0nxz5c28jjfnfcx4dwl1kk6vpkz1yzhhfxd73457xxfc3z7sfg82"; libraryHaskellDepends = [ base data-default uniform-algebras uniform-error uniform-fileio uniform-strings uniform-time @@ -300501,32 +300662,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck - , safe-exceptions, stm, time, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.23.0"; - sha256 = "1zg4ddi4z85550abw9ijycbbjg8ddig7r0vcma8ik03dxzga71id"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process - safe-exceptions stm time transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck safe-exceptions stm time transformers unix - unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process - safe-exceptions stm time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_24_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck , safe-exceptions, stm, time, transformers, unix, unliftio-core @@ -300550,7 +300685,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -300712,8 +300846,8 @@ self: { pname = "unordered-containers"; version = "0.2.19.1"; sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; - revision = "1"; - editedCabalFile = "0fcax3apnpxxy9maymclr6s2b4c28d3pkl3plbg0lv1mn0mh84fv"; + revision = "2"; + editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -303008,8 +303142,8 @@ self: { }: mkDerivation { pname = "validation-selective"; - version = "0.1.0.2"; - sha256 = "1gsvcm8gjp8kdfprd1i4h9si8f2ym1gj3hqfwz7x1ylsa8qxwvq1"; + version = "0.2.0.0"; + sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -303955,8 +304089,8 @@ self: { pname = "vector-algorithms"; version = "0.9.0.1"; sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "1"; - editedCabalFile = "1bma0m4g7770y4xnqsinspqkgf4swpdwddfbcby81szjxd8mik1l"; + revision = "2"; + editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -309113,8 +309247,8 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.10.0"; - sha256 = "02fm2bi0gd9nh9kp8a00d66b2g8fzgw9rjawydbifr0g3c3pv7v0"; + version = "0.10.1"; + sha256 = "13x2fjq9d6pg89gfc127ipjnkaxza5qbvrym5k5wwpcj11l94mac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310530,8 +310664,8 @@ self: { }: mkDerivation { pname = "weierstrass-functions"; - version = "0.1.0.0"; - sha256 = "03xh01zj60hhpq90amv1yml1cch38gni1zvgaji20wrhm17mjmpk"; + version = "0.1.1.0"; + sha256 = "06iv19jnpy6za5lbskv1d5xvaic89p2j27nk64zqbsr6syxkc0gx"; libraryHaskellDepends = [ base elliptic-integrals gamma jacobi-theta ]; @@ -311195,6 +311329,20 @@ self: { broken = true; }) {dnsapi = null;}; + "window-utils" = callPackage + ({ mkDerivation, base, bytestring, JuicyPixels, text, vector, X11 + }: + mkDerivation { + pname = "window-utils"; + version = "0.2.0.0"; + sha256 = "1m1yyk26rg0abjzzwc0cnv9i0w2m1hnpc57gc8vm270is3iassq5"; + libraryHaskellDepends = [ + base bytestring JuicyPixels text vector X11 + ]; + description = "OS window icon/name utilities"; + license = lib.licenses.bsd3; + }) {}; + "windowslive" = callPackage ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec , pretty, split, time, urlencoded @@ -311492,8 +311640,8 @@ self: { pname = "witherable"; version = "0.4.2"; sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; - revision = "3"; - editedCabalFile = "1f2bvl41by904lnr0dk6qgasqwadq2w48l7fj51bp2h8bqbkdjyc"; + revision = "4"; + editedCabalFile = "1f6kb8cslgqq4x3mbg1gcxfbd9qb5a8hmrv802mm7zzhbnridiff"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -312189,8 +312337,8 @@ self: { }: mkDerivation { pname = "wordpass"; - version = "1.0.0.10"; - sha256 = "1zq4h91pjk816r4ryvajgbk03wdp74f2nizgvyv3nnj50597wlzm"; + version = "1.0.0.11"; + sha256 = "0v277pp1vh8p7z7wkzqaskrqrbfxpnvish9nw3bkahrvkrr8p23l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312492,8 +312640,8 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; - revision = "4"; - editedCabalFile = "103b654pm0figxqjb6bchi975q2rf0r7y2zhygic86j2089k3fcl"; + revision = "5"; + editedCabalFile = "15h2s7flixws54mv8kxbl17jvp0qfqjflg0fn6iwb8yf4qn96pfa"; libraryHaskellDepends = [ base ]; description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; @@ -312621,8 +312769,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.3"; - sha256 = "0zv51048p0r7vhamml3ps9nr11yi9fxz2w31qcz053bw3z9ivwxw"; + version = "0.5.4.0"; + sha256 = "0wf4ia9zr6wmw9kvn5fhv3gr0h5247nz889j8rhamfgab9yn2a65"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -314405,8 +314553,8 @@ self: { }: mkDerivation { pname = "xml-conduit-selectors"; - version = "0.2.0.0"; - sha256 = "1h1gfnsrypy9w559rgbgabidzpaw580xy0m6l12bbcjc92kr3mf0"; + version = "0.2.0.2"; + sha256 = "1xps46nqi0g42b0hz703cdw98zy8phvzjhrg0i7ljh12sp4ijjnj"; libraryHaskellDepends = [ base containers megaparsec text xml-conduit ]; @@ -316671,15 +316819,15 @@ self: { "yaml-unscrambler" = callPackage ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time , base, base64-bytestring, bytestring, conduit, containers, foldl - , hashable, libyaml, mtl, neat-interpolation, QuickCheck - , quickcheck-instances, rerebase, scientific, selective, tasty - , tasty-hunit, tasty-quickcheck, text, text-builder-dev, time - , transformers, unordered-containers, uuid, vector, yaml + , hashable, libyaml, mtl, neat-interpolation, quickcheck-instances + , rerebase, scientific, selective, tasty, tasty-hunit, text + , text-builder-dev, time, transformers, unordered-containers, uuid + , vector, yaml }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.13"; - sha256 = "0c7cnxlx01xjr992z0150dl1lnlyj2gwrqza7yhgmn4m7wg6r5z1"; + version = "0.1.0.16"; + sha256 = "06swbd8zi2ykjkxyd6vqza028wqdl1w0rv5wh87pm6p95rklwbgw"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -316687,8 +316835,8 @@ self: { transformers unordered-containers uuid vector yaml ]; testHaskellDepends = [ - foldl neat-interpolation QuickCheck quickcheck-instances rerebase - tasty tasty-hunit tasty-quickcheck + foldl neat-interpolation quickcheck-instances rerebase tasty + tasty-hunit ]; description = "Flexible declarative YAML parsing toolkit"; license = lib.licenses.mit; @@ -320956,8 +321104,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.7"; - sha256 = "1ss7p1wzcxiap8zm3i6hqllkd0hkrp6bgk4magbaxpy7ic9kifb9"; + version = "1.0.8"; + sha256 = "1g1ikkwnybn02yfawfly9bgbfv4cx5ciqhq3xx3z023p4j1g7rcz"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -321228,6 +321376,23 @@ self: { broken = true; }) {}; + "zeugma" = callPackage + ({ mkDerivation, chronos, hedgehog, incipit, polysemy + , polysemy-chronos, polysemy-test, tasty, tasty-expected-failure + , tasty-hedgehog, unix + }: + mkDerivation { + pname = "zeugma"; + version = "0.7.0.0"; + sha256 = "1przsd9f0bhjygyczdlclpvw62a4hz1vq721fh2gq0ic8r3vs602"; + libraryHaskellDepends = [ + chronos hedgehog incipit polysemy polysemy-chronos polysemy-test + tasty tasty-expected-failure tasty-hedgehog unix + ]; + description = "Polysemy effects for testing"; + license = "BSD-2-Clause-Patent"; + }) {}; + "zifter" = callPackage ({ mkDerivation, ansi-terminal, async, base, colour, directory , exceptions, filepath, genvalidity, genvalidity-hspec @@ -321478,8 +321643,8 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.4.2.2"; - sha256 = "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4"; + version = "0.4.3"; + sha256 = "01ax0idyvggizbdbg38nynmm5dk53apsjbj2xaq8v11ry6h0y1b8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -321631,6 +321796,8 @@ self: { pname = "zippers"; version = "0.3.2"; sha256 = "0n85mnp3mv8qwk3wmmm2wpc3j2l4q2fb0gbzb5il3nrd0p42xjld"; + revision = "1"; + editedCabalFile = "1ppm6a56z7nr90q6ffffkvb2syfi9nlzi806g3r5z7dinn262gnc"; libraryHaskellDepends = [ base fail indexed-traversable lens profunctors semigroupoids semigroups @@ -322000,8 +322167,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.3.0"; - sha256 = "0hrsr8gnx4pjkkwyirfcfss2kvl3z5h55gfgs8ny10rj601aylhi"; + version = "0.2.4.0"; + sha256 = "1dvd7gwqqz1qdy0zxcad7485s6nx9s93wgpfz7r0q6g7s0wmff6r"; libraryHaskellDepends = [ base exceptions Z-Data ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; From 6e99f2eecc2d272292dc2aa28f376a13ddb3f29d Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 13 Mar 2023 20:32:49 +0200 Subject: [PATCH 04/84] cachix: remove no longer needed src override & patch The patch and overrides removed in this change were only needed temporarly to avoid waiting for a haskell-updates cycle. --- .../haskell-modules/configuration-common.nix | 6 ----- .../haskell-modules/configuration-nix.nix | 27 ++----------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f598758f4a0c..6cfa654f8c57 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1565,12 +1565,6 @@ self: super: { servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; hercules-ci-agent = lib.pipe super.hercules-ci-agent [ - (appendPatch (fetchpatch { - name = "hercules-ci-agent-support-cachix-1.3.patch"; - url = "https://github.com/hercules-ci/hercules-ci-agent/pull/500.diff"; - sha256 = "sha256-ErrFvzB1NiIJLpsP2wfx5CX8DnH1x5i/ijQZEeuOzeI="; - relative = "hercules-ci-agent"; - })) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0642f04e36a4..9d633d7a5297 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -878,34 +878,11 @@ self: super: builtins.intersectAttrs super { # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; - cachix = overrideCabal (drv: { - version = "1.3.1"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.3.1"; - sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU="; - }; - buildDepends = [ self.conduit-concurrent-map ]; - postUnpack = "sourceRoot=$sourceRoot/cachix"; - postPatch = '' - sed -i 's/1.3/1.3.1/' cachix.cabal - ''; - }) (super.cachix.override { + cachix = super.cachix.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; fsnotify = dontCheck super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; - }); - cachix-api = overrideCabal (drv: { - version = "1.3.1"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.3.1"; - sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix-api"; - }) super.cachix-api; + }; hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); From f7d99b7da8c3bc2f0f2568977bf29ed7bf37d1ff Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 13 Mar 2023 20:34:34 +0200 Subject: [PATCH 05/84] cachix,hercules-ci-{agent,cnix-expr,cnix-store}: bump nix pin to 2_14 --- 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 9d633d7a5297..6e0a74ff0e12 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -887,7 +887,7 @@ self: super: builtins.intersectAttrs super { hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: { - passthru.nixPackage = pkgs.nixVersions.nix_2_12; + passthru.nixPackage = pkgs.nixVersions.nix_2_14; }); # the testsuite fails because of not finding tsc without some help From 690740bd3b74919512fb964a28083af4a27471da Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 13 Mar 2023 21:04:19 +0200 Subject: [PATCH 06/84] haskellPackages.tomland: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6cfa654f8c57..07c8a65ed5a6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2488,4 +2488,8 @@ self: super: { # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 diagrams-gtk = doJailbreak super.diagrams-gtk; + + # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). + # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd + tomland = doJailbreak super.tomland; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 38d703bdb743363e57749c26e87e1008e9777a86 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 14 Mar 2023 13:43:01 +0100 Subject: [PATCH 07/84] haskellPackages.Cabal_3_10_1_0: build with matching of Cabal-syntax --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ pkgs/top-level/release-haskell.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 07c8a65ed5a6..762cc3b1005a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,6 +20,14 @@ with haskellLib; self: super: { + # Make sure that Cabal 3.10.* can be built as-is + Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_17_0; + })); + # cabal-install needs most recent versions of Cabal and Cabal-syntax, # so we need to put some extra work for non-latest GHCs inherit ( diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 8bd38359f911..e899b96ec8e1 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -382,6 +382,7 @@ let cabal-install = released; Cabal_3_6_3_0 = released; Cabal_3_8_1_0 = released; + Cabal_3_10_1_0 = released; cabal2nix = released; cabal2nix-unstable = released; funcmp = released; From e4f591eae9293974bf381caa0f6bc12bd328d86d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 14 Mar 2023 14:00:59 +0100 Subject: [PATCH 08/84] haskellPackages.Cabal{,-syntax}_3_8_1_0: keep Latest version is 3.10.1.0 now, but let's keep 3.8 around (for now at least). We will likely soon have moved a lot of stuff over to 3.10 though. --- .../haskell-modules/configuration-common.nix | 8 ++++ .../configuration-hackage2nix/main.yaml | 6 ++- .../haskell-modules/configuration-nix.nix | 8 ---- .../haskell-modules/hackage-packages.nix | 42 +++++++++++++++++++ 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 762cc3b1005a..a2f2fdd8e343 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,6 +20,14 @@ with haskellLib; self: super: { + # Make sure that Cabal 3.8.* can be built as-is + Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_17_0; + })); + # Make sure that Cabal 3.10.* can be built as-is Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_10_1_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f98916e76ccd..927da8121868 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -48,9 +48,11 @@ default-package-overrides: extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - - Cabal == 3.2.* # required for cabal-install etc. + - Cabal == 3.2.* # required for cabal2spec - Cabal == 3.4.* # required for cabal-install etc. - - Cabal == 3.6.* # required for cabal-install-parsers etc. + - Cabal == 3.6.* + - Cabal-syntax == 3.8.* # required for cabal-install{,-parsers} + - Cabal == 3.8.* # required for cabal-install{,-parsers} - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6e0a74ff0e12..9e1037bbf5ab 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1052,14 +1052,6 @@ self: super: builtins.intersectAttrs super { # Wants to execute cabal-install to (re-)build itself hint = dontCheck super.hint; - # Make sure that Cabal 3.8.* can be built as-is - Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_17_0; - })); - # cabal-install switched to build type simple in 3.2.0.0 # as a result, the cabal(1) man page is no longer installed # automatically. Instead we need to use the `cabal man` diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a33bd14bc037..5627680db392 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2903,6 +2903,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_8_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers + , deepseq, directory, filepath, mtl, parsec, pretty, process, text + , time, transformers, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.8.1.0"; + sha256 = "0236fddzhalsr2gjbjsk92rgh8866fks28r04g8fbmzkqbkcnr3l"; + revision = "2"; + editedCabalFile = "179y365wh9zgzkcn4n6m4vfsfy6vk4apajv8jpys057z3a71s4kp"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base bytestring Cabal-syntax containers deepseq directory + filepath mtl parsec pretty process text time transformers unix + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal_3_10_1_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text @@ -2961,6 +2983,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "Cabal-syntax_3_8_1_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, mtl, parsec, pretty, text, time + , transformers, unix + }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.8.1.0"; + sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07"; + revision = "3"; + editedCabalFile = "14zm8h7sfawysr9g37in8by8aj1p87fywj83hmshp8n6lrxr6bgd"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty text time transformers unix + ]; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-syntax_3_10_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time From 07673d91cddd437e602dd6dd5d1ba4f2c83e9711 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 17 Mar 2023 15:36:02 +0100 Subject: [PATCH 09/84] haskell.packages.ghc92.th-desugar: use stackage prescribed version --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 1 - 1 file changed, 1 deletion(-) 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 3efd37a7758e..0ca632378c9d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -60,7 +60,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - th-desugar = self.th-desugar_1_14; vector = dontCheck super.vector; # Apply patches from head.hackage. From 6dae8a83111e77b1d2cc2c902db059534eec035f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 17 Mar 2023 16:02:23 +0100 Subject: [PATCH 10/84] haskell.packages.ghc94.ghc-lib*: retain GHC 9.4 versions These were dropped by hackage2nix since the GHC 9.6 versions were uploaded to Hackage. --- .../configuration-hackage2nix/main.yaml | 4 +- .../haskell-modules/hackage-packages.nix | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 927da8121868..30d67e6aa747 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -78,11 +78,13 @@ extra-packages: - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 + - ghc-lib == 9.4.* # 2023-03-17: preserve for GHC 9.4 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 + - ghc-lib-parser == 9.4.* # 2023-03-17: preserve for GHC 9.4 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 + - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5627680db392..ea63984fb94d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111201,6 +111201,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_4_4_20221225" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.4.4.20221225"; + sha256 = "0cl2w63gafv64q8v4ymvwa79yxwx9jh285zr68qncchmm67cnzql"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts stm time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib_9_6_1_20230312" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser @@ -111263,6 +111285,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_4_4_20221225" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.4.4.20221225"; + sha256 = "0av5c7phk0lc8nnaacm5v0cah1hiihw3kqf7cavphhadw06dixk7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_6_1_20230312" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec @@ -111344,6 +111387,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.4.0.0"; + sha256 = "06qrfg4icp66lyhzncvsaqdcmsijayrlgi91x65a2nd2l0wz6gyf"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex_9_6_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate From eabab5397e8041c121c33cccb68d1556d3dda2e7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 17 Mar 2023 15:38:23 +0100 Subject: [PATCH 11/84] haskell.packages.ghc94.th-desugar: 1.14 -> 1.15 Also add override for GHC 9.6, 1.15 is the first version to support GHC 9.6. The override likely doesn't work yet, but is added in preparation. To make it compile, we need a matching version of th-abstraction. --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 3 ++- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e063268f9680..f6170a8b1974 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -131,7 +131,8 @@ in { syb = dontCheck super.syb; splitmix = doJailbreak super.splitmix; - th-desugar = self.th-desugar_1_14; + th-desugar = doDistribute self.th-desugar_1_15; + th-abstraction = doDistribute self.th-abstraction_0_5_0_0; time-compat = doJailbreak super.time-compat; tomland = doJailbreak super.tomland; type-equality = doJailbreak super.type-equality; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 7ac21dd5f3f1..86a29ff6746e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -47,4 +47,7 @@ self: super: { transformers = null; unix = null; xhtml = null; + + th-desugar = doDistribute self.th-desugar_1_15; + th-abstraction = doDistribute self.th-abstraction_0_5_0_0; } From a80731175fb8d424f62c23f76970fac395b337a3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 17 Mar 2023 16:05:49 +0100 Subject: [PATCH 12/84] haskellPackages.haskell-gi: drop obsolete override Stackage LTS has updated to 0.26.3 as well! --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a2f2fdd8e343..5ca06db84c24 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2251,11 +2251,6 @@ self: super: { # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; - # Temporarily upgrade haskell-gi until stackage advances - # Fixes build of gi-harfbuzz with harfbuzz >= 7.0 - # https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362 - haskell-gi = doDistribute self.haskell-gi_0_26_3; - # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; hasura-ekg-core = doJailbreak super.hasura-ekg-core; From beafc73774e756ccba5d3fc5baf2951e1de35300 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 17 Mar 2023 16:06:20 +0100 Subject: [PATCH 13/84] haskellPackages.hspec*: reflect 2.10.9 -> 2.10.10 --- .../haskell-modules/configuration-common.nix | 20 +++++++++---------- .../configuration-ghc-9.4.x.nix | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5ca06db84c24..ac5541c85af5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -855,12 +855,12 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_9; + hspec = self.hspec_2_10_10; hspec-wai = self.hspec-wai.override { - hspec = self.hspec_2_10_9; + hspec = self.hspec_2_10_10; }; hspec-contrib = self.hspec-contrib.override { - hspec-core = self.hspec-core_2_10_9; + hspec-core = self.hspec-core_2_10_10; }; fsnotify = self.fsnotify_0_4_1_0; }); @@ -1560,16 +1560,16 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_9 = doDistribute (super.hspec_2_10_9.override { - hspec-discover = self.hspec-discover_2_10_9; - hspec-core = self.hspec-core_2_10_9; + hspec_2_10_10 = doDistribute (super.hspec_2_10_10.override { + hspec-discover = self.hspec-discover_2_10_10; + hspec-core = self.hspec-core_2_10_10; }); - hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override { + hspec-discover_2_10_10 = doDistribute (super.hspec-discover_2_10_10.override { hspec-meta = self.hspec-meta_2_10_5; - }; - hspec-core_2_10_9 = super.hspec-core_2_10_9.override { + }); + hspec-core_2_10_10 = doDistribute (super.hspec-core_2_10_10.override { hspec-meta = self.hspec-meta_2_10_5; - }; + }); # Point hspec 2.7.10 to correct dependencies hspec_2_7_10 = super.hspec_2_7_10.override { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index f6170a8b1974..f4d255b5f9f9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -112,10 +112,10 @@ in { # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_9; - hspec-core = self.hspec-core_2_10_9; + hspec = self.hspec_2_10_10; + hspec-core = self.hspec-core_2_10_10; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_9; + hspec-discover = self.hspec-discover_2_10_10; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 From 1a9ab74f66ef1697e7e590c5eab4b941b4f8bfdf Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 17 Mar 2023 18:33:01 -0400 Subject: [PATCH 14/84] haskellPackages.haddock-cheatsheet: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a2f2fdd8e343..ad00f07e1bd5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -511,6 +511,10 @@ self: super: { rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 + # Package exists only to be example of documentation, yet it has restrictive + # "base" dependency. + haddock-cheatsheet = doJailbreak super.haddock-cheatsheet; + # no haddock since this is an umbrella package. cloud-haskell = dontHaddock super.cloud-haskell; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e224bfd4f54d..6d3403ef5db6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1942,7 +1942,6 @@ broken-packages: - hactor - hactors - haddock-api - - haddock-cheatsheet - haddock-leksah - haddock-test - hadoop-formats diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5627680db392..00f9ed3ab52d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -125182,8 +125182,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A documentation-only package exemplifying haddock markup features"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haddock-leksah" = callPackage From 3ce5834b3eed2fcd5bd291af62592d081aeb034f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 14:40:29 +0100 Subject: [PATCH 15/84] haskell.packages.ghc94.indexed-traversable*: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index f4d255b5f9f9..c4138809eb9f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -92,8 +92,6 @@ in { hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); - indexed-traversable = doJailbreak super.indexed-traversable; - indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; lzma-conduit = doJailbreak super.lzma-conduit; From 94b31d8f487bdc752e782a0378579907666d8b29 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 20:47:49 +0100 Subject: [PATCH 16/84] haskell.packages.ghc96.cabal-install: make work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forces us to get basic 9.6 support up (which was quite painful). Even more pain is waiting for us when trying to get cabal-install to build with GHCs < 9.6… --- .../haskell-modules/configuration-common.nix | 4 +- .../configuration-ghc-9.6.x.nix | 100 +++++++++++++++++- 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9ff3d18e8670..bae1be47cb0c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -43,8 +43,8 @@ self: super: { # !!! Use cself/csuper inside for the actual overrides cabalInstallOverlay = cself: csuper: lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { - Cabal = cself.Cabal_3_8_1_0; - Cabal-syntax = cself.Cabal-syntax_3_8_1_0; + Cabal = cself.Cabal_3_10_1_0; + Cabal-syntax = cself.Cabal-syntax_3_10_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # GHC 9.2.5 starts shipping 1.6.16.0 process = cself.process_1_6_17_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 86a29ff6746e..0d4f50fb189d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -1,10 +1,15 @@ { pkgs, haskellLib }: +with haskellLib; + let inherit (pkgs) lib; -in -with haskellLib; + jailbreakWhileRevision = rev: + overrideCabal (old: { + jailbreak = assert old.revision or "0" == toString rev; true; + }); +in self: super: { llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -48,6 +53,97 @@ self: super: { unix = null; xhtml = null; + # + # Version deviations from Stackage LTS + # + th-desugar = doDistribute self.th-desugar_1_15; th-abstraction = doDistribute self.th-abstraction_0_5_0_0; + tagged = doDistribute self.tagged_0_8_7; # allows template-haskell-2.20 + primitive = doDistribute (dontCheck self.primitive_0_7_4_0); # allows base >= 4.18 + indexed-traversable = doDistribute super.indexed-traversable_0_1_2_1; # allows base >= 4.18 + OneTuple = doDistribute (dontCheck super.OneTuple_0_4_1_1); # allows base >= 4.18 + inspection-testing = doDistribute self.inspection-testing_0_5_0_1; # allows base >= 4.18 + tasty-inspection-testing = doDistribute self.tasty-inspection-testing_0_2; + # Too strict bounds on ghc-prim and template-haskell + aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); + + # + # Too strict bounds without upstream fix + # + + # Forbids transformers >= 0.6 + quickcheck-classes-base = doJailbreak super.quickcheck-classes-base; + # Forbids base >= 4.18 + singleton-bool = doJailbreak super.singleton-bool; + # Forbids base >= 4.18 + unliftio-core = doJailbreak super.unliftio-core; + # Forbids mtl >= 2.3 + ChasingBottoms = doJailbreak super.ChasingBottoms; + # Forbids base >= 4.18 + cabal-install-solver = doJailbreak super.cabal-install-solver; + cabal-install = doJailbreak super.cabal-install; + # Forbids base >= 4.18 + lukko = doJailbreak super.lukko; + + # + # Too strict bounds, waiting on Hackage release in nixpkgs + # + + # base >= 4.18 is allowed in those newer versions + boring = assert !(self ? boring_0_2_1); doJailbreak super.boring; + some = assert !(self ? some_1_0_5); doJailbreak super.some; + assoc = assert !(self ? assoc_1_1); doJailbreak super.assoc; + these = assert !(self ? assoc_1_2); doJailbreak super.these; + # Temporarily upgrade manually until the attribute is available + doctest = doDistribute (overrideCabal { + version = "0.21.1"; + sha256 = "0vgl89p6iaj2mwnd1gkpq86q1g18shdcws0p3can25algi2sldk3"; + } super.doctest_0_21_0); + + # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6 + semigroupoids = doJailbreak super.semigroupoids; + # XXX: 1.3 supports 9.6 properly, but is intended for bifunctors >= 5.6 + semialign = doJailbreak super.semialign; + + # Not using latest vector version yet… + vector = doDistribute (overrideCabal { + jailbreak = true; + # vector-doctest seems to be broken when executed via ./Setup test + testTarget = lib.concatStringsSep " " [ + "vector-tests-O0" + "vector-tests-O2" + ]; + } super.vector); + + # + # Too strict bounds, waiting on Revision in nixpkgs + # + + # Revision 7 lifts the offending bound on ghc-prim + ed25519 = jailbreakWhileRevision 6 super.ed25519; + # Revision 6 lifts the offending bound on base + tar = jailbreakWhileRevision 5 super.tar; + # Revision 2 lifts the offending bound on base + HTTP = jailbreakWhileRevision 1 super.HTTP; + # Revision 1 lifts the offending bound on base + dec = jailbreakWhileRevision 0 super.dec; + # Revision 2 lifts the offending bound on base + cryptohash-sha256 = jailbreakWhileRevision 1 super.cryptohash-sha256; + # Revision 4 lifts offending template-haskell bound + uuid-types = jailbreakWhileRevision 3 super.uuid-types; + # Revision 1 lifts offending base bound + quickcheck-instances = jailbreakWhileRevision 0 super.quickcheck-instances; + # Revision 1 lifts offending base bound + generically = jailbreakWhileRevision 0 super.generically; + # Revision 3 lifts offending template-haskell bound + hackage-security = jailbreakWhileRevision 2 super.hackage-security; + + # + # Compilation failure workarounds + # + + # Test suite doesn't compile with base-4.18 / GHC 9.6 + # https://github.com/dreixel/syb/issues/40 + syb = dontCheck super.syb; } From a1c16a7909ed8ba0f224a3137ae111048c813987 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 20:49:42 +0100 Subject: [PATCH 17/84] haskell.packages.ghc94.generically: supply base-orphans base-orphans is required for building generically with generically >= 9.4 && < 9.6. --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index c4138809eb9f..46406bdb8f47 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -105,7 +105,9 @@ in { rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; shake-cabal = doDistribute self.shake-cabal_0_2_2_3; libmpd = doJailbreak super.libmpd; - base-orphans = dontCheck super.base-orphans; + # generically needs base-orphans for 9.4 only + base-orphans = dontCheck (doDistribute super.base-orphans); + generically = addBuildDepend self.base-orphans super.generically; # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned From 7be4e628555fe3ee4f45170a497a1d53e81adf9b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 20:50:31 +0100 Subject: [PATCH 18/84] release-haskell.nix: test weeder with GHC 9.4 --- pkgs/top-level/release-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index e899b96ec8e1..7293bd87890c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -423,6 +423,7 @@ let compilerNames.ghc925 compilerNames.ghc926 compilerNames.ghc927 + compilerNames.ghc944 ]; }) { From a50dd13c92035097bd4d6983c74e3f345fdc4834 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 21:02:18 +0100 Subject: [PATCH 19/84] haskell.packages.ghc94.aeson: drop obsolete jailbreak --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 46406bdb8f47..78c04beef7cd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -71,9 +71,7 @@ in { # Jailbreaks & Version Updates - # Jailbreak to allow quickcheck-instances-0.3.28 (too strict lower bound) - aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); - + aeson = doDistribute self.aeson_2_1_2_1; assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; From 8dda93a2ce7827e9868db12413b3a6d28048f5fa Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 21:04:22 +0100 Subject: [PATCH 20/84] haskell.packages.ghc96.ghc-lib*: pick appropriate versions --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 0d4f50fb189d..ef7c4c613911 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -68,6 +68,10 @@ self: super: { # Too strict bounds on ghc-prim and template-haskell aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); + ghc-lib = doDistribute self.ghc-lib_9_6_1_20230312; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_1_20230312; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_0; + # # Too strict bounds without upstream fix # From 84c43d4e70b4453b75de0743fc039ca38d2548a3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Mar 2023 21:07:20 +0100 Subject: [PATCH 21/84] release-haskell.nix: test GHC 9.6 package set --- pkgs/top-level/release-haskell.nix | 36 +++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7293bd87890c..108f03ac1219 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -55,6 +55,7 @@ let ghc926 ghc927 ghc944 + ghc961 ]; # packagePlatforms applied to `haskell.packages.*` @@ -383,16 +384,35 @@ let Cabal_3_6_3_0 = released; Cabal_3_8_1_0 = released; Cabal_3_10_1_0 = released; - cabal2nix = released; - cabal2nix-unstable = released; - funcmp = released; - haskell-language-server = builtins.filter (x: x != compilerNames.ghc884) released; - hoogle = released; - hlint = released; - hpack = released; + cabal2nix = lib.subtractLists [ + compilerNames.ghc961 + ] released; + cabal2nix-unstable = lib.subtractLists [ + compilerNames.ghc961 + ] released; + funcmp = lib.subtractLists [ + compilerNames.ghc961 + ] released; + haskell-language-server = lib.subtractLists [ + # Support ceased as of 1.9.0.0 + compilerNames.ghc884 + # https://github.com/haskell/haskell-language-server/issues/3502 + compilerNames.ghc961 + ] released; + hoogle = lib.subtractLists [ + compilerNames.ghc961 + ] released; + hlint = lib.subtractLists [ + compilerNames.ghc961 + ] released; + hpack = lib.subtractLists [ + compilerNames.ghc961 + ] released; hsdns = released; jailbreak-cabal = released; - language-nix = released; + language-nix = lib.subtractLists [ + compilerNames.ghc961 + ] released; nix-paths = released; titlecase = released; ghc-api-compat = [ From 4313c92b31fbd16549737111239873a525c5fdc9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Mar 2023 15:46:35 +0100 Subject: [PATCH 22/84] haskell.packages.ghc94.ghc: 9.4.2 -> 9.4.4 Due to a mistake in 9e8a48377099 the default 9.4 GHC versions wasn't properly adjusted for the package set. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7eda3c5ddca2..5941959a815b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -475,7 +475,7 @@ in { ghc = bh.compiler.ghc944; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = ghc942; + ghc94 = ghc944; ghc961 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc961; ghc = bh.compiler.ghc961; From f9e50cf70f32a1fe6729a75b2ac5b3c1a078bc0a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Mar 2023 15:50:26 +0100 Subject: [PATCH 23/84] haskell.packages.ghc94.cabal-install: make work This simply needs the override for Cabal, Cabal-syntax 3.10. All other core packages match the ones expected by cabal-install and friends. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bae1be47cb0c..d513772370ef 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -42,7 +42,7 @@ self: super: { let # !!! Use cself/csuper inside for the actual overrides cabalInstallOverlay = cself: csuper: - lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { + lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { Cabal = cself.Cabal_3_10_1_0; Cabal-syntax = cself.Cabal-syntax_3_10_1_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { From e09625fc2bb3688d0e6872330ce2953b00681e9f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Mar 2023 15:51:14 +0100 Subject: [PATCH 24/84] release-haskell.nix: test Cabal-syntax >= 3.8 as well --- pkgs/top-level/release-haskell.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 108f03ac1219..d95268142241 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -383,7 +383,9 @@ let cabal-install = released; Cabal_3_6_3_0 = released; Cabal_3_8_1_0 = released; + Cabal-syntax_3_8_1_0 = released; Cabal_3_10_1_0 = released; + Cabal-syntax_3_10_1_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc961 ] released; From f73d0e3084aa5b56ccdab416f61e008170e4aaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 20 Mar 2023 12:17:19 +0000 Subject: [PATCH 25/84] fix cachix build --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 094b9b5ed2ed..45cf4b5d4e92 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -103,6 +103,8 @@ in { rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; shake-cabal = doDistribute self.shake-cabal_0_2_2_3; libmpd = doJailbreak super.libmpd; + generics-sop = doJailbreak super.generics-sop; + microlens-th = doJailbreak super.microlens-th; # generically needs base-orphans for 9.4 only base-orphans = dontCheck (doDistribute super.base-orphans); generically = addBuildDepend self.base-orphans super.generically; From 600fd969f6d317524f4e859824f577663d795d15 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Mar 2023 13:53:35 +0100 Subject: [PATCH 26/84] haskell.packages.ghc94.weeder: don't test on aarch64 cborg does not compile with GHC >= 9.4 and aarch64 --- .../haskell-modules/configuration-ghc-9.4.x.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 45cf4b5d4e92..f9ce2a5165aa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -237,4 +237,14 @@ in { # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323. gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools; + # https://github.com/well-typed/cborg/pull/307 + # https://github.com/well-typed/cborg/pull/304 + # https://github.com/well-typed/cborg/issues/309#issuecomment-1471862045 + cborg = overrideCabal rec { + badPlatforms = lib.platforms.aarch64; + hydraPlatforms = lib.subtractLists badPlatforms lib.platforms.all; + } super.cborg; + weeder = overrideCabal { + inherit (self.cborg.meta) hydraPlatforms; + } super.weeder; } From 0cce97d64ecdd009381c4464d82a7cbd1f547068 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Mar 2023 14:14:41 +0100 Subject: [PATCH 27/84] haskell.packages.*.vector: clean up and unify overrides, run tests - The dontCheck overrides are not necessary completely. It seems that there is some kind of issue with the doctest suite, but we can run the other ones. - We need a jailbreak everywhere due to doctest (ironically), so we can move that into the common configuration. - The i686 issue has been closed upstream. Tested locally to confirm that it is indeed not a problem anymore. --- .../haskell-modules/configuration-common.nix | 13 +++++++++---- .../haskell-modules/configuration-ghc-8.8.x.nix | 3 --- .../haskell-modules/configuration-ghc-9.0.x.nix | 1 - .../haskell-modules/configuration-ghc-9.2.x.nix | 2 -- .../haskell-modules/configuration-ghc-9.4.x.nix | 1 - .../haskell-modules/configuration-ghc-9.6.x.nix | 10 ---------- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d513772370ef..fe3ba4f76781 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -78,6 +78,15 @@ self: super: { guardian ; + vector = overrideCabal (old: { + # Too strict bounds on doctest which isn't used, but is part of the configuration + jailbreak = true; + # vector-doctest seems to be broken when executed via ./Setup test + testTarget = lib.concatStringsSep " " [ + "vector-tests-O0" + "vector-tests-O2" + ]; + }) super.vector; # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; @@ -208,10 +217,6 @@ self: super: { pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli)); - # sse2 flag due to https://github.com/haskell/vector/issues/47. - # Jailbreak is necessary for QuickCheck dependency. - vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector); - inline-c-cpp = overrideCabal (drv: { patches = drv.patches or [] ++ [ (fetchpatch { 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 82e221af6c57..01cb34881516 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -118,9 +118,6 @@ self: super: { ormolu = super.ormolu_0_2_0_0; - # vector 0.12.2 indroduced doctest checks that don’t work on older compilers - vector = dontCheck super.vector; - ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); mime-string = disableOptimization super.mime-string; 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 3ed8d155e8e0..3c59f6b80d66 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -81,7 +81,6 @@ self: super: { tar = doJailbreak super.tar; time-compat = doJailbreak super.time-compat; tuple = addBuildDepend self.base-orphans super.tuple; - vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; 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 0ca632378c9d..0416124a6c31 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -60,8 +60,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - vector = dontCheck super.vector; - # Apply patches from head.hackage. language-haskell-extract = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index f9ce2a5165aa..a1c0c3e184dd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -137,7 +137,6 @@ in { tomland = doJailbreak super.tomland; type-equality = doJailbreak super.type-equality; unordered-containers = doJailbreak super.unordered-containers; - vector = dontCheck super.vector; vector-binary-instances = doJailbreak super.vector-binary-instances; hpack = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index ef7c4c613911..8ac5d1ee9f74 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -110,16 +110,6 @@ self: super: { # XXX: 1.3 supports 9.6 properly, but is intended for bifunctors >= 5.6 semialign = doJailbreak super.semialign; - # Not using latest vector version yet… - vector = doDistribute (overrideCabal { - jailbreak = true; - # vector-doctest seems to be broken when executed via ./Setup test - testTarget = lib.concatStringsSep " " [ - "vector-tests-O0" - "vector-tests-O2" - ]; - } super.vector); - # # Too strict bounds, waiting on Revision in nixpkgs # From 6634553e48f47185056d6646784a5f8fd329b1fe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Mar 2023 14:23:57 +0100 Subject: [PATCH 28/84] haskell.packages.ghc94.cborg: resolve duplicate overlay entry --- .../configuration-ghc-9.4.x.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index f9ce2a5165aa..f6582b9e2752 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -210,13 +210,6 @@ in { servant-client = doJailbreak super.servant-client; relude = doJailbreak super.relude; - cborg = appendPatch (pkgs.fetchpatch { - name = "cborg-support-ghc-9.4.patch"; - url = "https://github.com/well-typed/cborg/pull/304.diff"; - sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8="; - relative = "cborg"; - }) super.cborg; - # https://github.com/tweag/ormolu/issues/941 ormolu = doDistribute self.ormolu_0_5_3_0; fourmolu = overrideCabal (drv: { @@ -240,10 +233,18 @@ in { # https://github.com/well-typed/cborg/pull/307 # https://github.com/well-typed/cborg/pull/304 # https://github.com/well-typed/cborg/issues/309#issuecomment-1471862045 - cborg = overrideCabal rec { + cborg = overrideCabal (old: rec { + patches = old.patches or [] ++ [ + (pkgs.fetchpatch { + name = "cborg-support-ghc-9.4.patch"; + url = "https://github.com/well-typed/cborg/pull/304.diff"; + sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8="; + relative = "cborg"; + }) + ]; badPlatforms = lib.platforms.aarch64; hydraPlatforms = lib.subtractLists badPlatforms lib.platforms.all; - } super.cborg; + }) super.cborg; weeder = overrideCabal { inherit (self.cborg.meta) hydraPlatforms; } super.weeder; From 25ae2724974bca2b7d1ba0cb5772f57ac63673f7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Mar 2023 18:02:14 +0100 Subject: [PATCH 29/84] haskell.packages.ghc94.cborg: unrestrict platforms Revert "haskell.packages.ghc94.cborg: resolve duplicate overlay entry" This reverts commit 6634553e48f47185056d6646784a5f8fd329b1fe. Revert "haskell.packages.ghc94.weeder: don't test on aarch64" This reverts commit 600fd969f6d317524f4e859824f577663d795d15. Reason for reverts: https://github.com/NixOS/nixpkgs/pull/221688 applied a patch for the compilation failure we were seeing on aarch64. --- .../configuration-ghc-9.4.x.nix | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index f6582b9e2752..eb2fbf67a07b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -210,6 +210,14 @@ in { servant-client = doJailbreak super.servant-client; relude = doJailbreak super.relude; + # Fixes compilation failure with GHC >= 9.4 on aarch64-* due to an API change + cborg = appendPatch (pkgs.fetchpatch { + name = "cborg-support-ghc-9.4.patch"; + url = "https://github.com/well-typed/cborg/pull/304.diff"; + sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8="; + relative = "cborg"; + }) super.cborg; + # https://github.com/tweag/ormolu/issues/941 ormolu = doDistribute self.ormolu_0_5_3_0; fourmolu = overrideCabal (drv: { @@ -230,22 +238,4 @@ in { # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323. gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools; - # https://github.com/well-typed/cborg/pull/307 - # https://github.com/well-typed/cborg/pull/304 - # https://github.com/well-typed/cborg/issues/309#issuecomment-1471862045 - cborg = overrideCabal (old: rec { - patches = old.patches or [] ++ [ - (pkgs.fetchpatch { - name = "cborg-support-ghc-9.4.patch"; - url = "https://github.com/well-typed/cborg/pull/304.diff"; - sha256 = "sha256-W4HldlESKOVkTPhz9nkFrvbj9akCOtF1SbIt5eJqtj8="; - relative = "cborg"; - }) - ]; - badPlatforms = lib.platforms.aarch64; - hydraPlatforms = lib.subtractLists badPlatforms lib.platforms.all; - }) super.cborg; - weeder = overrideCabal { - inherit (self.cborg.meta) hydraPlatforms; - } super.weeder; } From 49d835a29f6b4f033aaa2a6fb303bda422e28650 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Mar 2023 19:02:59 +0100 Subject: [PATCH 30/84] haskell.packages.ghc92.cabal-install: get to work The directory >= 1.3.7.0 constraint proved to be a real troublemaker. Since directory is a core package other core packages frequently depend upon (as opposed to process) which tends to cause inconsistent dependency errors. To get it to work the following was done: - Use directory 1.3.7.1 to eliminate the need to also upgrade filepath and unix, saving a bit of trouble. This still forces us to recompile process every time directory is upgraded (i.e. GHC >= 9.2.5) even if the core package process version would match to prevent inconsistent dependencies. - Upgrade hspec to 2.10 where it no longer depends on ghc and ghc-boot-th which naturally causes inconsistent dependencies by depending on core packages, namely directory. --- .../haskell-modules/configuration-common.nix | 32 ++++++++++++++++--- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 13 ++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d513772370ef..b3c0567dfa00 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -45,9 +45,31 @@ self: super: { lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { Cabal = cself.Cabal_3_10_1_0; Cabal-syntax = cself.Cabal-syntax_3_10_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # GHC 9.2.5 starts shipping 1.6.16.0 + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { + # We need at least directory >= 1.3.7.0. Using the latest version + # 1.3.8.* is not an option since it causes very annoying dependencies + # on newer versions of unix and filepath than GHC 9.2 ships + directory = cself.directory_1_3_7_1; + # GHC 9.2.5 starts shipping 1.6.16.0 which is required by + # cabal-install, but we need to recompile process even if the correct + # version is available to prevent inconsistent dependencies: + # process depends on directory. process = cself.process_1_6_17_0; + + # hspec < 2.10 depends on ghc (the library) directly which in turn + # depends on directory, causing a dependency conflict which is practically + # not solvable short of recompiling GHC. Instead of adding + # allowInconsistentDependencies for all reverse dependencies of hspec-core, + # just upgrade to an hspec version without the offending dependency. + hspec-core = cself.hspec-core_2_10_10; + hspec-discover = cself.hspec-discover_2_10_10; + hspec = cself.hspec_2_10_10; + + # hspec-discover and hspec-core depend on hspec-meta for testing which + # we need to avoid since it depends on ghc as well. Since hspec*_2_10* + # are overridden to take the versioned attributes as inputs, we need + # to make sure to override the versioned attribute with this fix. + hspec-discover_2_10_10 = dontCheck csuper.hspec-discover_2_10_10; } // lib.optionalAttrs (lib.versions.majorMinor self.ghc.version == "8.10") { # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc-8.10.7 (with bundled process) vs. process 1.6.16.0 @@ -1571,9 +1593,11 @@ self: super: { hspec-discover_2_10_10 = doDistribute (super.hspec-discover_2_10_10.override { hspec-meta = self.hspec-meta_2_10_5; }); - hspec-core_2_10_10 = doDistribute (super.hspec-core_2_10_10.override { + # Need to disable tests to prevent an infinite recursion if hspec-core_2_10_10 + # is overlayed to hspec-core. + hspec-core_2_10_10 = doDistribute (dontCheck (super.hspec-core_2_10_10.override { hspec-meta = self.hspec-meta_2_10_5; - }); + })); # Point hspec 2.7.10 to correct dependencies hspec_2_7_10 = super.hspec_2_7_10.override { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 30d67e6aa747..7f78ffcfed63 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -53,6 +53,7 @@ extra-packages: - Cabal == 3.6.* - Cabal-syntax == 3.8.* # required for cabal-install{,-parsers} - Cabal == 3.8.* # required for cabal-install{,-parsers} + - directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2 - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d9fb4704e05a..afa6220b96f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -82715,6 +82715,19 @@ self: { broken = true; }) {}; + "directory_1_3_7_1" = callPackage + ({ mkDerivation, base, filepath, time, unix }: + mkDerivation { + pname = "directory"; + version = "1.3.7.1"; + sha256 = "1z8frwbr0kdk47x3xasq7ifzcrwl7ryh1aqgf202xv4cakb8a9yw"; + libraryHaskellDepends = [ base filepath time unix ]; + testHaskellDepends = [ base filepath time unix ]; + description = "Platform-agnostic library for filesystem operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "directory_1_3_8_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { From e2f247c39e6d00073945909a3b1047a16a2f8046 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 22 Mar 2023 21:42:53 +0900 Subject: [PATCH 31/84] haskellPackages.hermes-json_0_2_0_1: generate package --- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7f78ffcfed63..26143255799c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -90,6 +90,7 @@ extra-packages: - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs + - hermes-json == 0.2.* # 2023-03-22: for nix-output-monitor-2.0.0.5 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index afa6220b96f9..5d5a3f3c85cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -137850,6 +137850,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "hermes-json_0_2_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , bytestring, containers, deepseq, dlist, hedgehog, mtl, scientific + , tasty, tasty-hedgehog, text, time, time-compat, transformers + , unliftio, unliftio-core + }: + mkDerivation { + pname = "hermes-json"; + version = "0.2.0.1"; + sha256 = "1i10nmblh6zxbqpqk5z5r97334j6x37kgw459i4icm6c4hi55k4l"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base bytestring deepseq dlist mtl + scientific text time time-compat transformers unliftio + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog scientific tasty + tasty-hedgehog text time + ]; + description = "Fast JSON decoding via simdjson C++ bindings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hermes-json" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , bytestring, containers, deepseq, dlist, hedgehog, primitive From 3009eda91b99771947fb4c983455c89ee58270ff Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 22 Mar 2023 21:46:11 +0900 Subject: [PATCH 32/84] nix-output-monitor: use hermes-json-0.2.0.1 --- pkgs/tools/nix/nix-output-monitor/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index 9b3b0eebd91a..49cc4d2bedcc 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -3,6 +3,7 @@ expect, haskellPackages, installShellFiles, + lib }: let inherit (haskell.lib.compose) justStaticExecutables overrideCabal; overrides = { @@ -17,7 +18,14 @@ ''; mainProgram = "nom"; }; + nom-pkg = haskellPackages.callPackage ./generated-package.nix { }; + nom-pkg-with-scope = nom-pkg.overrideScope (hfinal: hprev: { + hermes-json = hfinal.hermes-json_0_2_0_1; + }); in - justStaticExecutables - (overrideCabal overrides - (haskellPackages.callPackage ./generated-package.nix {})) +lib.pipe + nom-pkg-with-scope + [ + (overrideCabal overrides) + justStaticExecutables + ] From 7f663abbc28d126dd573d49ec1e7c122dd7d93db Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 22 Mar 2023 15:24:35 +0100 Subject: [PATCH 33/84] haskellPackages.goldplate: make executable available for tests --- pkgs/development/haskell-modules/configuration-nix.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2a665a38e551..5c49d840ae9f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -359,6 +359,13 @@ self: super: builtins.intersectAttrs super { preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; }) super.ghcide; + # Tests execute goldplate + goldplate = overrideCabal (drv: { + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/goldplate:$PATH" + ''; + }) super.goldplate; + # At least on 1.3.4 version on 32-bit architectures tasty requires # unbounded-delays via .cabal file conditions. tasty = overrideCabal (drv: { From 521f6aec443fb8e7b96a7f23b1c8f1637ce1b30a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 22 Mar 2023 15:27:28 +0100 Subject: [PATCH 34/84] haskellPackages.hspec-api: downgrade to match hspec --- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 26143255799c..f04d361cea01 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -44,6 +44,8 @@ default-package-overrides: - shake-cabal < 0.2.2.3 # needed as long as we have pandoc < 3.0, i.e. stackage lts 20 - pandoc-crossref < 0.3.15.0 + # Needs to match hspec which is tracked in stackage + - hspec-api < 2.10 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5d5a3f3c85cf..5af493c4492b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -151497,6 +151497,19 @@ self: { }) {}; "hspec-api" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "hspec-api"; + version = "2.9.0"; + sha256 = "0a260pjz0fyj51wpdnlb5kzrrwzdam2rxr019c5xrl14gg77a007"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + }) {}; + + "hspec-api_2_10_0" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: mkDerivation { pname = "hspec-api"; @@ -151507,6 +151520,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage From b2fe4102fddc46d80e40f45c0582e835d1397903 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 23 Mar 2023 08:49:31 +0900 Subject: [PATCH 35/84] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1792418](https://hydra.nixos.org/eval/1792418) of nixpkgs commit [9b7cbce](https://github.com/NixOS/nixpkgs/commits/9b7cbce8b25abb3de1c47fa5a655fbe559e86410) as of 2023-03-22 23:44 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 4 +++ .../transitive-broken.yaml | 28 +++++++++------- .../haskell-modules/hackage-packages.nix | 33 +++++++++++++------ 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d3403ef5db6..3a8410a49ef7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1974,6 +1974,7 @@ broken-packages: - HaLeX - halfs - half-space + - halide-haskell # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/212823532 at 2023-03-22 - halipeto - halive - halma @@ -3436,6 +3437,7 @@ broken-packages: - money - mongodb-queue - monitor + - monocypher # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/212811942 at 2023-03-22 - mono-foldable - monoid - monoid-absorbing @@ -3454,6 +3456,7 @@ broken-packages: - morphisms-objects - morte - mortred + - mosaico-lib # dependency missing in job https://hydra.nixos.org/build/212818174 at 2023-03-22 - motor-reflection - mount - movie-monad @@ -5928,6 +5931,7 @@ broken-packages: - YamlReference - yaml-rpc - yaml-union + - yaml-unscrambler # dependency missing in job https://hydra.nixos.org/build/212821989 at 2023-03-22 - yampa2048 - yampa-glfw - yampa-gloss diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9ca4158e8248..e60c48bcae44 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -247,7 +247,6 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 - - LPFP - LPPaver - LambdaHack - LambdaINet @@ -679,7 +678,7 @@ dont-distribute-packages: - ascii-superset_1_3_0_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_6_0_0 + - ascii_1_7_0_0 - asic - asil - assert4hs-hspec @@ -741,6 +740,7 @@ dont-distribute-packages: - babylon - backblaze-b2-hs - backdropper + - balkon - ballast - bamboo - bamboo-launcher @@ -1285,6 +1285,9 @@ dont-distribute-packages: - dobutokO3 - dobutokO4 - doc-review + - domain + - domain-aeson + - domain-cereal - domaindriven - dormouse-client - dovetail @@ -2132,7 +2135,6 @@ dont-distribute-packages: - hexpat-iteratee - hfd - hfiar - - hfoil - hfractal - hgalib - hgen @@ -2200,9 +2202,6 @@ dont-distribute-packages: - hoppy-runtime - hoppy-std - horizon-gen-nix - - horizon-spec - - horizon-spec-lens - - horizon-spec-pretty - hotswap - hp2any-graph - hp2any-manager @@ -2570,8 +2569,6 @@ dont-distribute-packages: - ldapply - leaky - lean - - learn-physics - - learn-physics-examples - learning-hmm - legion - legion-discovery @@ -2937,8 +2934,6 @@ dont-distribute-packages: - nomyx-library - nomyx-server - nonlinear-optimization-backprop - - not-gloss - - not-gloss-examples - notmuch-web - now-haskell - nri-env-parser @@ -3073,6 +3068,10 @@ dont-distribute-packages: - peyotls - peyotls-codec - pg-entity + - phladiprelio-general-shared + - phladiprelio-general-simple + - phladiprelio-ukrainian-shared + - phladiprelio-ukrainian-simple - phonetic-languages-common - phonetic-languages-constraints - phonetic-languages-examples @@ -3129,7 +3128,12 @@ dont-distribute-packages: - polh-lexicon - polydata - polysemy-RandomFu + - polysemy-account + - polysemy-account-api - polysemy-conc + - polysemy-db + - polysemy-hasql + - polysemy-hasql-test - polysemy-http - polysemy-log - polysemy-log-co @@ -3692,7 +3696,7 @@ dont-distribute-packages: - sparser - spartacon - spata - - spatial-math + - spatial-math_0_5_0_1 - specialize-th - spectral-clustering - speculation-transformers @@ -3708,6 +3712,7 @@ dont-distribute-packages: - sproxy - sproxy-web - sproxy2 + - sqel - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql @@ -4287,6 +4292,7 @@ dont-distribute-packages: - zerobin - zeromq3-conduit - zeroth + - zeugma - zifter-cabal - zifter-git - zifter-google-java-format diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5af493c4492b..18401a7aa6b5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12712,7 +12712,6 @@ self: { ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "LPPaver" = callPackage @@ -40121,6 +40120,7 @@ self: { doHaddock = false; description = "Text layout engine built on top of HarfBuzz"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "ballast" = callPackage @@ -85722,6 +85722,7 @@ self: { ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "domain-aeson" = callPackage @@ -85746,6 +85747,7 @@ self: { ]; description = "Integration of domain with aeson"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "domain-auth" = callPackage @@ -85782,6 +85784,7 @@ self: { testHaskellDepends = [ cereal cereal-text domain rerebase ]; description = "Integration of domain with cereal"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "domain-core" = callPackage @@ -126539,6 +126542,8 @@ self: { ]; description = "Haskell bindings to Halide"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {Halide = null;}; "halipeto" = callPackage @@ -138892,7 +138897,6 @@ self: { executableHaskellDepends = [ base ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hfoil"; }) {}; @@ -145888,7 +145892,6 @@ self: { ]; description = "Horizon Stable Package Set Type Definitions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "horizon-spec-lens" = callPackage @@ -145900,7 +145903,6 @@ self: { libraryHaskellDepends = [ base horizon-spec lens ]; description = "Horizon Stable Package Set Lenses"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "horizon-spec-pretty" = callPackage @@ -145916,7 +145918,6 @@ self: { ]; description = "Horizon Stable Package Set Pretty Printer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "horizontal-rule" = callPackage @@ -177266,7 +177267,6 @@ self: { ]; description = "Haskell code for learning physics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -177284,7 +177284,6 @@ self: { ]; description = "examples for learn-physics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "learning-hmm" = callPackage @@ -196636,6 +196635,8 @@ self: { testHaskellDepends = [ base ]; description = "Low level bindings to the monocypher C library"; license = "(CC0-1.0 OR BSD-2-Clause)"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monoid" = callPackage @@ -197818,6 +197819,8 @@ self: { ]; description = "Generación interactiva de mosaicos"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mosquitto-hs" = callPackage @@ -207191,7 +207194,6 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -207209,7 +207211,6 @@ self: { ]; description = "examples for not-gloss"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "not-in-base" = callPackage @@ -221397,6 +221398,7 @@ self: { ]; description = "A shared by different general implementations of the PhLADiPreLiO functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phladiprelio-general-simple" = callPackage @@ -221413,6 +221415,7 @@ self: { ]; description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phladiprelio-ukrainian-shared" = callPackage @@ -221428,6 +221431,7 @@ self: { ]; description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phladiprelio-ukrainian-simple" = callPackage @@ -221448,6 +221452,7 @@ self: { ]; description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "phladiprelioUkr"; }) {}; @@ -226149,6 +226154,7 @@ self: { ]; description = "Account management with Servant and Polysemy"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-account-api" = callPackage @@ -226178,6 +226184,7 @@ self: { ]; description = "Account management with Servant and Polysemy"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-check" = callPackage @@ -226258,6 +226265,7 @@ self: { ]; description = "Polysemy effects for databases"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-extra" = callPackage @@ -226326,6 +226334,7 @@ self: { ]; description = "Polysemy effects for databases"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-hasql-test" = callPackage @@ -226349,6 +226358,7 @@ self: { ]; description = "Test utilities for polysemy-hasql"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-http" = callPackage @@ -269819,7 +269829,6 @@ self: { ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "spatial-math_0_5_0_1" = callPackage @@ -270946,6 +270955,7 @@ self: { ]; description = "Guided derivation for Hasql statements"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "sql-simple" = callPackage @@ -316994,6 +317004,8 @@ self: { ]; description = "Flexible declarative YAML parsing toolkit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yaml2owl" = callPackage @@ -321545,6 +321557,7 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "zifter" = callPackage From 16476ccdce65478f64864e5bc4c6320f1cd32a09 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 23 Mar 2023 11:10:48 +0900 Subject: [PATCH 36/84] haskellPackages.hs-swisstable-hashtables-class: only build on x86_64 --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f04d361cea01..465754bf57bc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -561,6 +561,7 @@ supported-platforms: hsignal: [ platforms.x86 ] # -msse2 HFuse: [ platforms.linux ] HQu: [ platforms.x86 ] # vendored C++ library needs i686/x86_64 + hs-swisstable-hashtables-class: [ platforms.x86_64 ] # depends on swisstable, which Needs AVX2 hw-prim-bits: [ platforms.x86 ] # x86 assembler inline-asm: [ platforms.x86 ] # x86 assembler keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 18401a7aa6b5..04082efb04fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -148714,6 +148714,7 @@ self: { testHaskellDepends = [ base hashtables swisstable ]; description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; license = lib.licenses.bsd3; + platforms = lib.platforms.x86_64; }) {}; "hs-tags" = callPackage From f430566c57413ea0be1ad562c40d09b36562dd20 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Mar 2023 10:39:15 +0900 Subject: [PATCH 37/84] haskellPackages: add comments to release-haskell.nix --- pkgs/top-level/release-haskell.nix | 61 +++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d95268142241..dadace6eff7e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -43,6 +43,19 @@ let ) jobList; # names of all subsets of `pkgs.haskell.packages` + # + # compilerNames looks like the following: + # + # ``` + # { + # ghc810 = "ghc810"; + # ghc8102Binary = "ghc8102Binary"; + # ghc8102BinaryMinimal = "ghc8102BinaryMinimal"; + # ghc8107 = "ghc8107"; + # ghc924 = "ghc924"; + # ... + # } + # ``` compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages; # list of all compilers to test specific packages on @@ -59,6 +72,22 @@ let ]; # packagePlatforms applied to `haskell.packages.*` + # + # This returns an attr set that looks like the following, where each Haskell + # package in the compiler attr set has its list of supported platforms as its + # value. + # + # ``` + # { + # ghc810 = { + # conduit = [ ... ]; + # lens = [ "i686-cygwin" "x86_64-cygwin" ... "x86_64-windows" "i686-windows" ] + # ... + # }; + # ghc902 = { ... }; + # ... + # } + # ``` compilerPlatforms = lib.mapAttrs (_: v: packagePlatforms v) pkgs.haskell.packages; @@ -66,7 +95,37 @@ let # This function lets you specify specific packages # which are to be tested on a list of specific GHC # versions and returns a job set for all specified - # combinations. See `jobs` below for an example. + # combinations. + # + # You can call versionedCompilerJobs like the following: + # + # ``` + # versionedCompilerJobs { + # ghc-tags = ["ghc902" "ghc924"]; + # } + # ``` + # + # This would produce an output like the following: + # + # ``` + # { + # haskell.packages = { + # ghc884 = {}; + # ghc810 = {}; + # ghc902 = { + # ghc-tags = { + # aarch64-darwin = ; + # aarch64-linux = ; + # ... + # }; + # }; + # ghc924 = { + # ghc-tags = { ... }; + # }; + # ... + # }; + # } + # ``` versionedCompilerJobs = config: mapTestOn { haskell.packages = (lib.mapAttrs ( From 0d364a0117111c1677f0685a9ec3cca38d9608b3 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Mar 2023 10:40:32 +0900 Subject: [PATCH 38/84] haskellPackages: small formatting fix to versionedCompilerJobs in release-haskell.nix --- pkgs/top-level/release-haskell.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index dadace6eff7e..10673a02ad1d 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -128,13 +128,13 @@ let # ``` versionedCompilerJobs = config: mapTestOn { haskell.packages = - (lib.mapAttrs ( - ghc: jobs: - lib.filterAttrs ( - jobName: platforms: - lib.elem ghc (config."${jobName}" or []) - ) jobs - ) compilerPlatforms); + lib.mapAttrs + (ghc: jobs: + lib.filterAttrs + (jobName: platforms: lib.elem ghc (config."${jobName}" or [])) + jobs + ) + compilerPlatforms; }; # hydra jobs for `pkgs` of which we import a subset of From 4a736e5ede53881ed86078e8a31301ba0a62057f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Mar 2023 11:32:47 +0900 Subject: [PATCH 39/84] haskellPackages: small refactoring and comments to versionedCompilerJobs in release-haskell.nix --- pkgs/top-level/release-haskell.nix | 35 +++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 10673a02ad1d..c745615f20d9 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -128,13 +128,38 @@ let # ``` versionedCompilerJobs = config: mapTestOn { haskell.packages = - lib.mapAttrs - (ghc: jobs: + let + # Mapping function that takes an attrset of jobs, and + # removes all jobs that are not specified in config. + # + # For example, imagine a call to onlyConfigJobs like: + # + # ``` + # onlyConfigJobs + # "ghc902" + # { + # conduit = [ ... ]; + # lens = [ "i686-cygwin" "x86_64-cygwin" ... "x86_64-windows" "i686-windows" ]; + # } + # ``` + # + # onlyConfigJobs pulls out only those jobs that are specified in config. + # + # For instance, if config is `{ lens = [ "ghc902" ]; }`, then the above + # example call to onlyConfigJobs will return: + # + # ``` + # { lens = [ "i686-cygwin" "x86_64-cygwin" ... "x86_64-windows" "i686-windows" ]; } + # ``` + # + # If config is `{ lens = [ "ghc8107" ]; }`, then the above example call + # to onlyConfigJobs returns `{}`. + onlyConfigJobs = ghc: jobs: lib.filterAttrs (jobName: platforms: lib.elem ghc (config."${jobName}" or [])) - jobs - ) - compilerPlatforms; + jobs; + in + lib.mapAttrs onlyConfigJobs compilerPlatforms; }; # hydra jobs for `pkgs` of which we import a subset of From 105e326f5fb9d8220c88775561053796e991b86a Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Mar 2023 11:43:31 +0900 Subject: [PATCH 40/84] haskellPackages: make sure versionedCompilerJobs doesn't try running on platforms ghc does not support --- pkgs/top-level/release-haskell.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c745615f20d9..4e86000093b4 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -154,10 +154,25 @@ let # # If config is `{ lens = [ "ghc8107" ]; }`, then the above example call # to onlyConfigJobs returns `{}`. + # + # onlyConfigJobs will also remove all platforms from a job that are not + # supported by the GHC it is compiled with. onlyConfigJobs = ghc: jobs: - lib.filterAttrs - (jobName: platforms: lib.elem ghc (config."${jobName}" or [])) - jobs; + let + configFilteredJobset = + lib.filterAttrs + (jobName: platforms: lib.elem ghc (config."${jobName}" or [])) + jobs; + + # Remove platforms from each job that are not supported by GHC. + # This is important so that we don't build jobs for platforms + # where GHC can't be compiled. + jobsetWithGHCPlatforms = + lib.mapAttrs + (_: platforms: lib.intersectLists jobs.ghc platforms) + configFilteredJobset; + in + jobsetWithGHCPlatforms; in lib.mapAttrs onlyConfigJobs compilerPlatforms; }; From 3aea75b8fc82e416d8146a6b3d6338395c2dfbd9 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Mar 2023 20:26:01 +0900 Subject: [PATCH 41/84] haskellPackages: fix indentiation in hydra-report.hs --- maintainers/scripts/haskell/hydra-report.hs | 136 ++++++++++---------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 2cbeedeaf7a5..25640864dbe1 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -267,7 +267,7 @@ getMaintainerMap = do handlesMap :: EmailToGitHubHandles <- readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: " pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs - where + where -- Split a comma-spearated string of Maintainers into a NonEmpty list of -- GitHub handles. splitMaintainersToGitHubHandles @@ -425,76 +425,76 @@ details summary content = ["
" <> summary <> " ", ""] evalLine :: Eval -> UTCTime -> Text evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime = - "*evaluation [" - <> showT id - <> "](https://hydra.nixos.org/eval/" - <> showT id - <> ") of nixpkgs commit [" - <> Text.take 7 revision - <> "](https://github.com/NixOS/nixpkgs/commits/" - <> revision - <> ") as of " - <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) - <> "*" + "*evaluation [" + <> showT id + <> "](https://hydra.nixos.org/eval/" + <> showT id + <> ") of nixpkgs commit [" + <> Text.take 7 revision + <> "](https://github.com/NixOS/nixpkgs/commits/" + <> revision + <> ") as of " + <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) + <> "*" printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = - Text.unlines $ - headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] - <> totals - <> optionalList "#### Maintained packages with build failure" (maintainedList fails) - <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) - <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) - <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) - <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) - <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) - <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) - <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] - <> footer - where - footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] - headline = - [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" - , evalLine eval fetchTime ] - totals = - [ "#### Build summary" - , "" - ] - <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary - brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " - numSummary = statusToNumSummary summary - jobsByState predicate = Map.filter (predicate . worstState) summary - worstState = foldl' min Success . fmap state . summaryBuilds - fails = jobsByState (== Failed) - failedDeps = jobsByState (== DependencyFailed) - unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) - withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) - withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) - optionalList heading list = if null list then mempty else [heading] <> list - optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list - maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer - unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer - showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) - showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) - tldr = case (errors, warnings) of - ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - _ -> [":red_circle: **Branch not mergeable**"] - warnings = - if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> - if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> - if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." - errors = - if' (isNothing mergeableJob) "No `mergeable` job found." <> - if' (isNothing maintainedJob) "No `maintained` job found." <> - if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> - if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <> - if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." - if' p e = if p then [e] else mempty - outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m - maintainedJob = Map.lookup "maintained" summary - mergeableJob = Map.lookup "mergeable" summary + Text.unlines $ + headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] + <> totals + <> optionalList "#### Maintained packages with build failure" (maintainedList fails) + <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) + <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) + <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) + <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) + <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) + <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) + <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] + <> footer + where + footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] + headline = + [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" + , evalLine eval fetchTime ] + totals = + [ "#### Build summary" + , "" + ] + <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary + brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " + numSummary = statusToNumSummary summary + jobsByState predicate = Map.filter (predicate . worstState) summary + worstState = foldl' min Success . fmap state . summaryBuilds + fails = jobsByState (== Failed) + failedDeps = jobsByState (== DependencyFailed) + unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) + withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) + withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) + optionalList heading list = if null list then mempty else [heading] <> list + optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list + maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer + unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer + showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) + showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) + tldr = case (errors, warnings) of + ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + _ -> [":red_circle: **Branch not mergeable**"] + warnings = + if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> + if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> + if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." + errors = + if' (isNothing mergeableJob) "No `mergeable` job found." <> + if' (isNothing maintainedJob) "No `maintained` job found." <> + if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> + if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <> + if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." + if' p e = if p then [e] else mempty + outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m + maintainedJob = Map.lookup "maintained" summary + mergeableJob = Map.lookup "mergeable" summary printEvalInfo :: IO () printEvalInfo = do From 265a3a3b1581f0d7825e04d772d2f34e490745db Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 24 Mar 2023 20:55:52 +0900 Subject: [PATCH 42/84] haskellPackages: add types and some formatting to hydra-report.hs --- maintainers/scripts/haskell/hydra-report.hs | 37 +++++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 25640864dbe1..bc00cd129028 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -342,6 +342,9 @@ data SummaryEntry = SummaryEntry { } type StatusSummary = Map Text SummaryEntry +tableSingleton :: row -> col -> a -> Table row col a +tableSingleton row col a = Table (Map.singleton (row, col) a) + instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where Table l <> Table r = Table (Map.unionWith (<>) l r) instance (Ord row, Ord col, Semigroup a) => Monoid (Table row col a) where @@ -364,18 +367,39 @@ getBuildState Build{finished, buildstatus} = case (finished, buildstatus) of (_, i) -> Unknown i buildSummary :: MaintainerMap -> ReverseDependencyMap -> Seq Build -> StatusSummary -buildSummary maintainerMap reverseDependencyMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary +buildSummary maintainerMap reverseDependencyMap = + foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary where - unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru) - toSummary build@Build{job, id, system} = Map.singleton name (SummaryEntry (Table (Map.singleton (set, Platform system) (BuildResult (getBuildState build) id))) maintainers reverseDeps unbrokenReverseDeps) + unionSummary :: SummaryEntry -> SummaryEntry -> SummaryEntry + unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = + SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru) + + toSummary :: Build -> StatusSummary + toSummary build@Build{job, id, system} = Map.singleton name summaryEntry where + packageName :: Text packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) + + splitted :: Maybe (NonEmpty Text) splitted = nonEmpty $ Text.splitOn "." packageName + + name :: Text name = maybe packageName NonEmpty.last splitted + + set :: Text set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted + + maintainers :: Set Text maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) + (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap + buildTable :: Table Text Platform BuildResult + buildTable = + tableSingleton set (Platform system) (BuildResult (getBuildState build) id) + + summaryEntry = SummaryEntry buildTable maintainers reverseDeps unbrokenReverseDeps + readBuildReports :: IO (Eval, UTCTime, Seq Build) readBuildReports = do file <- reportFileName @@ -463,9 +487,16 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " numSummary = statusToNumSummary summary + + jobsByState :: (BuildState -> Bool) -> Map Text SummaryEntry jobsByState predicate = Map.filter (predicate . worstState) summary + + worstState :: SummaryEntry -> BuildState worstState = foldl' min Success . fmap state . summaryBuilds + + fails :: Map Text SummaryEntry fails = jobsByState (== Failed) + failedDeps = jobsByState (== DependencyFailed) unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) From c574a8c37ee12ddbbb4477544b57ca2c7a5e2536 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 25 Mar 2023 17:44:26 +0900 Subject: [PATCH 43/84] haskellPackages: add a little documentation to hydra-report.hs --- maintainers/scripts/haskell/hydra-report.hs | 29 ++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index bc00cd129028..1370295b9f24 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -51,6 +51,7 @@ import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as Text import Data.Text.Encoding (encodeUtf8) +import qualified Data.Text.IO as Text import Data.Time (defaultTimeLocale, formatTime, getCurrentTime) import Data.Time.Clock (UTCTime) import GHC.Generics (Generic) @@ -104,13 +105,36 @@ data Eval = Eval } deriving (Generic, ToJSON, FromJSON, Show) +-- | Datatype representing the result of querying the build evals of the +-- haskell-updates Hydra jobset. +-- +-- The URL (where @EVAL_ID@ is a +-- value like 1792418) returns a list of 'Build'. data Build = Build { job :: Text + -- ^ Hydra job name. + -- + -- Examples: + -- - @"haskellPackages.lens.x86_64-linux"@ + -- - @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ , buildstatus :: Maybe Int + -- ^ Status of the build. See 'getBuildState' for the meaning of each state. , finished :: Int + -- ^ Whether or not the build is finished. @0@ if finished, non-zero otherwise. , id :: Int , nixname :: Text + -- ^ Nix name of the derivation. + -- + -- Examples: + -- - @"lens-5.2.1"@ + -- - @"cabal-install-3.8.0.1"@ + -- - @"lens-static-x86_64-unknown-linux-musl-5.1.1"@ , system :: Text + -- ^ System + -- + -- Examples: + -- - @"x86_64-linux"@ + -- - @"aarch64-darwin"@ , jobsetevals :: Seq Int } deriving (Generic, ToJSON, FromJSON, Show) @@ -540,7 +564,10 @@ printMaintainerPing = do let tops = take 50 . sortOn (negate . snd) . fmap (second fst) . filter (\x -> maybe False broken $ Map.lookup (fst x) depMap) . Map.toList $ rdepMap pure (rdepMap, tops) (eval, fetchTime, buildReport) <- readBuildReports - putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap reverseDependencyMap buildReport) topBrokenRdeps)) + let buildSum :: StatusSummary + buildSum = buildSummary maintainerMap reverseDependencyMap buildReport + textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps + Text.putStrLn textBuildSummary printMarkBrokenList :: IO () printMarkBrokenList = do From 28f22d86d7b26e7923ce3465c4978ba3546c5b74 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 25 Mar 2023 18:21:55 +0900 Subject: [PATCH 44/84] haskellPackages: slight refactoring of hydra-report.hs --- maintainers/scripts/haskell/hydra-report.hs | 63 ++++++++++++--------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 1370295b9f24..7cec26598362 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -19,6 +19,7 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} @@ -357,7 +358,6 @@ platformIcon (Platform x) = case x of data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord) -newtype Table row col a = Table (Map (row, col) a) data SummaryEntry = SummaryEntry { summaryBuilds :: Table Text Platform BuildResult, summaryMaintainers :: Set Text, @@ -366,8 +366,13 @@ data SummaryEntry = SummaryEntry { } type StatusSummary = Map Text SummaryEntry -tableSingleton :: row -> col -> a -> Table row col a -tableSingleton row col a = Table (Map.singleton (row, col) a) +newtype Table row col a = Table (Map (row, col) a) + +singletonTable :: row -> col -> a -> Table row col a +singletonTable row col a = Table $ Map.singleton (row, col) a + +unionTable :: (Ord row, Ord col) => Table row col a -> Table row col a -> Table row col a +unionTable (Table l) (Table r) = Table $ Map.union l r instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where Table l <> Table r = Table (Map.unionWith (<>) l r) @@ -390,39 +395,39 @@ getBuildState Build{finished, buildstatus} = case (finished, buildstatus) of (_, Just 11) -> OutputLimitExceeded (_, i) -> Unknown i -buildSummary :: MaintainerMap -> ReverseDependencyMap -> Seq Build -> StatusSummary -buildSummary maintainerMap reverseDependencyMap = - foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary +combineStatusSummaries :: Seq StatusSummary -> StatusSummary +combineStatusSummaries = foldl (Map.unionWith unionSummary) Map.empty where unionSummary :: SummaryEntry -> SummaryEntry -> SummaryEntry - unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = - SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru) + unionSummary (SummaryEntry lb lm lr lu) (SummaryEntry rb rm rr ru) = + SummaryEntry (unionTable lb rb) (lm <> rm) (max lr rr) (max lu ru) - toSummary :: Build -> StatusSummary - toSummary build@Build{job, id, system} = Map.singleton name summaryEntry - where - packageName :: Text - packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) +buildToStatusSummary :: MaintainerMap -> ReverseDependencyMap -> Build -> StatusSummary +buildToStatusSummary maintainerMap reverseDependencyMap build@Build{job, id, system} = + Map.singleton name summaryEntry + where + packageName :: Text + packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) - splitted :: Maybe (NonEmpty Text) - splitted = nonEmpty $ Text.splitOn "." packageName + splitted :: Maybe (NonEmpty Text) + splitted = nonEmpty $ Text.splitOn "." packageName - name :: Text - name = maybe packageName NonEmpty.last splitted + name :: Text + name = maybe packageName NonEmpty.last splitted - set :: Text - set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted + set :: Text + set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted - maintainers :: Set Text - maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) + maintainers :: Set Text + maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) - (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap + (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap - buildTable :: Table Text Platform BuildResult - buildTable = - tableSingleton set (Platform system) (BuildResult (getBuildState build) id) + buildTable :: Table Text Platform BuildResult + buildTable = + singletonTable set (Platform system) (BuildResult (getBuildState build) id) - summaryEntry = SummaryEntry buildTable maintainers reverseDeps unbrokenReverseDeps + summaryEntry = SummaryEntry buildTable maintainers reverseDeps unbrokenReverseDeps readBuildReports :: IO (Eval, UTCTime, Seq Build) readBuildReports = do @@ -564,8 +569,10 @@ printMaintainerPing = do let tops = take 50 . sortOn (negate . snd) . fmap (second fst) . filter (\x -> maybe False broken $ Map.lookup (fst x) depMap) . Map.toList $ rdepMap pure (rdepMap, tops) (eval, fetchTime, buildReport) <- readBuildReports - let buildSum :: StatusSummary - buildSum = buildSummary maintainerMap reverseDependencyMap buildReport + let statusSummaries = + fmap (buildToStatusSummary maintainerMap reverseDependencyMap) buildReport + buildSum :: StatusSummary + buildSum = combineStatusSummaries statusSummaries textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps Text.putStrLn textBuildSummary From b2af201c0e70b28d59e26becd18b3095dc7f9636 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 25 Mar 2023 19:24:13 +0900 Subject: [PATCH 45/84] haskellPackages: add newtype for JobName in hydra-report.hs This commits changes the `job` field in `Build` to a newtype. This is mostly just to have a place to document exactly what a job name consists of. --- maintainers/scripts/haskell/hydra-report.hs | 39 ++++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 7cec26598362..7d6a13c77125 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -20,6 +20,7 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} @@ -33,6 +34,7 @@ import Control.Monad (forM_, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) import Data.Aeson ( FromJSON, + FromJSONKey, ToJSON, decodeFileStrict', eitherDecodeStrict', @@ -92,13 +94,16 @@ import Distribution.Simple.Utils (safeLast, fromUTF8BS) newtype JobsetEvals = JobsetEvals { evals :: Seq Eval } - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) newtype Nixpkgs = Nixpkgs {revision :: Text} - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs} - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) data Eval = Eval { id :: Int @@ -106,18 +111,24 @@ data Eval = Eval } deriving (Generic, ToJSON, FromJSON, Show) +-- | Hydra job name. +-- +-- Examples: +-- - @"haskellPackages.lens.x86_64-linux"@ +-- - @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- - @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ +-- - @"arion.aarch64-linux"@ +newtype JobName = JobName { unJobName :: Text } + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSONKey, FromJSON, Ord, ToJSON) + -- | Datatype representing the result of querying the build evals of the -- haskell-updates Hydra jobset. -- -- The URL (where @EVAL_ID@ is a -- value like 1792418) returns a list of 'Build'. data Build = Build - { job :: Text - -- ^ Hydra job name. - -- - -- Examples: - -- - @"haskellPackages.lens.x86_64-linux"@ - -- - @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ + { job :: JobName , buildstatus :: Maybe Int -- ^ Status of the build. See 'getBuildState' for the meaning of each state. , finished :: Int @@ -221,7 +232,7 @@ newtype Maintainers = Maintainers { maintainers :: Maybe Text } -- -- Note that Hydra jobs without maintainers will have an empty string for the -- maintainer list. -type HydraJobs = Map Text Maintainers +type HydraJobs = Map JobName Maintainers -- | Map of email addresses to GitHub handles. -- This is built from the file @../../maintainer-list.nix@. @@ -246,7 +257,7 @@ type EmailToGitHubHandles = Map Text Text -- , ("conduit.x86_64-darwin", ["snoyb", "webber"]) -- ] -- @@ -type MaintainerMap = Map Text (NonEmpty Text) +type MaintainerMap = Map JobName (NonEmpty Text) -- | Information about a package which lists its dependencies and whether the -- package is marked broken. @@ -406,8 +417,10 @@ buildToStatusSummary :: MaintainerMap -> ReverseDependencyMap -> Build -> Status buildToStatusSummary maintainerMap reverseDependencyMap build@Build{job, id, system} = Map.singleton name summaryEntry where + jobName = unJobName job + packageName :: Text - packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) + packageName = fromMaybe jobName (Text.stripSuffix ("." <> system) jobName) splitted :: Maybe (NonEmpty Text) splitted = nonEmpty $ Text.splitOn "." packageName @@ -580,7 +593,7 @@ printMarkBrokenList :: IO () printMarkBrokenList = do (_, fetchTime, buildReport) <- readBuildReports runReq defaultHttpConfig $ forM_ buildReport \build@Build{job, id} -> - case (getBuildState build, Text.splitOn "." job) of + case (getBuildState build, Text.splitOn "." $ unJobName job) of (Failed, ["haskellPackages", name, "x86_64-linux"]) -> do -- Fetch build log from hydra to figure out the cause of the error. build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"] From 19b567636119e6dac41a770370bd5e58a60c8f59 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 25 Mar 2023 23:00:56 +0900 Subject: [PATCH 46/84] haskellPackages: add newtype for PkgName and PkgSet in hydra-report.hs Add a newtype for a package name and a package set. This is less for correctness, and more just to make the code a little easier to read through without having to keep in mind what each Text refers to. --- maintainers/scripts/haskell/hydra-report.hs | 221 ++++++++++++++++---- 1 file changed, 180 insertions(+), 41 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 7d6a13c77125..0c847a6154ae 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -262,7 +262,7 @@ type MaintainerMap = Map JobName (NonEmpty Text) -- | Information about a package which lists its dependencies and whether the -- package is marked broken. data DepInfo = DepInfo { - deps :: Set Text, + deps :: Set PkgName, broken :: Bool } deriving stock (Generic, Show) @@ -270,23 +270,37 @@ data DepInfo = DepInfo { -- | Map from package names to their DepInfo. This is the data we get out of a -- nix call. -type DependencyMap = Map Text DepInfo +type DependencyMap = Map PkgName DepInfo -- | Map from package names to its broken state, number of reverse dependencies (fst) and -- unbroken reverse dependencies (snd). -type ReverseDependencyMap = Map Text (Int, Int) +type ReverseDependencyMap = Map PkgName (Int, Int) -- | Calculate the (unbroken) reverse dependencies of a package by transitively -- going through all packages if it’s a dependency of them. calculateReverseDependencies :: DependencyMap -> ReverseDependencyMap -calculateReverseDependencies depMap = Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) +calculateReverseDependencies depMap = + Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) where -- This code tries to efficiently invert the dependency map and calculate -- it’s transitive closure by internally identifying every pkg with it’s index -- in the package list and then using memoization. + keys :: [PkgName] keys = Map.keys depMap + + pkgToIndexMap :: Map PkgName Int pkgToIndexMap = Map.fromDistinctAscList (zip keys [0..]) - intDeps = zip [0..] $ (\DepInfo{broken,deps} -> (broken,mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps)) <$> Map.elems depMap + + depInfos :: [DepInfo] + depInfos = Map.elems depMap + + depInfoToIdx :: DepInfo -> (Bool, [Int]) + depInfoToIdx DepInfo{broken,deps} = + (broken, mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps) + + intDeps :: [(Int, (Bool, [Int]))] + intDeps = zip [0..] (fmap depInfoToIdx depInfos) + rdepMap onlyUnbroken = IntSet.size <$> resultList where resultList = go <$> [0..] @@ -315,7 +329,10 @@ getMaintainerMap = do -- script ./dependencies.nix. getDependencyMap :: IO DependencyMap getDependencyMap = - readJSONProcess nixExprCommand ("maintainers/scripts/haskell/dependencies.nix":nixExprParams) "Failed to decode nix output for lookup of dependencies: " + readJSONProcess + nixExprCommand + ("maintainers/scripts/haskell/dependencies.nix" : nixExprParams) + "Failed to decode nix output for lookup of dependencies: " -- | Run a process that produces JSON on stdout and and decode the JSON to a -- data type. @@ -367,15 +384,52 @@ platformIcon (Platform x) = case x of "aarch64-darwin" -> ":green_apple:" _ -> x +-- | A package name. This is parsed from a 'JobName'. +-- +-- Examples: +-- +-- - The 'JobName' @"haskellPackages.lens.x86_64-linux"@ produces the 'PkgName' +-- @"lens"@. +-- - The 'JobName' @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- produces the 'PkgName' @"cabal-install"@. +-- - The 'JobName' @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ produces +-- the 'PkgName' @"ghc90"@. +-- - The 'JobName' @"arion.aarch64-linux"@ produces the 'PkgName' @"arion"@. +-- +-- 'PkgName' is also used as a key in 'DependencyMap' and 'ReverseDependencyMap'. +-- In this case, 'PkgName' originally comes from attribute names in @haskellPackages@ +-- in Nixpkgs. +newtype PkgName = PkgName Text + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSON, FromJSONKey, Ord, ToJSON) + +-- | A package set name. This is parsed from a 'JobName'. +-- +-- Examples: +-- +-- - The 'JobName' @"haskellPackages.lens.x86_64-linux"@ produces the 'PkgSet' +-- @"haskellPackages"@. +-- - The 'JobName' @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- produces the 'PkgSet' @"haskell.packages.ghc925"@. +-- - The 'JobName' @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ produces +-- the 'PkgSet' @"pkgsMusl.haskell.compiler"@. +-- - The 'JobName' @"arion.aarch64-linux"@ produces the 'PkgSet' @""@. +-- +-- As you can see from the last example, 'PkgSet' can be empty (@""@) for +-- top-level jobs. +newtype PkgSet = PkgSet Text + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSON, FromJSONKey, Ord, ToJSON) + data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord) data SummaryEntry = SummaryEntry { - summaryBuilds :: Table Text Platform BuildResult, + summaryBuilds :: Table PkgSet Platform BuildResult, summaryMaintainers :: Set Text, summaryReverseDeps :: Int, summaryUnbrokenReverseDeps :: Int } -type StatusSummary = Map Text SummaryEntry +type StatusSummary = Map PkgName SummaryEntry newtype Table row col a = Table (Map (row, col) a) @@ -413,32 +467,36 @@ combineStatusSummaries = foldl (Map.unionWith unionSummary) Map.empty unionSummary (SummaryEntry lb lm lr lu) (SummaryEntry rb rm rr ru) = SummaryEntry (unionTable lb rb) (lm <> rm) (max lr rr) (max lu ru) -buildToStatusSummary :: MaintainerMap -> ReverseDependencyMap -> Build -> StatusSummary -buildToStatusSummary maintainerMap reverseDependencyMap build@Build{job, id, system} = - Map.singleton name summaryEntry +buildToPkgNameAndSet :: Build -> (PkgName, PkgSet) +buildToPkgNameAndSet Build{job = JobName jobName, system} = (name, set) where - jobName = unJobName job - packageName :: Text packageName = fromMaybe jobName (Text.stripSuffix ("." <> system) jobName) splitted :: Maybe (NonEmpty Text) splitted = nonEmpty $ Text.splitOn "." packageName - name :: Text - name = maybe packageName NonEmpty.last splitted + name :: PkgName + name = PkgName $ maybe packageName NonEmpty.last splitted - set :: Text - set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted + set :: PkgSet + set = PkgSet $ maybe "" (Text.intercalate "." . NonEmpty.init) splitted + +buildToStatusSummary :: MaintainerMap -> ReverseDependencyMap -> Build -> StatusSummary +buildToStatusSummary maintainerMap reverseDependencyMap build@Build{job, id, system} = + Map.singleton pkgName summaryEntry + where + (pkgName, pkgSet) = buildToPkgNameAndSet build maintainers :: Set Text maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) - (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap + (reverseDeps, unbrokenReverseDeps) = + Map.findWithDefault (0,0) pkgName reverseDependencyMap - buildTable :: Table Text Platform BuildResult + buildTable :: Table PkgSet Platform BuildResult buildTable = - singletonTable set (Platform system) (BuildResult (getBuildState build) id) + singletonTable pkgSet (Platform system) (BuildResult (getBuildState build) id) summaryEntry = SummaryEntry buildTable maintainers reverseDeps unbrokenReverseDeps @@ -462,19 +520,36 @@ printTable name showR showC showE (Table mapping) = joinTable <$> (name : map sh rows = toList $ Set.fromList (fst <$> Map.keys mapping) cols = toList $ Set.fromList (snd <$> Map.keys mapping) -printJob :: Int -> Text -> (Table Text Platform BuildResult, Text) -> [Text] -printJob evalId name (Table mapping, maintainers) = +printJob :: Int -> PkgName -> (Table PkgSet Platform BuildResult, Text) -> [Text] +printJob evalId (PkgName name) (Table mapping, maintainers) = if length sets <= 1 then map printSingleRow sets - else ["- [ ] " <> makeJobSearchLink "" name <> " " <> maintainers] <> map printRow sets + else ["- [ ] " <> makeJobSearchLink (PkgSet "") name <> " " <> maintainers] <> map printRow sets where - printRow set = " - " <> printState set <> " " <> makeJobSearchLink set (if Text.null set then "toplevel" else set) - printSingleRow set = "- [ ] " <> printState set <> " " <> makeJobSearchLink set (makePkgName set) <> " " <> maintainers - makePkgName set = (if Text.null set then "" else set <> ".") <> name - printState set = Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms - makeJobSearchLink set linkLabel= makeSearchLink evalId linkLabel (makePkgName set) + printRow :: PkgSet -> Text + printRow (PkgSet set) = + " - " <> printState (PkgSet set) <> " " <> + makeJobSearchLink (PkgSet set) (if Text.null set then "toplevel" else set) + + printSingleRow set = + "- [ ] " <> printState set <> " " <> + makeJobSearchLink set (makePkgName set) <> " " <> maintainers + + makePkgName :: PkgSet -> Text + makePkgName (PkgSet set) = (if Text.null set then "" else set <> ".") <> name + + printState set = + Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms + + makeJobSearchLink :: PkgSet -> Text -> Text + makeJobSearchLink set linkLabel = makeSearchLink evalId linkLabel (makePkgName set) + + sets :: [PkgSet] sets = toList $ Set.fromList (fst <$> Map.keys mapping) + + platforms :: [Platform] platforms = toList $ Set.fromList (snd <$> Map.keys mapping) + label pf (BuildResult s i) = "[[" <> platformIcon pf <> icon s <> "]](https://hydra.nixos.org/build/" <> showT i <> ")" makeSearchLink :: Int -> Text -> Text -> Text @@ -503,7 +578,7 @@ evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) <> "*" -printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text +printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(PkgName, Int)] -> Text printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = Text.unlines $ headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] @@ -519,36 +594,100 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = <> footer where footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] + headline = [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" - , evalLine eval fetchTime ] + , evalLine eval fetchTime + ] + + totals :: [Text] totals = [ "#### Build summary" , "" - ] - <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary - brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " + ] <> + printTable + "Platform" + (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) + (\x -> showT x <> " " <> icon x) + showT + numSummary + + brokenLine :: (PkgName, Int) -> Text + brokenLine (PkgName name, rdeps) = + "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> + ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " + numSummary = statusToNumSummary summary - jobsByState :: (BuildState -> Bool) -> Map Text SummaryEntry + jobsByState :: (BuildState -> Bool) -> StatusSummary jobsByState predicate = Map.filter (predicate . worstState) summary worstState :: SummaryEntry -> BuildState worstState = foldl' min Success . fmap state . summaryBuilds - fails :: Map Text SummaryEntry + fails :: StatusSummary fails = jobsByState (== Failed) + failedDeps :: StatusSummary failedDeps = jobsByState (== DependencyFailed) + + unknownErr :: StatusSummary unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) - withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) + + withMaintainer :: StatusSummary -> Map PkgName (Table PkgSet Platform BuildResult, NonEmpty Text) + withMaintainer = + Map.mapMaybe + (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) + + withoutMaintainer :: StatusSummary -> StatusSummary withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) + + optionalList :: Text -> [Text] -> [Text] optionalList heading list = if null list then mempty else [heading] <> list + + optionalHideableList :: Text -> [Text] -> [Text] optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list + + maintainedList :: StatusSummary -> [Text] maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer - unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer - showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) - showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) + + summaryEntryGetReverseDeps :: SummaryEntry -> (Int, Int) + summaryEntryGetReverseDeps sumEntry = + ( negate $ summaryUnbrokenReverseDeps sumEntry + , negate $ summaryReverseDeps sumEntry + ) + + sortOnReverseDeps :: [(PkgName, SummaryEntry)] -> [(PkgName, SummaryEntry)] + sortOnReverseDeps = sortOn (\(_, sumEntry) -> summaryEntryGetReverseDeps sumEntry) + + unmaintainedList :: StatusSummary -> [Text] + unmaintainedList = showBuild <=< sortOnReverseDeps . Map.toList . withoutMaintainer + + showBuild :: (PkgName, SummaryEntry) -> [Text] + showBuild (name, entry) = + printJob + id + name + ( summaryBuilds entry + , Text.pack + ( if summaryReverseDeps entry > 0 + then + " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <> + " | " <> show (summaryReverseDeps entry) + else "" + ) + ) + + showMaintainedBuild + :: (PkgName, (Table PkgSet Platform BuildResult, NonEmpty Text)) -> [Text] + showMaintainedBuild (name, (table, maintainers)) = + printJob + id + name + ( table + , Text.intercalate " " (fmap ("@" <>) (toList maintainers)) + ) + tldr = case (errors, warnings) of ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] @@ -566,8 +705,8 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." if' p e = if p then [e] else mempty outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m - maintainedJob = Map.lookup "maintained" summary - mergeableJob = Map.lookup "mergeable" summary + maintainedJob = Map.lookup (PkgName "maintained") summary + mergeableJob = Map.lookup (PkgName "mergeable") summary printEvalInfo :: IO () printEvalInfo = do From bd9bb50ad22102b92e3a6e2231343a6550c7fc62 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 26 Mar 2023 17:25:54 +0900 Subject: [PATCH 47/84] haskellPackages: remove error about outstanding jobs on aarch64-darwin in hydra-report.hs --- maintainers/scripts/haskell/hydra-report.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 0c847a6154ae..037b4980c502 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -701,10 +701,12 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = if' (isNothing maintainedJob) "No `maintained` job found." <> if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <> - if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." + if' p e = if p then [e] else mempty + outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m + maintainedJob = Map.lookup (PkgName "maintained") summary mergeableJob = Map.lookup (PkgName "mergeable") summary From 35295aed71ed588fb3b998110ab89e072aac731f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 26 Mar 2023 17:21:54 +0900 Subject: [PATCH 48/84] haskellPackages: in hydra-report.hs, split Linux and Darwin build failures This commit changes hydra-report.hs to split up Linux and Darwin build failures into two different sections. Darwin failures are hidden by default. --- maintainers/scripts/haskell/hydra-report.hs | 67 +++++++++++++++++---- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 037b4980c502..5f7e40a28bcd 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -384,6 +384,15 @@ platformIcon (Platform x) = case x of "aarch64-darwin" -> ":green_apple:" _ -> x +platformIsOS :: OS -> Platform -> Bool +platformIsOS os (Platform x) = case (os, x) of + (Linux, "x86_64-linux") -> True + (Linux, "aarch64-linux") -> True + (Darwin, "x86_64-darwin") -> True + (Darwin, "aarch64-darwin") -> True + _ -> False + + -- | A package name. This is parsed from a 'JobName'. -- -- Examples: @@ -431,6 +440,8 @@ data SummaryEntry = SummaryEntry { } type StatusSummary = Map PkgName SummaryEntry +data OS = Linux | Darwin + newtype Table row col a = Table (Map (row, col) a) singletonTable :: row -> col -> a -> Table row col a @@ -439,6 +450,12 @@ singletonTable row col a = Table $ Map.singleton (row, col) a unionTable :: (Ord row, Ord col) => Table row col a -> Table row col a -> Table row col a unionTable (Table l) (Table r) = Table $ Map.union l r +filterWithKeyTable :: (row -> col -> a -> Bool) -> Table row col a -> Table row col a +filterWithKeyTable f (Table t) = Table $ Map.filterWithKey (\(r,c) a -> f r c a) t + +nullTable :: Table row col a -> Bool +nullTable (Table t) = Map.null t + instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where Table l <> Table r = Table (Map.unionWith (<>) l r) instance (Ord row, Ord col, Semigroup a) => Monoid (Table row col a) where @@ -583,12 +600,15 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = Text.unlines $ headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] <> totals - <> optionalList "#### Maintained packages with build failure" (maintainedList fails) - <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) - <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) - <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) - <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) - <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) + <> optionalList "#### Maintained Linux packages with build failure" (maintainedList (fails summaryLinux)) + <> optionalList "#### Maintained Linux packages with failed dependency" (maintainedList (failedDeps summaryLinux)) + <> optionalList "#### Maintained Linux packages with unknown error" (maintainedList (unknownErr summaryLinux)) + <> optionalHideableList "#### Maintained Darwin packages with build failure" (maintainedList (fails summaryDarwin)) + <> optionalHideableList "#### Maintained Darwin packages with failed dependency" (maintainedList (failedDeps summaryDarwin)) + <> optionalHideableList "#### Maintained Darwin packages with unknown error" (maintainedList (unknownErr summaryDarwin)) + <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList (fails summary)) + <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList (failedDeps summary)) + <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList (unknownErr summary)) <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] <> footer @@ -619,19 +639,44 @@ printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = numSummary = statusToNumSummary summary - jobsByState :: (BuildState -> Bool) -> StatusSummary - jobsByState predicate = Map.filter (predicate . worstState) summary + summaryLinux :: StatusSummary + summaryLinux = withOS Linux summary + + summaryDarwin :: StatusSummary + summaryDarwin = withOS Darwin summary + + -- Remove all BuildResult from the Table that have Platform that isn't for + -- the given OS. + tableForOS :: OS -> Table PkgSet Platform BuildResult -> Table PkgSet Platform BuildResult + tableForOS os = filterWithKeyTable (\_ platform _ -> platformIsOS os platform) + + -- Remove all BuildResult from the StatusSummary that have a Platform that + -- isn't for the given OS. Completely remove all PkgName from StatusSummary + -- that end up with no BuildResults. + withOS + :: OS + -> StatusSummary + -> StatusSummary + withOS os = + Map.mapMaybe + (\e@SummaryEntry{summaryBuilds} -> + let buildsForOS = tableForOS os summaryBuilds + in if nullTable buildsForOS then Nothing else Just e { summaryBuilds = buildsForOS } + ) + + jobsByState :: (BuildState -> Bool) -> StatusSummary -> StatusSummary + jobsByState predicate = Map.filter (predicate . worstState) worstState :: SummaryEntry -> BuildState worstState = foldl' min Success . fmap state . summaryBuilds - fails :: StatusSummary + fails :: StatusSummary -> StatusSummary fails = jobsByState (== Failed) - failedDeps :: StatusSummary + failedDeps :: StatusSummary -> StatusSummary failedDeps = jobsByState (== DependencyFailed) - unknownErr :: StatusSummary + unknownErr :: StatusSummary -> StatusSummary unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) withMaintainer :: StatusSummary -> Map PkgName (Table PkgSet Platform BuildResult, NonEmpty Text) From 8c238320ef24013df837232591d9f0154e756382 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 27 Mar 2023 08:36:37 +0900 Subject: [PATCH 49/84] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1792584](https://hydra.nixos.org/eval/1792584) of nixpkgs commit [d7bd936](https://github.com/NixOS/nixpkgs/commits/d7bd9361dd318ea459c610247fa2960676db6a5a) as of 2023-03-26 23:18 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3a8410a49ef7..f938236c59a8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2246,6 +2246,7 @@ broken-packages: - hfann - HFitUI - hfmt + - hfoil # failure building library in job https://hydra.nixos.org/build/213500290 at 2023-03-26 - hfov - HFrequencyQueue - hfusion @@ -2398,6 +2399,7 @@ broken-packages: - hops - hoq - horizon + - horizon-spec # dependency missing in job https://hydra.nixos.org/build/213500294 at 2023-03-26 - horname - hosc-json - hosts-server @@ -3035,6 +3037,7 @@ broken-packages: - leapseconds - learn - Learning + - learn-physics-examples # dependency missing in job https://hydra.nixos.org/build/213500293 at 2023-03-26 - leetify - lendingclub - lens-datetime @@ -4097,6 +4100,7 @@ broken-packages: - pong-server - pontarius-xpmn - pool + - poolboy # test failure in job https://hydra.nixos.org/build/212819440 at 2023-03-26 - pool-conduit - pop3-client - poppler diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e60c48bcae44..110aea611d2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2202,6 +2202,8 @@ dont-distribute-packages: - hoppy-runtime - hoppy-std - horizon-gen-nix + - horizon-spec-lens + - horizon-spec-pretty - hotswap - hp2any-graph - hp2any-manager diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 04082efb04fd..9646ba3aff0b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -138897,7 +138897,9 @@ self: { executableHaskellDepends = [ base ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hfoil"; + broken = true; }) {}; "hformat" = callPackage @@ -145892,6 +145894,8 @@ self: { ]; description = "Horizon Stable Package Set Type Definitions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "horizon-spec-lens" = callPackage @@ -145903,6 +145907,7 @@ self: { libraryHaskellDepends = [ base horizon-spec lens ]; description = "Horizon Stable Package Set Lenses"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "horizon-spec-pretty" = callPackage @@ -145918,6 +145923,7 @@ self: { ]; description = "Horizon Stable Package Set Pretty Printer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "horizontal-rule" = callPackage @@ -177285,6 +177291,8 @@ self: { ]; description = "examples for learn-physics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "learning-hmm" = callPackage @@ -227252,6 +227260,8 @@ self: { testHaskellDepends = [ base hspec hspec-core ]; description = "Simple work queue for bounded concurrency"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pooled-io" = callPackage From 88e877fe1c764a55db4cc361fefc5d950c601807 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 27 Mar 2023 08:40:14 +0900 Subject: [PATCH 50/84] haskellPackages.ffmpeg-light: force use of ffmpeg-4 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b3c0567dfa00..c10a78de6fa5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2517,6 +2517,10 @@ self: super: { editedCabalFile = null; }) super.true-name); + # ffmpeg-light works against the ffmpeg-4 API, but the default ffmpeg in nixpkgs is ffmpeg-5. + # https://github.com/NixOS/nixpkgs/pull/220972#issuecomment-1484017192 + ffmpeg-light = super.ffmpeg-light.override { ffmpeg = pkgs.ffmpeg_4; }; + # posix-api has had broken tests since 2020 (until at least 2023-01-11) # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14 posix-api = dontCheck super.posix-api; From e9c1dac2ab807e180cfbf5652872ba6410ed9b36 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 27 Mar 2023 14:16:14 +0200 Subject: [PATCH 51/84] haskellPackages.cabal-install.scope.vector: don't pull in doctest doctest depends on GHC which triggers inconsistent dependencies similarly to hspec* < 2.10, so we need to avoid this. This problem newly cropped up since we enabled tests for vector in #222190. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dd4b6da849cc..609aabe52ee3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -70,9 +70,9 @@ self: super: { # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. hspec-discover_2_10_10 = dontCheck csuper.hspec-discover_2_10_10; - } // lib.optionalAttrs (lib.versions.majorMinor self.ghc.version == "8.10") { + # Prevent dependency on doctest which causes an inconsistent dependency - # due to depending on ghc-8.10.7 (with bundled process) vs. process 1.6.16.0 + # due to depending on ghc which depends on directory etc. vector = dontCheck csuper.vector; }; in From 2e6a5a6ad216faaf53435f236dcf5d99dd961207 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sun, 26 Mar 2023 17:37:36 +0000 Subject: [PATCH 52/84] haskell.packages.ghc96.memory: bump version This change enables using the memory package. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 8ac5d1ee9f74..59b52871bbc3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -67,6 +67,8 @@ self: super: { tasty-inspection-testing = doDistribute self.tasty-inspection-testing_0_2; # Too strict bounds on ghc-prim and template-haskell aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); + # Too strict bounds on ghc-prim + memory = doDistribute self.memory_0_18_0; ghc-lib = doDistribute self.ghc-lib_9_6_1_20230312; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_1_20230312; From bbc633e5fe1566e98315ae664e95083aaa64d17d Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sun, 26 Mar 2023 17:52:24 +0000 Subject: [PATCH 53/84] haskell.packages.ghc96.parallel: bump version --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 59b52871bbc3..73e9c81ae55b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -134,6 +134,8 @@ self: super: { generically = jailbreakWhileRevision 0 super.generically; # Revision 3 lifts offending template-haskell bound hackage-security = jailbreakWhileRevision 2 super.hackage-security; + # Revision 6 lifts offending base bound + parallel = jailbreakWhileRevision 5 super.parallel; # # Compilation failure workarounds From b9afffd107bb47fefde3ecccd10501de19b3441b Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Mon, 27 Mar 2023 11:42:38 +0000 Subject: [PATCH 54/84] haskell.packages.ghc96.foundation: add build patch --- .../haskell-modules/configuration-ghc-9.6.x.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 73e9c81ae55b..a7f19e119d4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -141,6 +141,18 @@ self: super: { # Compilation failure workarounds # + # Add missing Functor instance for Tuple2 + # https://github.com/haskell-foundation/foundation/pull/572 + foundation = appendPatches [ + (pkgs.fetchpatch { + name = "foundation-pr-572.patch"; + url = + "https://github.com/haskell-foundation/foundation/commit/d3136f4bb8b69e273535352620e53f2196941b35.patch"; + sha256 = "sha256-oPadhQdCPJHICdCPxn+GsSQUARIYODG8Ed6g2sK+eC4="; + stripLen = 1; + }) + ] (super.foundation); + # Test suite doesn't compile with base-4.18 / GHC 9.6 # https://github.com/dreixel/syb/issues/40 syb = dontCheck super.syb; From 192d03bee462f0eca2112c4f136fb1aac084f165 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 29 Mar 2023 03:27:19 +0200 Subject: [PATCH 55/84] writers: fix aarch64-darwin workaround if content is a string When authoring #220966, I missed that the `//` would take effect solely in the else branch, fixing hledger-check-fancyassertions, but not tests.writers.bin.haskell. --- pkgs/build-support/writers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index ca0184beeb0c..2c26f350fbd7 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -71,12 +71,12 @@ let let name = last (builtins.split "/" nameOrPath); in - pkgs.runCommand name (if (types.str.check content) then { + pkgs.runCommand name ((if (types.str.check content) then { inherit content; passAsFile = [ "content" ]; } else { contentPath = content; - } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { # post-link-hook expects codesign_allocate to be in PATH # https://github.com/NixOS/nixpkgs/issues/154203 # https://github.com/NixOS/nixpkgs/issues/148189 From 9017b4419610c2453425a7a1b55b4ae47073e4f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Mar 2023 03:10:34 +0000 Subject: [PATCH 56/84] erlfmt: 1.1.0 -> 1.2.0 --- pkgs/development/beam-modules/erlfmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix index f88ea619da31..8c1d3f72c7e0 100644 --- a/pkgs/development/beam-modules/erlfmt/default.nix +++ b/pkgs/development/beam-modules/erlfmt/default.nix @@ -2,12 +2,12 @@ rebar3Relx rec { pname = "erlfmt"; - version = "1.1.0"; + version = "1.2.0"; releaseType = "escript"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "erlfmt"; - sha256 = "sha256-diZCyw4eR+h/Pc73HDfnFaXnNXwqu3XabTbeiWVPNPI="; + sha256 = "sha256-mma4QH6GlayTG5I9hW9wNZph/IJcCXjiY7Ft3hfxaPg="; rev = "v${version}"; }; meta = with lib; { From cd678a01f0d35dad7c89ad418a86afaba7eab517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Mar 2023 03:38:12 +0000 Subject: [PATCH 57/84] railway: 3.0.13 -> 3.0.18 --- pkgs/development/tools/railway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 0dc9249d5589..ea1bf907d48a 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.0.13"; + version = "3.0.18"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ZLzIbA/eIu8cP9F6xSl8exFXDuyw7cYLAy0Zg+dJEzw="; + hash = "sha256-CL75WefdcBmGSoqReHM2eecsQPcciRfat7ULhc4TfV4="; }; - cargoHash = "sha256-1CqGs1pT/QaA+fFfuhP/O74wpFeVCHFsubIIo+UVLf8="; + cargoHash = "sha256-/uiz7dmuuByS99y7rXwyCtFGIR+DIenky4dusJCMFZg="; nativeBuildInputs = [ pkg-config ]; From e3e2955768ec3a9b76519be5633c7ad62c5d4b84 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 29 Mar 2023 12:50:51 +0900 Subject: [PATCH 58/84] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1792734](https://hydra.nixos.org/eval/1792734) of nixpkgs commit [192d03b](https://github.com/NixOS/nixpkgs/commits/192d03bee462f0eca2112c4f136fb1aac084f165) as of 2023-03-29 03:44 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f938236c59a8..a0135745fc82 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5342,6 +5342,7 @@ broken-packages: - th-pprint - threadmanager - threadscope + - thread-supervisor # test failure in job https://hydra.nixos.org/build/214156434 at 2023-03-29 - threepenny-editors - threepenny-gui-contextmenu - threepenny-gui-flexbox diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9646ba3aff0b..463e86eaf7e4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -289002,6 +289002,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simplified implementation of Erlang/OTP like supervisor over thread"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "thread-utils-context" = callPackage From f9262fba9c1d55a5058f912f9f25891aa66fd39e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 29 Mar 2023 14:39:14 +0900 Subject: [PATCH 59/84] haskellPackages: filter out Darwin jobs from mergeable job in release-haskell.nix --- pkgs/top-level/release-haskell.nix | 65 +++++++++++++++++------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4e86000093b4..030739893bb5 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -557,34 +557,43 @@ let ''; maintainers = lib.teams.haskell.members; }; - constituents = accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]; + constituents = + let + # Filter out all Darwin derivations. We don't want flakey Darwin + # derivations and flakey Hydra Darwin builders to block the + # mergeable job from successfully building. + filterInLinux = + lib.filter (drv: drv.system == "x86_64-linux" || drv.system == "aarch64-linux"); + in + filterInLinux + (accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]); }; maintained = pkgs.releaseTools.aggregate { name = "maintained-haskell-packages"; From 53e55988e58f99de9c85b69b6956efc2d20a9c3a Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 29 Mar 2023 13:59:06 +0200 Subject: [PATCH 60/84] logseq: 0.9.0 -> 0.9.1 https://github.com/logseq/logseq/releases/tag/0.9.1 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index b51a4eeb4a79..c2610304226c 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-5oX1LhqWvNiMF9ZI7BvpHe4bhB3vQp6dsjLYMQ9Jy+o="; + hash = "sha256-8jplCIylG1xbpp/VGnU06MwfqWe2E9iVQApZaWbhuVc="; name = "${pname}-${version}.AppImage"; }; From 68f3f0d5359355a594a02204bb03dd4f216b49c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Mar 2023 17:09:38 +0000 Subject: [PATCH 61/84] oh-my-zsh: 2023-03-12 -> 2023-03-28 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index ef6ce0c6f636..e61d400fbb8e 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-03-12"; + version = "2023-03-28"; pname = "oh-my-zsh"; - rev = "72732a224e886933df6b64a49ec6f5e94c884612"; + rev = "fcbdc330ff50617c8b84d39ce069cc75df41108f"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "L3cItc1DWNE3MRRlJC9mbOwqA1JuD6k8gqrJc7XpJkk="; + sha256 = "MadBDgV3a4jOB5vmUVT4WUDJavQEQVjSYTmGUOApQ/s="; }; strictDeps = true; From 87698250c4583aecc51e98585ed673a2c724c9f9 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 28 Mar 2023 14:32:39 -0700 Subject: [PATCH 62/84] parsec-bin: pin to ffmpeg_4 fixes runtime missing library errors --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 707205567ae4..05b74d7b5127 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32600,7 +32600,9 @@ with pkgs; enableDbusUi = false; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; + parsec-bin = callPackage ../applications/misc/parsec/bin.nix { + ffmpeg = ffmpeg_4; + }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; From 0e2d117c104b3cd732f54582d56cc11d68043ca3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 22:44:17 +0200 Subject: [PATCH 63/84] python310Packages.fastcore: 1.5.28 -> 1.5.29 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.5.28...1.5.29 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 14418d716c9d..05fa9b1c4329 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.28"; + version = "1.5.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY="; + hash = "sha256-yCPOF150TdkPHfLl8Jo2oow+91IzRKgnXo3eQMn5wK0="; }; propagatedBuildInputs = [ From 1b9aa2e67986688d56f3ec43021d9b9a894a95e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 22:47:03 +0200 Subject: [PATCH 64/84] python310Packages.fastcore: add changelog to meta --- pkgs/development/python-modules/fastcore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 05fa9b1c4329..544bb26936d6 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Fast AI"; homepage = "https://github.com/fastai/fastcore"; + changelog = "https://github.com/fastai/fastcore/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From f6de2d9784eee8ea542c11e95865dc6407b51925 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Mar 2023 21:09:50 +0000 Subject: [PATCH 65/84] chart-testing: 3.7.1 -> 3.8.0 --- .../networking/cluster/helm/chart-testing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 016eb40745b0..5433622c1605 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - hash = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro="; + hash = "sha256-ccP3t+Q4aZviYw8by2JDiuKHt7o6EKFxBxlhEntmV5A="; }; - vendorHash = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk="; + vendorHash = "sha256-4x/8uDCfrERC+ww+iyP+dHIQ820IOARXj60KnjqeDkM="; postPatch = '' substituteInPlace pkg/config/config.go \ From a1217a2ecfecb9de02c2cd5e2b5036408c1a0cfc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 23:26:09 +0200 Subject: [PATCH 66/84] qovery-cli: 0.55.0 -> 0.55.2 Diff: https://github.com/Qovery/qovery-cli/compare/v0.55.0...v0.55.2 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.55.2 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 50b83a6664b7..e1ee37c32836 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.55.0"; + version = "0.55.2"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-3MiKivewGl4J/yQJ+wLTwh8w6HO8XuX9/b6mwtbvW3o="; + hash = "sha256-/KWkU9IpUWhVOyiNkYg98PSltS97XNWXaz9haN11Dac="; }; - vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; + vendorHash = "sha256-1krHpwjs4kGhPMBF5j3iqUBo8TGKs1h+nDCmDmviPu4="; nativeBuildInputs = [ installShellFiles ]; From 25c003d6d52c67c72c74b274c8bc2b64c4e0daa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 23:28:03 +0200 Subject: [PATCH 67/84] python310Packages.yalexs-ble: 2.1.12 -> 2.1.14 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.1.14/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index fd36854ebb6e..cc881824cca3 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.12"; + version = "2.1.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+Kae+mqx4ySXX8FlpVPdbXOJ3IsYfgdm7mM5V8f9JOI="; + hash = "sha256-aTtcp6u+/fPHRB/FShdzfCv5haja+Vyo/WLm7GLvadw="; }; nativeBuildInputs = [ From 9e08509f2b092be808bd7ce7ee24c2cfac8c038c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Mar 2023 22:37:47 +0000 Subject: [PATCH 68/84] goresym: 2.1.1 -> 2.2 --- pkgs/development/tools/goresym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index 245f86788a59..acefcfb726a4 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tf/oD0f8XLG2CuiQvduVberzWSetojVRBrSd83snK5Q="; + sha256 = "sha256-he71OrOIZ75Z4S3mf7AuQsupnLu/rsLGV2DRXyxRGS4="; }; subPackages = [ "." ]; From 9e87f7dbde2f1e816f6fb04cfee6b1f316360505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Mar 2023 15:04:57 -0700 Subject: [PATCH 69/84] nextcloud-notify_push: 0.6.1 -> 0.6.2 Diff: https://github.com/nextcloud/notify_push/compare/v0.6.1...v0.6.2 --- pkgs/servers/nextcloud/notify_push.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 4d326a35757f..63bce5c02572 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-0quQmi+SFNVlDFUWJYM2WgOCi22KJ/eBLvxBl9+M3g4="; + hash = "sha256-YCIXpCNKqdCSvq7CSPSwoPc2gpCnnda8S7I4FzpezMc="; }; - cargoHash = "sha256-jZC71OCexTGVq/CguMiDHIbF7QaulIzUaZW2d0x98nw="; + cargoHash = "sha256-l6gMz/iJeLl+RLjOiR9U1m6V/rK+RWM84bQiz4jCFtY="; passthru = { test_client = rustPlatform.buildRustPackage { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-a8KcWnHr1bCS255ChOC6piXfVo/nJy/yVHNLCuHXoq4="; + cargoHash = "sha256-4jQvlxU3S3twTpiLab8BXC6ZSPSWN6ftK3GzfKnjHSE="; }; }; From c3c78d68133c010133f09727e57af78aa9f26c9c Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 30 Mar 2023 08:35:50 +0900 Subject: [PATCH 70/84] haskellPackages.guardian: mark broken It appears that a transitive dependency uses doctest, which is not compatible with the Cabal library in scope for guardian. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a0135745fc82..7d65e856ed02 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1914,6 +1914,7 @@ broken-packages: - gtksourceview2 - gtksourceview3 - gtk-toy + - guardian # transitive dependency uses doctest, but doctest doesn't build with newer Cabal version - guess-combinator - gulcii - gw diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 463e86eaf7e4..8e0e8c6bb792 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -123336,7 +123336,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "The border guardian for your package dependencies"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "guardian"; + broken = true; }) {}; "guess-combinator" = callPackage From 1dc2dcbf44a7a2dfc9b0a7b9ffffbf6d52cb87df Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 29 Mar 2023 19:57:52 -0400 Subject: [PATCH 71/84] cargo-all-features: 1.7.0 -> 1.9.0 --- .../tools/rust/cargo-all-features/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/development/tools/rust/cargo-all-features/default.nix index 6b3965afc263..a61d55882108 100644 --- a/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -1,17 +1,18 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, rustPlatform +, fetchCrate +}: rustPlatform.buildRustPackage rec { pname = "cargo-all-features"; - version = "1.7.0"; + version = "1.9.0"; - src = fetchFromGitHub { - owner = "frewsxcv"; - repo = pname; - rev = version; - sha256 = "sha256-p9UQaqytqpD2u9X9zaTPIgVEloU2UbD/AxVERNs1Lt8="; + src = fetchCrate { + inherit pname version; + hash = "sha256-OLnz1SmMLs/yats/lZugqNUlBQHSNR1bOuEmnHGdoN8="; }; - cargoSha256 = "sha256-krtuLFQlInqdv7j8v13/X3lL0JdaMsApb9Ga5muThgw="; + cargoHash = "sha256-Gg5tF8IvbtIoqR0AKRS7IbcCNOCJO8oxwX0KkUr+l/M="; meta = with lib; { description = "A Cargo subcommand to build and test all feature flag combinations"; From 3690b7e88584f4f7d59e4ee6a89dc5c58162c8f3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 29 Mar 2023 20:02:33 -0400 Subject: [PATCH 72/84] cargo-vet: 0.5.2 -> 0.6.1 Diff: https://github.com/mozilla/cargo-vet/compare/0.5.2...0.6.1 --- pkgs/development/tools/rust/cargo-vet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index 468a5dd04c2d..51d33f517d69 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-vet"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = version; - sha256 = "sha256-+Qbq3EARedsaPtSTfR/UCC/1p0b/QmvriG2AIyx8coo="; + sha256 = "sha256-PAqpVixBdytHvSUu03OyoA1QGBxmmoeV78x6wCiCemQ="; }; - cargoSha256 = "sha256-Vij4vq+04fLpbcDpYVMBVl3QNVZprUYcVLB28mrjUOg="; + cargoSha256 = "sha256-dsaDpDa/BNqnL3K4a1mg3uEyM094/UO73MzJD9YaAwE="; buildInputs = lib.optional stdenv.isDarwin Security; From 6fc5b40ed4857c78e46e4ea544446f540c419f87 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 30 Mar 2023 00:02:59 +0000 Subject: [PATCH 73/84] identity: init at 0.5.0 * identity: init at 0.5.0 (#223048) * identity: fix meta.description order --------- Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- .../graphics/identity/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/graphics/identity/default.nix diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/applications/graphics/identity/default.nix new file mode 100644 index 000000000000..ba459d5551a5 --- /dev/null +++ b/pkgs/applications/graphics/identity/default.nix @@ -0,0 +1,69 @@ +{ appstream-glib +, blueprint-compiler +, desktop-file-utils +, fetchFromGitLab +, gst_all_1 +, gtk4 +, lib +, libadwaita +, meson +, ninja +, nix-update-script +, pkg-config +, rustPlatform +, stdenv +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "identity"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "YaLTeR"; + repo = "identity"; + rev = "v${version}"; + sha256 = "sha256-ZBK2Vc2wnohABnWXRtmRdAAOnkTIHt4RriZitu8BW1A="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-5NUnrBHj3INhh9zbdwPink47cP6uJiRyzzdj+yiSVD8="; + }; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk4 + libadwaita + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A program for comparing multiple versions of an image or video"; + homepage = "https://gitlab.gnome.org/YaLTeR/identity"; + maintainers = [ lib.maintainers.paveloom ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9271fa9495cc..41ffa8194276 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30896,6 +30896,8 @@ with pkgs; ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; + identity = callPackage ../applications/graphics/identity { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { From 9bacd9d621f9f71b5244301a5f8345751fb54810 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Mar 2023 01:03:02 +0000 Subject: [PATCH 74/84] oh-my-posh: 14.14.3 -> 14.19.3 --- pkgs/development/tools/oh-my-posh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 5a2c7dae9b32..45d7664adad3 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.14.3"; + version = "14.19.3"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rxsc77M30aDuDgOtXWF2sQkzv2Xv4sxZ5JlkaqO/AbI="; + hash = "sha256-MPtnZd0pgs7bhh7MST1OWSMqcFw57AlWV7EcNZSFlo4="; }; - vendorHash = "sha256-eMmp67B2udc8mhpVq2nHX+v1l1h3dXvjVXenZqCA6m4="; + vendorHash = "sha256-MM6WwEs2BMkfpTsDFIqwpIROMs8zbbT5OsP6FXwRvy8="; sourceRoot = "source/src"; From d4fecf6c20b1ee29ba30663df448bdb35d110b1e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 30 Mar 2023 01:04:00 +0000 Subject: [PATCH 75/84] oh-my-posh: 14.19.3 -> 14.22.0 https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v14.22.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 45d7664adad3..05ac41f3b915 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.19.3"; + version = "14.22.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MPtnZd0pgs7bhh7MST1OWSMqcFw57AlWV7EcNZSFlo4="; + hash = "sha256-kyASLWzjTFc10XWDLbc66+kaXjBaYmlgBc0Y8fF23Jk="; }; vendorHash = "sha256-MM6WwEs2BMkfpTsDFIqwpIROMs8zbbT5OsP6FXwRvy8="; From ac70a84187539c0904736907deba8a8aaf7db158 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 26 Mar 2023 22:52:52 +0800 Subject: [PATCH 76/84] litehtml: don't search for non-existant gumbo cmake config --- pkgs/development/libraries/litehtml/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/development/libraries/litehtml/default.nix index 6e3db75f5ebb..3927f7cce4a5 100644 --- a/pkgs/development/libraries/litehtml/default.nix +++ b/pkgs/development/libraries/litehtml/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; }; + # Don't search for non-existant gumbo cmake config + # This will mislead cmake that litehtml is not found + # Affects build of pkgs that depend on litehtml + postPatch = '' + substituteInPlace cmake/litehtmlConfig.cmake \ + --replace "find_dependency(gumbo)" "" + ''; + nativeBuildInputs = [ cmake ]; From 458306a751776070fe337ab5f6439f2245389d85 Mon Sep 17 00:00:00 2001 From: JR Boyens Date: Wed, 29 Mar 2023 21:09:31 -0700 Subject: [PATCH 77/84] google-cloud-sdk: add libxcrypt-legacy --- pkgs/tools/admin/google-cloud-sdk/components.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index a0ff00aafc92..4f13bca3a20c 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -5,6 +5,7 @@ , snapshotPath , autoPatchelfHook , python3 +, libxcrypt-legacy , ... }: @@ -167,6 +168,9 @@ let ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = [ + libxcrypt-legacy + ]; passthru = { dependencies = filterForSystem dependencies; }; From e64d0861e610e285e4a2e59203d600a097d59b31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 03:06:03 +0000 Subject: [PATCH 78/84] =?UTF-8?q?terraform-providers.aiven:=204.1.3=20?= =?UTF-8?q?=E2=86=92=204.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b6dc8d1280a3..a9c28ed6f199 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,13 +28,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-wVgfT/1o5Hz7xbX3OOfjF2P5bhV7kPxnXZOU/3erRpk=", + "hash": "sha256-dOdq/At0aUTaivvm557sgPwxC9EfRBexYrtpri8tzg4=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.1.3", + "rev": "v4.2.0", "spdx": "MIT", - "vendorHash": "sha256-wz1Wy/4GI8/Wlu828RX7OE+XJHzCS/X45tW3Jb7Tx3E=" + "vendorHash": "sha256-QDO/xE9ZK7+UscjVBV06BMGavExD248PhLIrDB5oROU=" }, "akamai": { "hash": "sha256-j9KQWgcBjZiQrWjRdhQp82GawF/U6Y469MKN5V2R6xU=", From 3d97366dc9421809cc550ec5a9e161c08d76255a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 03:07:13 +0000 Subject: [PATCH 79/84] =?UTF-8?q?terraform-providers.cloudfoundry:=200.50.?= =?UTF-8?q?5=20=E2=86=92=200.50.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a9c28ed6f199..2a1f70d57014 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -228,13 +228,13 @@ "vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24=" }, "cloudfoundry": { - "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=", + "hash": "sha256-/2MUyn5+lpIp/UeT/7hfwLKF/mXTgtlJSs/B7lzXFys=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.50.5", + "rev": "v0.50.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-2ulAzgDBdcYTqGRmEL9+h9MglZ9bt5WRXzNP099g2kk=" + "vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE=" }, "cloudinit": { "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", From 284535322c858bd2399970425e6387150b28a0c4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 03:08:08 +0000 Subject: [PATCH 80/84] =?UTF-8?q?terraform-providers.fastly:=204.1.1=20?= =?UTF-8?q?=E2=86=92=204.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2a1f70d57014..55f0b094a6a2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-FO6SXpFk/DxOvDszwYiftB65JVNoN90JG6JFc8zid50=", + "hash": "sha256-hJHErQ8vDY9c1uaqiLYdxBns3U3XvAGKsobH8fit4HI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.1.1", + "rev": "v4.1.2", "spdx": "MPL-2.0", "vendorHash": null }, From f5431155e24accf289485e1d4f3dde2f74535017 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 03:10:13 +0000 Subject: [PATCH 81/84] =?UTF-8?q?terraform-providers.okta:=203.44.0=20?= =?UTF-8?q?=E2=86=92=203.45.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 55f0b094a6a2..723182401066 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -820,13 +820,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-O4ZTGYM9r3XFzr2Nx/Tt2Fs7WOqQuQWfo+ZMmZyg+mo=", + "hash": "sha256-j4tOWcY3x4FpfCEdB7x5XP7Pqms97tYtEvGDn8Fjst8=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.44.0", + "rev": "v3.45.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KYOzbbBjE2C7+1St62rs9mlJFhpIlWQJ0reh5V5tQsk=" + "vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 52290f39ff7aa9627d5698ae48e188d570a03c3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 03:14:02 +0000 Subject: [PATCH 82/84] =?UTF-8?q?terraform-providers.tencentcloud:=201.79.?= =?UTF-8?q?18=20=E2=86=92=201.79.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 723182401066..18dfd6f2d3be 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1099,11 +1099,11 @@ "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" }, "tencentcloud": { - "hash": "sha256-N6x3CKpLL62lc+V038740EGBicjroc07KhkvyCYgn24=", + "hash": "sha256-Lf6IKNdl7eiFBdCSbuXaawMno7grlIQBwM99sg75sS0=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.18", + "rev": "v1.79.19", "spdx": "MPL-2.0", "vendorHash": null }, From 29b1dacd2be29a9013e8d6bcea9525db50f06d3d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 11 Mar 2023 08:47:34 +1000 Subject: [PATCH 83/84] containerd: 1.6.19 -> 1.7.0 Diff: https://github.com/containerd/containerd/compare/v1.6.19...v1.7.0 Changelog: https://github.com/containerd/containerd/releases/tag/v1.7.0 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index d5fb7df67f70..c5d1a4d68857 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.19"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8="; + hash = "sha256-OHgakSNqIbXYDC7cTw2fy0HlElQMilDbSD5SSjbYJhc="; }; vendorHash = null; From 0dff2d8a48208d418f08f5ed5f96d502e93af599 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 29 Mar 2023 13:33:47 +1000 Subject: [PATCH 84/84] containerd: add kubernetes to passthru.tests --- pkgs/applications/virtualization/containerd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index c5d1a4d68857..dced2dca53f7 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -6,6 +6,7 @@ , installShellFiles , util-linux , nixosTests +, kubernetes }: buildGoModule rec { @@ -42,7 +43,7 @@ buildGoModule rec { runHook postInstall ''; - passthru.tests = { inherit (nixosTests) docker; }; + passthru.tests = { inherit (nixosTests) docker; } // kubernetes.tests; meta = with lib; { changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}";