From 21c2b85ec1fbb8fe799555975413cbb9f63f76af Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 19:09:14 +0200 Subject: [PATCH 01/42] all-cabal-hashes: 2021-05-19T07:17:55Z -> 2021-06-02T14:32:36Z 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 f53ef94c47d4..7c4e3b9a8694 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "0fb7f9edea05a2b464b5667debe1e3ece585c185", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fb7f9edea05a2b464b5667debe1e3ece585c185.tar.gz", - "sha256": "01rzbda8g62gj2x3if46lglis9gqw3qfpqyiv2lrnm7alsg36ld9", - "msg": "Update from Hackage at 2021-05-19T07:17:55Z" + "commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz", + "sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k", + "msg": "Update from Hackage at 2021-06-02T14:32:36Z" } From 3317a7460bd6b951c1e69c03e2fef95b96548e7b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 19:10:16 +0200 Subject: [PATCH 02/42] Stackage Nightly: 2021-05-19 -> 2021-06-01 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 122 ++++++++++-------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a8c353cd6a7c..bfe0b93b3e41 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage Nightly 2021-05-19 +# Stackage Nightly 2021-06-01 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,6 +11,8 @@ default-package-overrides: - ad ==4.4.1 - adjunctions ==4.4 - adler32 ==0.1.2.0 + - aern2-mp ==0.2.6.0 + - aern2-real ==0.2.6.0 - aeson ==1.5.6.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 @@ -27,7 +29,7 @@ default-package-overrides: - aeson-pretty ==0.8.8 - aeson-qq ==0.8.3 - aeson-schemas ==1.3.3 - - aeson-typescript ==0.3.0.0 + - aeson-typescript ==0.3.0.1 - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 @@ -148,10 +150,10 @@ default-package-overrides: - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - ap-normalize ==0.1.0.0 + - ap-normalize ==0.1.0.1 - appar ==0.1.8 - appendmap ==0.1.5 - - apply-refact ==0.9.2.0 + - apply-refact ==0.9.3.0 - apportionment ==0.0.0.3 - approximate ==0.3.4 - approximate-equality ==1.1.0.2 @@ -176,7 +178,7 @@ default-package-overrides: - asn1-types ==0.3.4 - assert-failure ==0.1.2.5 - assoc ==1.0.2 - - astro ==0.4.2.1 + - astro ==0.4.3.0 - async ==2.2.3 - async-extra ==0.2.0.0 - async-pool ==0.9.1 @@ -201,6 +203,8 @@ default-package-overrides: - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 + - aws-xray-client ==0.1.0.0 + - aws-xray-client-wai ==0.1.0.0 - backprop ==0.2.6.4 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 @@ -356,7 +360,7 @@ default-package-overrides: - cayley-client ==0.4.15 - cborg ==0.2.5.0 - cborg-json ==0.2.2.0 - - cdar-mBound ==0.1.0.1 + - cdar-mBound ==0.1.0.2 - c-enum ==0.1.0.1 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -391,9 +395,9 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.3.1.1 - citeproc ==0.3.0.9 - - clash-ghc ==1.4.1 - - clash-lib ==1.4.1 - - clash-prelude ==1.4.1 + - clash-ghc ==1.4.2 + - clash-lib ==1.4.2 + - clash-prelude ==1.4.2 - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - clay ==0.13.3 @@ -519,6 +523,7 @@ default-package-overrides: - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 + - c-struct ==0.1.0.1 - csv ==0.1.2 - ctrie ==0.2 - cubicbezier ==0.6.0.6 @@ -573,6 +578,7 @@ default-package-overrides: - data-textual ==0.3.0.3 - dataurl ==0.1.0.0 - DAV ==1.3.4 + - DBFunctor ==0.1.2.1 - dbus ==1.2.17 - dbus-hslogger ==0.1.0.1 - debian ==4.0.2 @@ -708,7 +714,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.4.1.1 + - esqueleto ==3.5.0.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -734,7 +740,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.10 + - express ==0.1.12 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -747,18 +753,18 @@ default-package-overrides: - fakedata-parser ==0.1.0.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.0.2.3 + - faktory ==1.0.3.0 - fast-digits ==0.3.0.0 - fast-logger ==3.0.5 - fast-math ==1.0.2 - fb ==2.1.1 - - fclabels ==2.0.5 + - fclabels ==2.0.5.1 - feature-flags ==0.1.0.1 - fedora-dists ==1.1.2 - fedora-haskell-tools ==0.9 - feed ==1.3.2.0 - FenwickTree ==0.1.2.1 - - fft ==0.1.8.6 + - fft ==0.1.8.7 - fgl ==5.7.0.3 - file-embed ==0.0.14.0 - file-embed-lzma ==0 @@ -938,7 +944,7 @@ default-package-overrides: - gitrev ==1.3.1 - gi-xlib ==2.0.9 - gl ==0.9 - - glabrous ==2.0.3 + - glabrous ==2.0.4 - GLFW-b ==3.3.0.0 - Glob ==0.10.1 - gloss ==1.13.2.1 @@ -947,6 +953,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gluturtle ==0.0.58.1 - gnuplot ==0.5.6.1 + - goldplate ==0.2.0 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.2 - gothic ==0.1.6 @@ -974,16 +981,17 @@ default-package-overrides: - haddock-library ==1.9.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.4 + - hal ==0.4.8 - half ==0.3.1 - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.1.3 - - happstack-server ==7.7.0 + - happstack-server ==7.7.1 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 - - hasbolt ==0.1.4.5 + - hasbolt ==0.1.5.0 - hashable ==1.3.0.0 - hashable-time ==0.2.1 - hashids ==1.0.2.4 @@ -1240,7 +1248,7 @@ default-package-overrides: - inline-r ==0.10.4 - inliterate ==0.1.0 - input-parsers ==0.2.2 - - insert-ordered-containers ==0.2.4 + - insert-ordered-containers ==0.2.5 - inspection-testing ==0.4.5.0 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 @@ -1289,7 +1297,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.2 - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.4 + - jira-wiki-markup ==1.3.5 - jose ==0.8.4 - jose-jwt ==0.9.2 - js-chart ==2.9.4.1 @@ -1355,7 +1363,7 @@ default-package-overrides: - lazyio ==0.1.0.4 - lazysmallcheck ==0.6 - lca ==0.4 - - leancheck ==0.9.4 + - leancheck ==0.9.6 - leancheck-instances ==0.0.4 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 @@ -1402,6 +1410,7 @@ default-package-overrides: - list-t ==1.0.4 - list-transformer ==1.0.7 - ListTree ==0.2.3 + - literatex ==0.1.0.0 - little-rio ==0.2.2 - llvm-hs ==9.0.1 - llvm-hs-pure ==9.0.0 @@ -1501,7 +1510,7 @@ default-package-overrides: - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - - mixed-types-num ==0.5.3.1 + - mixed-types-num ==0.5.7.0 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1519,7 +1528,7 @@ default-package-overrides: - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - - monad-coroutine ==0.9.1 + - monad-coroutine ==0.9.1.2 - monad-extras ==0.6.0 - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 @@ -1597,6 +1606,8 @@ default-package-overrides: - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 + - net-mqtt ==0.7.1.0 + - net-mqtt-lens ==0.1.0.0 - netpbm ==1.0.4 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1699,7 +1710,7 @@ default-package-overrides: - pagure-cli ==0.2 - pandoc ==2.13 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.2.1 + - pandoc-plot ==1.2.2 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - pantry ==0.5.2.1 @@ -1716,7 +1727,7 @@ default-package-overrides: - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.8 + - partial-semigroup ==0.5.1.12 - password ==3.0.0.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 @@ -1733,7 +1744,7 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.1 - pcg-random ==0.1.3.7 - - pcre2 ==1.1.4 + - pcre2 ==1.1.5 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 @@ -1747,17 +1758,16 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.11.0.4 - - persistent-documentation ==0.1.0.2 + - persistent ==2.13.0.2 - persistent-mtl ==0.2.1.0 - - persistent-mysql ==2.10.3.1 + - persistent-mysql ==2.13.0.1 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.11.0.1 - - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.1.0 - - persistent-template ==2.9.1.0 - - persistent-test ==2.0.3.5 - - persistent-typed-db ==0.1.0.2 + - persistent-postgresql ==2.13.0.1 + - persistent-qq ==2.12.0.1 + - persistent-sqlite ==2.13.0.3 + - persistent-template ==2.12.0.0 + - persistent-test ==2.13.0.3 + - persistent-typed-db ==0.1.0.4 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 @@ -1917,7 +1927,7 @@ default-package-overrides: - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - - Rasterific ==0.7.5.3 + - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - ratel ==1.0.15 - rate-limit ==1.4.2 @@ -1936,7 +1946,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.10 + - record-dot-preprocessor ==0.2.11 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2005,8 +2015,8 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.4 - - rp-tree ==0.3.5 + - rpmbuild-order ==0.4.5 + - rp-tree ==0.3.6 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 @@ -2034,13 +2044,13 @@ default-package-overrides: - sandwich-webdriver ==0.1.0.4 - say ==0.1.0.1 - sbp ==2.6.3 - - sbv ==8.14 + - sbv ==8.15 - scalpel ==0.6.2 - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==1.5.0 - - scientific ==0.3.6.2 + - scientific ==0.3.7.0 - scotty ==0.12 - scrypt ==0.5.0 - sdl2 ==2.5.3.0 @@ -2081,6 +2091,7 @@ default-package-overrides: - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.6.0 - servant-auth-swagger ==0.2.10.1 + - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 - servant-client ==0.18.2 - servant-client-core ==0.18.2 @@ -2191,7 +2202,7 @@ default-package-overrides: - splint ==1.0.1.4 - split ==0.2.3.4 - splitmix ==0.1.0.3 - - splitmix-distributions ==0.8.0.0 + - splitmix-distributions ==0.9.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlcli ==0.2.2.0 @@ -2237,6 +2248,7 @@ default-package-overrides: - streaming-commons ==0.2.2.1 - streamly ==0.7.3 - streams ==3.3 + - streamt ==0.5.0.0 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.5 @@ -2247,7 +2259,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.1.0 + - string-interpolate ==0.3.1.1 - string-qq ==0.0.4 - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 @@ -2322,7 +2334,7 @@ default-package-overrides: - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 - tasty-wai ==0.1.1.1 - - Taxonomy ==2.1.0 + - Taxonomy ==2.2.0 - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1.1 @@ -2348,7 +2360,7 @@ default-package-overrides: - text-builder ==0.6.6.2 - text-conversions ==0.3.1 - text-format ==0.3.2 - - text-icu ==0.7.0.1 + - text-icu ==0.7.1.0 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - textlocal ==0.1.0.5 @@ -2505,12 +2517,12 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.16 + - unliftio ==0.2.17 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - - unordered-containers ==0.2.13.0 + - unordered-containers ==0.2.14.0 - unsafe ==0.0 - urbit-hob ==0.3.3 - uri-bytestring ==0.3.3.0 @@ -2542,6 +2554,7 @@ default-package-overrides: - validity-vector ==0.2.0.3 - valor ==0.1.0.0 - vault ==0.3.1.5 + - vcs-ignore ==0.0.1.0 - vec ==0.4 - vector ==0.12.3.0 - vector-algorithms ==0.8.0.4 @@ -2563,7 +2576,7 @@ default-package-overrides: - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 - - vinyl ==0.13.2 + - vinyl ==0.13.3 - void ==0.7.3 - vty ==5.33 - wai ==3.2.3 @@ -2588,8 +2601,8 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.15 - - warp-tls ==3.3.0 + - warp ==3.3.16 + - warp-tls ==3.3.1 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2610,7 +2623,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.3.1.0 + - witch ==0.3.3.0 - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2621,6 +2634,7 @@ default-package-overrides: - wl-pprint-text ==1.2.0.1 - word24 ==2.0.1 - word8 ==0.1.3 + - wordpress-auth ==1.0.0.1 - word-trie ==0.3.0 - word-wrap ==0.4.1 - world-peace ==1.0.2.0 @@ -2664,19 +2678,19 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.3 + - yamlparse-applicative ==0.1.0.4 - yesod ==1.6.1.1 - yesod-auth ==1.6.10.3 - - yesod-auth-hashdb ==1.7.1.6 + - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 - - yesod-core ==1.6.20 + - yesod-core ==1.6.20.1 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.11 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.7 + - yesod-page-cursor ==2.0.0.8 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.7 - yesod-sitemap ==1.6.0 From 7d89be36a863df10e6c926f4ec19b7616c852354 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 2 Jun 2021 19:12:37 +0200 Subject: [PATCH 03/42] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 2533 +++++++++++------ 1 file changed, 1601 insertions(+), 932 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9ec6640f3d90..1acb41a9f743 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3898,26 +3898,26 @@ self: { "DBFunctor" = callPackage ({ mkDerivation, base, bytestring, cassava, cereal, containers - , deepseq, either, MissingH, text, time, transformers - , unordered-containers, vector + , deepseq, either, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "DBFunctor"; - version = "0.1.1.1"; - sha256 = "0n3qmgjf9ly5vpnsvh8rhwbd94l157d1asy95n8yqpmrb6xqc1k4"; + version = "0.1.2.1"; + sha256 = "0ikb4s9g1mrp4pdz1119dq1vci7mfcvcw92xs47rcin26a3ysdcz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector + base bytestring cassava cereal containers deepseq either text time + transformers unordered-containers vector ]; executableHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector + base bytestring cassava cereal containers deepseq either text time + transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector + base bytestring cassava cereal containers deepseq either text time + transformers unordered-containers vector ]; description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; license = lib.licenses.bsd3; @@ -6347,8 +6347,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.7.1"; - sha256 = "10js8xhp1v6gk6aagrzkn5c2c2gg4xml9vavpvhjfvj2jz77rfkm"; + version = "0.7.2"; + sha256 = "08q3zfhb6wf4b8020d63v6zpmb3834ba50hnb478vvjqd8rrp1mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14097,6 +14097,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "NanoID" = callPackage + ({ mkDerivation, base, bytestring, extra, mwc-random + , optparse-applicative + }: + mkDerivation { + pname = "NanoID"; + version = "1.2.0"; + sha256 = "1fwbzdj7cn96fbq4vsp4582p317qw3piy237vxf79d0wmdp006zn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring extra mwc-random ]; + executableHaskellDepends = [ + base bytestring mwc-random optparse-applicative + ]; + description = "NanoID generator"; + license = lib.licenses.bsd3; + }) {}; + "NanoProlog" = callPackage ({ mkDerivation, base, containers, ListLike, uu-parsinglib }: mkDerivation { @@ -15934,32 +15952,34 @@ self: { "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector - , containers, criterion, deepseq, DPutils, hashable, lens - , log-domain, mtl, OrderedBits, primitive, QuickCheck, smallcheck - , tasty, tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector + , containers, criterion, deepseq, DPutils, hashable, hashtables + , lens, log-domain, mtl, OrderedBits, primitive, QuickCheck + , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th + , text, unordered-containers, vector, vector-algorithms , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "PrimitiveArray"; - version = "0.10.0.0"; - sha256 = "0g9shj3zqk8rdp905di9i5g5bhga5msc7cs609fk3nkjm16ms0vi"; + version = "0.10.1.0"; + sha256 = "1qjld82q0fdaav6y9ky0bkmqjxvv48502zd3s9i1b72wn436zhib"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq - DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck text vector vector-binary-instances - vector-th-unbox + DPutils hashable hashtables lens log-domain mtl OrderedBits + primitive QuickCheck smallcheck text unordered-containers vector + vector-algorithms vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ aeson base binary bits cereal cereal-vector containers deepseq - DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck - tasty-th text vector vector-binary-instances vector-th-unbox + DPutils hashable hashtables lens log-domain mtl OrderedBits + primitive QuickCheck smallcheck tasty tasty-quickcheck + tasty-smallcheck tasty-th text unordered-containers vector + vector-algorithms vector-binary-instances vector-th-unbox ]; benchmarkHaskellDepends = [ aeson base binary bits cereal cereal-vector containers criterion - deepseq DPutils hashable lens log-domain mtl OrderedBits primitive - QuickCheck smallcheck text vector vector-binary-instances - vector-th-unbox + deepseq DPutils hashable hashtables lens log-domain mtl OrderedBits + primitive QuickCheck smallcheck text unordered-containers vector + vector-algorithms vector-binary-instances vector-th-unbox ]; description = "Efficient multidimensional arrays"; license = lib.licenses.bsd3; @@ -16029,8 +16049,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Probnet"; - version = "0.1.0.2"; - sha256 = "1jk1y51rda8j4lan2az906fwb5hgqb8s50p0xrhchnf654scm851"; + version = "0.1.0.4"; + sha256 = "02q4c7mp268r8f3p2f37yksssginjrs89ldqljpn80aj53ylcqyf"; libraryHaskellDepends = [ base ]; description = "Geometric Extrapolation of Integer Sequences with error prediction"; license = lib.licenses.mit; @@ -16877,8 +16897,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.5.3"; - sha256 = "164ivzwrla90baqz6gapmcmi1yg5bk0sczqv4xawx3l7dzkz8ghv"; + version = "0.7.5.4"; + sha256 = "07silf2b85kxq7wvl5mnwrg5p0gwzlapipj9hi224i9ix1knn5f1"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -19631,14 +19651,14 @@ self: { "Taxonomy" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl - , parsec, text, vector + , graphviz, parsec, text, vector }: mkDerivation { pname = "Taxonomy"; - version = "2.1.0"; - sha256 = "1l64ma631q1gh57gwg09mpxz66hkhqbc9f9dn2bhy681p8ia7j50"; + version = "2.2.0"; + sha256 = "0rwm3p510k5nmzbdy8bxdviv37mba0bvygxq92f24wqb5gry8w9w"; libraryHaskellDepends = [ - aeson base bytestring either-unwrap fgl parsec text vector + aeson base bytestring either-unwrap fgl graphviz parsec text vector ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = lib.licenses.gpl3Only; @@ -21330,6 +21350,25 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_10" = callPackage + ({ mkDerivation, base, data-default-class, libX11, libXext + , libXinerama, libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.10"; + sha256 = "1zrdqryx99izjvsrsalb65ihpmikm9r6cjlci7cfp6wlwa3i585n"; + libraryHaskellDepends = [ base data-default-class ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + description = "A binding to the X11 graphics library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -21808,8 +21847,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.2.0"; - sha256 = "0xjy5689ck23fyas52qrfrl716fpgmnahp7pln54yyz106hxqj4p"; + version = "0.8.3.0"; + sha256 = "1y8vgz3jps2vsg5ay9s792knfyk5cvc6549q5li51jaqibsrw99m"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21836,8 +21875,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.8.0.0"; - sha256 = "000ziih2c33v5mbf9sljkrr0x9hxv31cq77blva6xy32zzh12yz3"; + version = "0.8.1.0"; + sha256 = "08nw9jxg2n8yls5p1dhyy976qbcj5kwv468fq1dijn91f7ylhfix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23692,10 +23731,8 @@ self: { }: mkDerivation { pname = "active"; - version = "0.2.0.14"; - sha256 = "0x3b4ln6csa554qls28wbxvclkbdz3yi60i1m0q5ing0cs16fifz"; - revision = "1"; - editedCabalFile = "01j431dkl3ax98g974v6mgxv9xha4c0hlpjqq5fvh7l8lyjan676"; + version = "0.2.0.15"; + sha256 = "019xr66pahsssqr2hybs88mga4qshv1vmd22j7624wqafqm57d74"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -24160,8 +24197,31 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.2.1.1"; - sha256 = "1fsdvjancc2mi9i7l1gaqqvhnafchvw37hrn9ksd20djy43gzwyw"; + version = "0.2.6.0"; + sha256 = "0vfjgcf2pnspaixgxg8av7k0cqv5cqmy161zkgjr822n118an1ch"; + libraryHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + description = "Multi-precision ball (interval) arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "aern2-mp_0_2_7_0" = callPackage + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.2.7.0"; + sha256 = "1gsqaggg6mpcpl9s3z566gmbynj4l6n1fhni5b0p8pf5hj8n93gg"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -24182,12 +24242,37 @@ self: { }: mkDerivation { pname = "aern2-real"; - version = "0.2.1.0"; - sha256 = "06nz820p5gillvyjnx7bhmadpc0mrkvg8wiz9zmpcj6d23f28vzg"; + version = "0.2.6.0"; + sha256 = "182vjrbdzjcpbbhmpsmv6i685jrnw94vda37646d1gph5v3hvfw6"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + description = "Real numbers as sequences of MPBalls"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "aern2-real_0_2_7_0" = callPackage + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck + }: + mkDerivation { + pname = "aern2-real"; + version = "0.2.7.0"; + sha256 = "0dsph1775rifr9vvx4w7v55bryqmh04fhk6nyk7d91yhn1sf6wc9"; + libraryHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; + testHaskellDepends = [ + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck + ]; description = "Real numbers as sequences of MPBalls"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -25054,20 +25139,21 @@ self: { "aeson-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, interpolate, mtl, process, template-haskell - , temporary, text, th-abstraction, unordered-containers + , filepath, hspec, mtl, process, string-interpolate + , template-haskell, temporary, text, th-abstraction + , unordered-containers }: mkDerivation { pname = "aeson-typescript"; - version = "0.3.0.0"; - sha256 = "054mhzsywbprccvp5pqscj9f92dvkrxgzpxz16bfadxn98wa1j7h"; + version = "0.3.0.1"; + sha256 = "0xbj6m1lxpv4qclz5msrdplpy3mdxq5icjl3fq4bwbqy5rs6vczv"; libraryHaskellDepends = [ - aeson base containers interpolate mtl template-haskell text + aeson base containers mtl string-interpolate template-haskell text th-abstraction unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory filepath hspec - interpolate mtl process template-haskell temporary text + aeson base bytestring containers directory filepath hspec mtl + process string-interpolate template-haskell temporary text th-abstraction unordered-containers ]; description = "Generate TypeScript definition files from your ADTs"; @@ -25425,6 +25511,26 @@ self: { license = lib.licenses.publicDomain; }) {}; + "agda2lagda_0_2021_6_1" = callPackage + ({ mkDerivation, base, directory, filepath, goldplate + , optparse-applicative, process + }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2021.6.1"; + sha256 = "1108xzl4fv86qpasg1wbc26bypd06s41kmgzybrggc76pv15hbis"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + testHaskellDepends = [ base process ]; + testToolDepends = [ goldplate ]; + description = "Translate .agda files into .lagda.tex files."; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -30697,8 +30803,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.4.0.0"; - sha256 = "0jg572zz9lbhpp4bxldrc0gs0ac0f4hfcrxds77gr51xizxfa7cn"; + version = "0.4.1.0"; + sha256 = "1ha39yfmiw61g907h83wsjw9zyvvkzi7zbr3y9dcciv2cgnb5h6a"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; @@ -30755,8 +30861,8 @@ self: { ({ mkDerivation, base, inspection-testing, transformers }: mkDerivation { pname = "ap-normalize"; - version = "0.1.0.0"; - sha256 = "0iqfilamnp0k170af7sw0ydn0cmba7ab06yinkl8vfppf583a4la"; + version = "0.1.0.1"; + sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base inspection-testing transformers ]; description = "Self-normalizing applicative expressions"; @@ -31673,8 +31779,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.9.2.0"; - sha256 = "1j0afdl6g51wyb3g47wss15v0yl50n23k3icbyla8h89rxh74lcx"; + version = "0.9.3.0"; + sha256 = "1sn5g71sx8xa4ggyk49m661iip6zrzl65vb87l16l31kf79bbm7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32134,21 +32240,21 @@ self: { , bytestring, Cabal, conduit, conduit-extra, containers, deepseq , Diff, directory, filepath, hackage-db, http-client , http-client-tls, megaparsec, microlens, microlens-th - , neat-interpolation, optparse-applicative, polysemy, prettyprinter + , neat-interpolation, optparse-simple, polysemy, prettyprinter , prettyprinter-ansi-terminal, servant-client, split, tar-conduit , template-haskell, text }: mkDerivation { pname = "arch-hs"; - version = "0.8.0.0"; - sha256 = "1g33ss6jvvpdgpcl0kwmbvnkawq8cngphjmsbv0jcpnh17brgf8x"; + version = "0.9.0.0"; + sha256 = "09i5b4pdbc1x7977icq0m7amk59iy0822ki5dlhd7y74m2dmdf9z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson algebraic-graphs arch-web base bytestring Cabal conduit conduit-extra containers deepseq Diff directory filepath hackage-db http-client http-client-tls megaparsec microlens microlens-th - neat-interpolation optparse-applicative polysemy prettyprinter + neat-interpolation optparse-simple polysemy prettyprinter prettyprinter-ansi-terminal servant-client split tar-conduit template-haskell text ]; @@ -32156,7 +32262,7 @@ self: { aeson algebraic-graphs arch-web base bytestring Cabal conduit conduit-extra containers deepseq Diff directory filepath hackage-db http-client http-client-tls megaparsec microlens microlens-th - neat-interpolation optparse-applicative polysemy prettyprinter + neat-interpolation optparse-simple polysemy prettyprinter prettyprinter-ansi-terminal servant-client split tar-conduit template-haskell text ]; @@ -32753,8 +32859,8 @@ self: { }: mkDerivation { pname = "armor"; - version = "0.2"; - sha256 = "1flidqihfgb1vwikm3q4dyjdjzrc5z2955ph6h30q0dyv4707s94"; + version = "0.2.0.1"; + sha256 = "1pp9y7y9i01mbnkrx4870m4a4crpyzikpi4w8znn3avjbl5c1bxx"; libraryHaskellDepends = [ base bytestring containers directory filepath hashable HUnit lens ]; @@ -33996,8 +34102,8 @@ self: { }: mkDerivation { pname = "astro"; - version = "0.4.2.1"; - sha256 = "0agy9a91n1sy6rgdgwvdz354x452j2lg7nr3by7z9r22rwdxwpfs"; + version = "0.4.3.0"; + sha256 = "1zbraw0l40r190vw9dc7bwwcrac4p6yqwng5qa8n277v6cwy5kv5"; libraryHaskellDepends = [ base matrix time ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -36449,8 +36555,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "4.1.0"; - sha256 = "1zb426bj1k3b3sp5hlg0ajx19mf0vwvr39zdg6p9l9i830qfdjfw"; + version = "4.1.1"; + sha256 = "0w4pdyagcs7m05kccdq0x3s1d4vbr2ihqjrbill0p0gn25q9h6cc"; libraryHaskellDepends = [ aeson base bytestring case-insensitive exceptions hashable http-client http-types mtl path path-io safe-exceptions-checked @@ -36780,8 +36886,8 @@ self: { }: mkDerivation { pname = "aws-xray-client-persistent"; - version = "0.1.0.0"; - sha256 = "02aig9j9asbkxni7bmyay1vhs7flf0gz401yldcq4n824c9q8h6f"; + version = "0.1.0.1"; + sha256 = "1b45g9gswr2c16xphprqkrpyh2q29kgnr10hm29zjw5pcahgc8mg"; libraryHaskellDepends = [ aws-xray-client base conduit containers lens persistent random resourcet text time @@ -42056,8 +42162,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "birds-of-paradise"; - version = "0.2.0.0"; - sha256 = "1jkj8li8yxl9kk5i8p63p9jkdcvdznmh473n12dxzimxnh15sf1y"; + version = "0.2.1.0"; + sha256 = "0kjwylhya86zqsmc5q6iqrbq4kp3hqxgx3kwam2pv1ls01qdsvvy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Birds of Paradise"; @@ -44012,8 +44118,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.3.0.1"; - sha256 = "06hmk4pg5qfcj6smzpn549d1jcsvcbgi2pxgvgvn9k7lab9cb5kg"; + version = "0.3.1.0"; + sha256 = "035lrn1j6hrvl5vs5k0q1hb3zwbqh5bvxmfxvjvv9lncv8iy2nd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47922,6 +48028,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "c-struct" = callPackage + ({ mkDerivation, array, base, primitive, template-haskell }: + mkDerivation { + pname = "c-struct"; + version = "0.1.0.1"; + sha256 = "0932b00zhhss86baj6cqhvn4f66l6z8dax58l4gbaif81w9281zw"; + libraryHaskellDepends = [ array base primitive template-haskell ]; + testHaskellDepends = [ array base primitive template-haskell ]; + description = "To make a wrapper for struct of C language"; + license = lib.licenses.bsd3; + }) {}; + "c0check" = callPackage ({ mkDerivation, base, c0parser }: mkDerivation { @@ -49893,25 +50011,25 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, calamity-commands , colour, concurrent-extra, connection, containers , data-default-class, data-flags, deepseq, deque, df1, di-core - , di-polysemy, exceptions, fmt, focus, generic-lens, hashable + , di-polysemy, exceptions, focus, generic-lens, hashable , http-api-data, http-client, http-date, http-types, lens , lens-aeson, megaparsec, mime-types, mtl, polysemy - , polysemy-plugin, reflection, req, safe-exceptions, scientific - , stm, stm-chans, stm-containers, text, text-show, time, tls - , typerep-map, unagi-chan, unboxing-vector, unordered-containers - , vector, websockets, x509-system + , polysemy-plugin, PyF, reflection, req, safe-exceptions + , scientific, stm, stm-chans, stm-containers, text, text-show, time + , tls, typerep-map, unagi-chan, unboxing-vector + , unordered-containers, vector, websockets, x509-system }: mkDerivation { pname = "calamity"; - version = "0.1.30.1"; - sha256 = "1qxag4vdxn2s3ijkr9lz5djafnwi7c6vj4q9b5z5p41ldvsil3l7"; + version = "0.1.30.2"; + sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class - data-flags deepseq deque df1 di-core di-polysemy exceptions fmt - focus generic-lens hashable http-api-data http-client http-date + data-flags deepseq deque df1 di-core di-polysemy exceptions focus + generic-lens hashable http-api-data http-client http-date http-types lens lens-aeson megaparsec mime-types mtl polysemy - polysemy-plugin reflection req safe-exceptions scientific stm + polysemy-plugin PyF reflection req safe-exceptions scientific stm stm-chans stm-containers text text-show time tls typerep-map unagi-chan unboxing-vector unordered-containers vector websockets x509-system @@ -49928,8 +50046,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.2.0"; - sha256 = "1qm55aikpc1645bzks90r88f317rz5mzwv7grrs9dr37hmy3sl65"; + version = "0.1.3.0"; + sha256 = "0vhv63vapjc51hx6g9mjr5vgxlsfkss828wxcfjf5jd98qdv96dj"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -52120,8 +52238,8 @@ self: { }: mkDerivation { pname = "cdar-mBound"; - version = "0.1.0.1"; - sha256 = "1a31rjs1if69987xi15qpyl2m21qscsxpyrq4jhfk3j87ilpx5zg"; + version = "0.1.0.2"; + sha256 = "1qzpb9kwswln7vbj0v0qm6fsi6v3v9xx701hyfg12y3f9hz096zf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers deepseq integer-gmp ]; @@ -53445,6 +53563,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "check-cfg-ambiguity" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "check-cfg-ambiguity"; + version = "0.0.0.1"; + sha256 = "1qdg707a8yq61s5rs677yc8wp00sxdrf4vpr2r3c98q2psbkxl1n"; + libraryHaskellDepends = [ base containers ]; + description = "Checks context free grammar for ambiguity using brute force up to given limit"; + license = lib.licenses.bsd3; + }) {}; + "check-email" = callPackage ({ mkDerivation, base, bytestring, email-validate, resolv }: mkDerivation { @@ -55141,37 +55270,6 @@ self: { }) {}; "clash-ghc" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, Cabal - , clash-lib, clash-prelude, concurrent-supply, containers, deepseq - , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim - , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp - , lens, mtl, primitive, process, reflection, split - , template-haskell, text, time, transformers, uniplate, unix - , unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "clash-ghc"; - version = "1.4.1"; - sha256 = "0brfhgdb5ilrm4rxx8hsjsrzrj0lxppsd1g1k7m4jrdk7xp1mnlk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bifunctors bytestring Cabal clash-lib clash-prelude - concurrent-supply containers deepseq directory exceptions extra - filepath ghc ghc-boot ghc-prim ghc-typelits-extra - ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable - haskeline integer-gmp lens mtl primitive process reflection split - template-haskell text time transformers uniplate unix - unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ base ]; - description = "Clash: a functional hardware description language - GHC frontend"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - }) {}; - - "clash-ghc_1_4_2" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, Cabal , clash-lib, clash-prelude, concurrent-supply, containers, deepseq , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim @@ -55203,49 +55301,6 @@ self: { }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array - , attoparsec, base, base16-bytestring, binary, bytestring - , clash-prelude, concurrent-supply, containers, cryptohash-sha256 - , data-binary-ieee754, data-default, deepseq, directory, dlist - , errors, exceptions, extra, filepath, ghc, ghc-boot-th - , ghc-typelits-knownnat, hashable, haskell-src-exts - , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl - , ordered-containers, parsers, pretty-show, prettyprinter - , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, text-show, time, transformers, trifecta - , unordered-containers, utf8-string, vector - , vector-binary-instances - }: - mkDerivation { - pname = "clash-lib"; - version = "1.4.1"; - sha256 = "1gg2snjfhhclfmyz07l5hddn8pfh9k4l4xjba1bx5php76kyiz0v"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal array attoparsec base - base16-bytestring binary bytestring clash-prelude concurrent-supply - containers cryptohash-sha256 data-binary-ieee754 data-default - deepseq directory dlist errors exceptions extra filepath ghc - ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate - lens mtl ordered-containers parsers pretty-show prettyprinter - primitive process reducers template-haskell temporary terminal-size - text text-show time transformers trifecta unordered-containers - utf8-string vector vector-binary-instances - ]; - testHaskellDepends = [ - aeson aeson-pretty base base16-bytestring bytestring clash-prelude - concurrent-supply containers data-default deepseq ghc - ghc-typelits-knownnat haskell-src-exts lens pretty-show - quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell - text transformers unordered-containers - ]; - description = "Clash: a functional hardware description language - As a library"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - }) {}; - - "clash-lib_1_4_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring , clash-prelude, concurrent-supply, containers, cryptohash-sha256 @@ -55304,48 +55359,6 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, arrows, base, bifunctors, binary - , bytestring, Cabal, cabal-doctest, constraints, containers - , criterion, data-binary-ieee754, data-default-class, deepseq - , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, half, hashable, hedgehog, hint - , integer-gmp, interpolate, lens, QuickCheck - , quickcheck-classes-base, recursion-schemes, reflection - , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, text, text-show, th-abstraction - , th-lift, th-orphans, time, transformers, type-errors, uniplate - , vector - }: - mkDerivation { - pname = "clash-prelude"; - version = "1.4.1"; - sha256 = "12f3nlg6820grkjkljhyqgq43qc1x58akiy51gbxf6qp8k55akka"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array arrows base bifunctors binary bytestring constraints - containers data-binary-ieee754 data-default-class deepseq ghc-prim - ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - text-show th-abstraction th-lift th-orphans time transformers - type-errors uniplate vector - ]; - testHaskellDepends = [ - base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base - tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th - template-haskell - ]; - benchmarkHaskellDepends = [ - base criterion deepseq template-haskell - ]; - description = "Clash: a functional hardware description language - Prelude library"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "clash-prelude_1_4_2" = callPackage ({ mkDerivation, array, arrows, base, bifunctors, binary , bytestring, Cabal, cabal-doctest, constraints, containers , criterion, data-binary-ieee754, data-default-class, deepseq @@ -56648,8 +56661,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "2.0.1"; - sha256 = "0s01582a2iyibwhlkmmf4n9h0fs3w0sjip65j78c4hldc91ylvqd"; + version = "2.0.2"; + sha256 = "19m07hh2vrzgj6nalcm3fbrlxcv5c8ci6d9c9pihv82d444n37j6"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -57579,8 +57592,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.2.6"; - sha256 = "1nvzyxmgn2wwa3j3rf38jz1nhhldv9jgbb91r7v2m822rxhr5pwp"; + version = "0.3.2"; + sha256 = "1mmsbs9n04vcrhaizxv6z6mkd0w5gvhvrffwyfxpfg995vf19gz9"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58994,21 +59007,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers + , unicode-transforms + }: + mkDerivation { + pname = "commonmark"; + version = "0.2"; + sha256 = "083xrmyxsgn6ivrxqgmjbqvv4k64n7a330pbf1n7xbsjqh78cg28"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers + unicode-transforms + ]; + testHaskellDepends = [ + base parsec tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-cli" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark , commonmark-extensions, commonmark-pandoc, containers, mtl - , pandoc-types, pretty-simple, text + , pandoc-types, text }: mkDerivation { pname = "commonmark-cli"; - version = "0.1.0.1"; - sha256 = "1k7s7wzphllfydki1ifzab6b4x865vwxg50xldqdar141425s84l"; + version = "0.2"; + sha256 = "1g3i01acaqfqiqkl5xyxvzrh0alfx3il4r4rcjs4ii1nwaljdg6j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal base bytestring commonmark commonmark-extensions commonmark-pandoc containers mtl pandoc-types - pretty-simple text + text ]; description = "Command-line commonmark converter and highlighter"; license = lib.licenses.bsd3; @@ -59038,6 +59074,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_1_2" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.1.2"; + sha256 = "1ky0j7086a8mqpg26j2nkrc5wfwiw5cd3h3jqncpy59vmj1prkx4"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , containers, pandoc-types, text @@ -59053,6 +59111,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-pandoc_0_2_1" = callPackage + ({ mkDerivation, base, commonmark, commonmark-extensions + , pandoc-types, text + }: + mkDerivation { + pname = "commonmark-pandoc"; + version = "0.2.1"; + sha256 = "0i5qavci8j63d15i2c6cbm0b53kcjh7s4vxadfgf4vkp2sy1ybvw"; + libraryHaskellDepends = [ + base commonmark commonmark-extensions pandoc-types text + ]; + description = "Bridge between commonmark and pandoc AST"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commsec" = callPackage ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api , network @@ -62112,16 +62186,18 @@ self: { }) {}; "connections" = callPackage - ({ mkDerivation, base, containers, doctest, hedgehog }: + ({ mkDerivation, base, containers, doctest, extended-reals + , hedgehog, time + }: mkDerivation { pname = "connections"; - version = "0.3.0"; - sha256 = "0ias6f5nzd83i2x6823ypzp598d8rgp74wmhd4gk7slcyszgpj6l"; + version = "0.3.1"; + sha256 = "0candwv3sv6qk76a4dn3m64957462da1pyvixl8jazf0gvq1pp23"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers extended-reals time ]; executableHaskellDepends = [ base doctest ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base hedgehog time ]; description = "Orders, Galois connections, and lattices"; license = lib.licenses.bsd3; }) {}; @@ -62579,10 +62655,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.2"; - sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; - revision = "2"; - editedCabalFile = "0fa67waf0af62kpljdksm00lvh29vm1rddfpjvy5c7lcy2a9ll97"; + version = "2.2.0.3"; + sha256 = "0jvh3mf7jmrv3zjplc5cjmpyj7h15573l6dlyzn3c2jhj61zjwkk"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -62784,19 +62858,20 @@ self: { }) {}; "context-free-grammar" = callPackage - ({ mkDerivation, array, base, containers, control-monad-omega - , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, alex, array, base, containers, control-monad-omega + , dlist, happy, HUnit, mtl, pretty, QuickCheck + , quickcheck-properties, semigroups, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "context-free-grammar"; - version = "0.1.0"; - sha256 = "11s6v8h39iq0wy4p4y8cwpr8fjhphql07s38rgbm8qsq1hj9f3a1"; + version = "0.1.1"; + sha256 = "15xsm8v157jpz2v98lry7sr77nwk0785mmj3zdb21ajqnkccyb14"; libraryHaskellDepends = [ array base containers control-monad-omega dlist mtl pretty - template-haskell + semigroups template-haskell ]; + libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base containers HUnit pretty QuickCheck quickcheck-properties template-haskell test-framework test-framework-hunit @@ -66666,8 +66741,8 @@ self: { }: mkDerivation { pname = "css-selectors"; - version = "0.4.0.2"; - sha256 = "1299xqp1ssxarz2i9wgzcyj4zmjry6cq02jb2a9n0vw61gw6z5g4"; + version = "0.4.0.3"; + sha256 = "1jz7s5lpfgs6axzkmwp2is1mhsn8jsb52ahxv8my07lx0yvy1g7v"; libraryHaskellDepends = [ aeson array base binary blaze-markup bytestring data-default Decimal hashable QuickCheck shakespeare template-haskell text zlib @@ -67991,8 +68066,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.16.3"; - sha256 = "1bf11ndz6k7fx9bb31l4l6dqfkrld3gxsrrqggcg7d57wa3yw9c9"; + version = "2.16.4"; + sha256 = "07dygwh6p4fsrlgxmq6r7yvxmf4n2y04izzd30jzqgs0pi9645p4"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -73682,6 +73757,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.14"; sha256 = "1jy80w3lr6c0hvn0525h5kn6fh9rj6ir942hdkilrzd9farg6qj9"; + revision = "1"; + editedCabalFile = "10947mmbwy5fg52s63cs7lqa6hydrg3w8ka7rfkpdiqn2q9f146r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74359,10 +74436,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.3"; - sha256 = "0gqrcyjyp3p78vmfxvhfjbkkl2xvwcv3qyyinbdcmalb5zb8vyy6"; - revision = "1"; - editedCabalFile = "0cqhqm2nz2ls00pfhx8hz6z6g17qhl380h24wp4d6l5msiw7gxq4"; + version = "1.4.4"; + sha256 = "09np7kj8si8kcb854f95a0cq392mgbxif8lnazbpfsa1k87d9vzy"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -74489,10 +74564,8 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.4.2"; - sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l"; - revision = "1"; - editedCabalFile = "0q2nzcdv7j654bk8c5fjz3whiz1l6cdy21n6ah53f1s7rlsbiz0g"; + version = "1.4.2.1"; + sha256 = "09a1jnpc4kplg1yhv5kxhi0ph22m5xyr0vmnjv2c5wlz72c72z2z"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -75725,14 +75798,12 @@ self: { broken = true; }) {}; - "directory_1_3_6_1" = callPackage + "directory_1_3_6_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.6.1"; - sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi"; - revision = "2"; - editedCabalFile = "14kwmqa1pf1bij7qang5aihw38ch7m5prsics0p0y72jkxx98y48"; + version = "1.3.6.2"; + sha256 = "0zgwx7bwhw0s5xc17hfn1ps3fxn9ihv174b2s7rz63flm8lsm0y3"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -75970,8 +76041,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.6"; - sha256 = "0mmppadd1hmmdgbfjwzhy28kibzssbsnr5dxjiqf3hahmll74qjl"; + version = "1.8.7"; + sha256 = "0nby3267nhdgc8692k5c28yy0a2bzvl84dn54sg25j6nchzs991g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76003,31 +76074,29 @@ self: { }) {}; "discord-register" = callPackage - ({ mkDerivation, base, calamity, dhall, di, di-polysemy - , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy - , polysemy-plugin, text, text-show, unboxing-vector - , unordered-containers, vector + ({ mkDerivation, aeson, base, binary, bytestring, calamity + , calamity-commands, data-flags, di, di-polysemy, generic-lens + , hashable, hedis, lens, megaparsec, polysemy, polysemy-plugin + , regex-tdfa, text, text-show, unboxing-vector + , unordered-containers }: mkDerivation { pname = "discord-register"; - version = "0.0.1"; - sha256 = "1crwbdkyg6k4777lcc7yi5n47xpsnvl3s1652n896k1hck7ckrr8"; + version = "0.0.2"; + sha256 = "01imq7m41g26x7prm223y6bagjwyzb3glwy41fg4kdd244pz02wf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base calamity dhall di di-polysemy generic-lens hspec - hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show - unboxing-vector unordered-containers vector + aeson base binary bytestring calamity calamity-commands data-flags + di di-polysemy generic-lens hashable hedis lens megaparsec polysemy + polysemy-plugin regex-tdfa text text-show unboxing-vector + unordered-containers ]; executableHaskellDepends = [ - base calamity dhall di di-polysemy generic-lens hspec - hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show - unboxing-vector unordered-containers vector - ]; - testHaskellDepends = [ - base calamity dhall di di-polysemy generic-lens hspec - hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show - unboxing-vector unordered-containers vector + aeson base binary bytestring calamity calamity-commands data-flags + di di-polysemy generic-lens hashable hedis lens megaparsec polysemy + polysemy-plugin regex-tdfa text text-show unboxing-vector + unordered-containers ]; description = "Discord verification bot"; license = lib.licenses.mpl20; @@ -78376,8 +78445,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1"; - sha256 = "1lr97k14wc35myckknsv3vyximqfv5vq04f5kpd8167lk3vjahm2"; + version = "0.1.1"; + sha256 = "0ykf1bxd0xmgdhkvd8rp14p4zccpwp5ywj2yiyh6mpp4sp03qwiw"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -79143,8 +79212,8 @@ self: { ({ mkDerivation, base, ki, transformers, unagi-chan }: mkDerivation { pname = "drama"; - version = "0.3.0.0"; - sha256 = "17smzrvpaah2lcc2467dd61lns53q4n0bf0pl9glsv04j9kv2nl9"; + version = "0.4.0.0"; + sha256 = "15p8pac1xcl5iifv1g0bs09l99x6q8skid71wlyxh4g9j7hrgpdr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki transformers unagi-chan ]; @@ -85028,36 +85097,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql - , mysql-simple, persistent, persistent-mysql, persistent-postgresql - , persistent-sqlite, persistent-template, postgresql-libpq - , postgresql-simple, resourcet, tagged, text, time, transformers - , unliftio, unordered-containers, vector - }: - mkDerivation { - pname = "esqueleto"; - version = "3.4.1.1"; - sha256 = "15355vc3ysqr4yd149xz7zm7iba7pb04p3yxgp1n6dxczwldjf43"; - revision = "1"; - editedCabalFile = "0rwj2cg7pkn4nwapyk9syb64f0qycq7kqwbpciwwq9xdviwcvqzk"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec monad-logger mtl mysql mysql-simple persistent - persistent-mysql persistent-postgresql persistent-sqlite - persistent-template postgresql-libpq postgresql-simple resourcet - tagged text time transformers unliftio unordered-containers vector - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_4_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -85067,10 +85106,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.2.1"; - sha256 = "0yh2fgk5rjphszn2prww190nsvw84j68js7wnd6p5iwynrw6ahxh"; - revision = "1"; - editedCabalFile = "0nsm17spkhsykizmpr29x8zq16ha6j0325r08ms675jn574ni2g1"; + version = "3.5.0.0"; + sha256 = "00mamdsm4yc8gdvb5zfnhnp7iqkg7h9fd5jgzrbdh9q7isyc6kiy"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85085,7 +85122,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ess" = callPackage @@ -86346,8 +86382,8 @@ self: { }: mkDerivation { pname = "exact-real"; - version = "0.12.4.1"; - sha256 = "194qx4dq8c9w1nbr4vyalmvp0m1a0q1pxjckg59m7c3fsz9r88jg"; + version = "0.12.5"; + sha256 = "1xjj17h8a4sbja7f29xvasgzxzn58i2276ysqqkw8d5dsd5913lb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base integer-gmp random ]; testHaskellDepends = [ @@ -87384,8 +87420,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.10"; - sha256 = "09ajf8ibcwxqbyrrz7yb84fpzfb7g54b1mz5q8w3dvk8rrdxaak1"; + version = "0.1.12"; + sha256 = "1055qj5ymlzshva94i1gfr6sfmjgv1rhxpx5h76fdq5ia6hkd68z"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -88320,20 +88356,20 @@ self: { "faktory" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring - , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory - , mtl, network, random, safe-exceptions, scanner, semigroups, text - , time, unix, unordered-containers + , connection, cryptonite, errors, hspec, markdown-unlit, megaparsec + , memory, mtl, network, random, safe-exceptions, scanner + , semigroups, text, time, unix, unordered-containers }: mkDerivation { pname = "faktory"; - version = "1.0.2.3"; - sha256 = "1ppyj7avp7y5n0qgql1j73yc62szykhxm1j8nxv93hsijzi6p4a5"; + version = "1.0.3.0"; + sha256 = "1igarcl4cvipndg9rhg4lpcrl09mbfkpqcp3prr14izclcldr47y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection cryptonite megaparsec - memory mtl network random safe-exceptions scanner semigroups text - time unix unordered-containers + aeson aeson-casing base bytestring connection cryptonite errors + megaparsec memory mtl network random safe-exceptions scanner + semigroups text time unix unordered-containers ]; executableHaskellDepends = [ aeson base safe-exceptions ]; testHaskellDepends = [ @@ -89076,16 +89112,16 @@ self: { "fbrnch" = callPackage ({ mkDerivation, aeson, async, base, bugzilla-redhat, bytestring - , config-ini, directory, email-validate, extra, filepath, haxr - , http-conduit, http-directory, http-query, lens, lens-aeson, mtl + , config-ini, directory, email-validate, extra, filepath + , http-conduit, http-directory, http-query, koji, lens, lens-aeson , network-uri, optparse-applicative, pretty-terminal, process , rpmbuild-order, simple-cmd, simple-cmd-args, text, time , typed-process, unordered-containers, utf8-string, xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "0.8.0"; - sha256 = "113mpna3crycw2kxsbniah5m71wvswy7v6j2p76ybl1qg50bq075"; + version = "0.9"; + sha256 = "1basamg578nyyjl677q3fax31pxcckxvdpw4f48gdmnmlnd9f6vm"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -89093,8 +89129,8 @@ self: { ]; executableHaskellDepends = [ aeson async base bugzilla-redhat bytestring config-ini directory - email-validate extra filepath haxr http-conduit http-directory - http-query mtl network-uri optparse-applicative pretty-terminal + email-validate extra filepath http-conduit http-directory + http-query koji network-uri optparse-applicative pretty-terminal process rpmbuild-order simple-cmd simple-cmd-args text time typed-process unordered-containers utf8-string xdg-basedir ]; @@ -89208,8 +89244,8 @@ self: { }: mkDerivation { pname = "fclabels"; - version = "2.0.5"; - sha256 = "0ppvc1s5bvx38y6yd6ib1wxi3y2j438xzl9iqhpr4hc1zwvsi6rx"; + version = "2.0.5.1"; + sha256 = "0g4ca5pm2bafsnpari7wqhy79i5qs8njb3kdknk0xsrazdsl174k"; libraryHaskellDepends = [ base base-orphans mtl template-haskell transformers ]; @@ -90110,8 +90146,8 @@ self: { }: mkDerivation { pname = "fft"; - version = "0.1.8.6"; - sha256 = "0hjv3r09imb2ypgbz3qj9hf4f36v977z38gdcad3qa0334qdin1f"; + version = "0.1.8.7"; + sha256 = "1kkdw08qzsgjgg9z7pf5876cn2hlq22cgvc3k2amidn317n2d6vz"; libraryHaskellDepends = [ array base carray ix-shapable storable-complex syb transformers ]; @@ -91422,6 +91458,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "fitspec_0_4_10" = callPackage + ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell + }: + mkDerivation { + pname = "fitspec"; + version = "0.4.10"; + sha256 = "1jq4brkwq59hj8fpyfq60hywj9hx82qp0yjvyl0bmwy8jpc6j91k"; + libraryHaskellDepends = [ + base cmdargs leancheck template-haskell + ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base pretty ]; + description = "refining property sets for testing Haskell programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fix-imports" = callPackage ({ mkDerivation, base, containers, cpphs, deepseq, directory , filepath, haskell-src-exts, mtl, pretty, process, split @@ -94127,8 +94180,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.4.2"; - sha256 = "03x1pxkpl41r4cf034qj5ls946azbzwdyxkp2nxxymjx0nm2lsv6"; + version = "0.4.3"; + sha256 = "0wmyx0zlz2hmbrag8wgm8k33z9p0c2ylf3490hf9nz9b2303wflq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96943,7 +96996,7 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_19_5" = callPackage + "futhark_0_19_6" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm , containers, directory, directory-tree, dlist, file-embed @@ -96958,8 +97011,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.19.5"; - sha256 = "1x922g3iq50an8jv75370qr0qslmxnrrqbwr7adca30ljaa7nfvh"; + version = "0.19.6"; + sha256 = "1wpg2ad2xv60xsdvnq3246nps3ldc00n58k7jxmh8lrx5bjzg263"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97303,8 +97356,8 @@ self: { ({ mkDerivation, base, bytestring, serialport }: mkDerivation { pname = "fxpak"; - version = "0.1.1"; - sha256 = "1nnb47i17b4rc2ayzq5qaydx0ss3m8yw02pjwfmipk8398qr8ss5"; + version = "0.1.2"; + sha256 = "1mrpbz32aczrh5aw550p1vzvj8zqhcnmj574sc012r3z1c0g1cin"; libraryHaskellDepends = [ base bytestring serialport ]; description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; @@ -98853,12 +98906,13 @@ self: { }) {}; "generic-override" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "generic-override"; - version = "0.0.0.0"; - sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5"; + version = "0.2.0.0"; + sha256 = "0hrya5rqdrgl66hm818v6jf11hfrvra242n1sdjypkv13zxzsk6x"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; description = "Provides functionality for overriding instances for generic derivation"; license = lib.licenses.bsd3; }) {}; @@ -98867,8 +98921,8 @@ self: { ({ mkDerivation, aeson, base, generic-override, hspec, text }: mkDerivation { pname = "generic-override-aeson"; - version = "0.0.0.0"; - sha256 = "02xwssk7158k7hhh170knxn7f2s7slcp4sy7a4b3w4cn1r016bhz"; + version = "0.0.0.2"; + sha256 = "1hgrxhfssxm4l0c98ffgc20lbzy34bbhzr4vg06vqg51m4620b25"; libraryHaskellDepends = [ aeson base generic-override ]; testHaskellDepends = [ aeson base generic-override hspec text ]; description = "Provides orphan instances necessary for integrating generic-override and aeson"; @@ -100156,6 +100210,24 @@ self: { broken = true; }) {inherit (pkgs) geos;}; + "gerrit" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , http-client, http-client-tls, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "gerrit"; + version = "0.1.0.0"; + sha256 = "03lcf9xvyhypzkrs6lv7dnwsxnn52vnnl6mhsbbhmpv2bf59whq2"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls text + ]; + testHaskellDepends = [ + aeson base bytestring directory tasty tasty-hunit + ]; + description = "A gerrit client library"; + license = lib.licenses.asl20; + }) {}; + "getemx" = callPackage ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt , mtl, old-locale, process, time @@ -101405,8 +101477,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.1"; - sha256 = "0dk80lss2iq2yi7cnx78nk7pfnc3khwm3xincj3ybaiy60c94x8x"; + version = "1.3"; + sha256 = "1fshj5zdnhr879c9q48mb89f1fidc2skgmgi385sa5r8wxn1ili0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102012,33 +102084,16 @@ self: { license = lib.licenses.mit; }) {}; - "ghcjs-base_0_2_0_0" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim - , hashable, HUnit, integer-gmp, primitive, QuickCheck - , quickcheck-unicode, random, scientific, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: + "ghcjs-base_0_2_0_3" = callPackage + ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.0.0"; - sha256 = "0wvmxr33a3bsv1mh8lb10haapvcykp9200ppbdpjiz2wihnb4mk8"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring containers deepseq dlist - ghc-prim ghcjs-prim hashable integer-gmp primitive scientific text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit - primitive QuickCheck quickcheck-unicode random test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; + version = "0.2.0.3"; + sha256 = "09sv5p57l8jczbycasbb06h4qsifi5fagxwsr665yil1gickfxyg"; description = "base library for GHCJS"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {ghcjs-prim = null;}; + }) {}; "ghcjs-base-stub" = callPackage ({ mkDerivation, aeson, attoparsec, base, containers, deepseq @@ -105462,8 +105517,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "2.0.3"; - sha256 = "06bpazshc07rg1w06sl171k12mry708512hrdckqw7winwfrwwkh"; + version = "2.0.4"; + sha256 = "0rzfs09njlll144l05s77hs9pm9mmnb8h705xlyr5yavllkv1ypk"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -108992,19 +109047,17 @@ self: { "goldplate" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, time, unordered-containers + , regex-pcre-builtin, text, unordered-containers }: mkDerivation { pname = "goldplate"; - version = "0.1.3"; - sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610"; - revision = "1"; - editedCabalFile = "1chrg7mfs4w4hbc0i1pdsj1350c4h3dhcv7xswn2ygq78337xxqk"; + version = "0.2.0"; + sha256 = "1f2n981676ykrv08fgdj87mj5r4841a18ywvgpc2hgapsgwbgma1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text time + Glob optparse-applicative process regex-pcre-builtin text unordered-containers ]; description = "A lightweight golden test runner"; @@ -109776,8 +109829,8 @@ self: { ({ mkDerivation, base, criterion, hedgehog }: mkDerivation { pname = "grab"; - version = "0.0.0.4"; - sha256 = "0yanm9ak2sw266wn9lllz086g53sra7xfncpql6403d2lj3j1jj4"; + version = "0.0.0.6"; + sha256 = "0fhindbl5ygfncbww0wqbq4bkjr9q6v0f12f0rzblz71wapshnni"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hedgehog ]; benchmarkHaskellDepends = [ base criterion ]; @@ -109791,8 +109844,8 @@ self: { ({ mkDerivation, base, containers, grab, hedgehog, text }: mkDerivation { pname = "grab-form"; - version = "0.0.0.4"; - sha256 = "0ch8c0kfjky9s1ilrxyr27jhmvynrp61imb188rc3fv7yfr0b5n5"; + version = "0.0.0.6"; + sha256 = "18gk6p6fxvsiihlr6amvlqf9s7i4v0wi7vzpfjkc580zzvxd9c8n"; libraryHaskellDepends = [ base containers grab text ]; testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; @@ -116095,6 +116148,38 @@ self: { broken = true; }) {}; + "hapistrano_0_4_1_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, directory + , filepath, formatting, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, process, QuickCheck + , silently, stm, temporary, time, transformers, typed-process, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.4.1.4"; + sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base filepath gitrev mtl path process stm time + transformers typed-process yaml + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process QuickCheck + silently temporary yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A deployment library for Haskell applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -116663,8 +116748,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.7.0"; - sha256 = "0jyjnksgwvasnhwwn8scqms1kja4hzlbpn0lmyr6yng5n4989d0x"; + version = "7.7.1"; + sha256 = "1zxdv7nihw3kjq2fvw5cl3s27pwm5gkli3sl15iqxfm7mdxz8rm0"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -117231,8 +117316,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.4.5"; - sha256 = "185qh24n6j3b5awwmm92hxravb3sq40l5q8vyng74296mjc65nkw"; + version = "0.1.5.0"; + sha256 = "0q0nd8d22knf6b1xwqz3gxmpymbvlx1p20hyahd5qr1yhjgpch0b"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default mtl network text @@ -117529,15 +117614,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashable_1_3_1_0" = callPackage + "hashable_1_3_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit , integer-gmp, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.3.1.0"; - sha256 = "1i57iibad5gjk88yq1svi35mjcbgjmms7jzd28wva8f598x84qc0"; + version = "1.3.2.0"; + sha256 = "0dyn343wdwbm1facpcjiyd8w0s0hk23jqh7mbj108az5dx5rdgar"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp text ]; @@ -117624,11 +117709,26 @@ self: { pname = "hashable-time"; version = "0.2.1"; sha256 = "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh"; + revision = "1"; + editedCabalFile = "151gxiprdlj3masa95vvrxal9nwa72n3p1y15xyj4hp7mvvl4s2l"; libraryHaskellDepends = [ base hashable time time-compat ]; description = "Hashable instances for Data.Time"; license = lib.licenses.bsd3; }) {}; + "hashable-time_0_3" = callPackage + ({ mkDerivation, base, hashable, time-compat }: + mkDerivation { + pname = "hashable-time"; + version = "0.3"; + sha256 = "15zv0pgxp7rgd6v7skhyxgyf2sd8gr1br12bpd17r650yscw9fij"; + libraryHaskellDepends = [ base time-compat ]; + testHaskellDepends = [ base hashable time-compat ]; + description = "Hashable instances for Data.Time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashabler" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp , primitive, template-haskell, text @@ -119620,8 +119720,8 @@ self: { }: mkDerivation { pname = "haskell-stack-trace-plugin"; - version = "0.1.1.1"; - sha256 = "0mm1nyhlia00vawpwcq6dda0j9d8sgd1ls4xin0s84jplw5z9hwz"; + version = "0.1.3.0"; + sha256 = "1vlqf0j88qshqkc1j688x38h4sqdkww5ya4ihaz3fy8l86wwmnvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc ]; @@ -120847,6 +120947,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasklepias" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, flow, hspec + , interval-algebra, QuickCheck, safe, text, time + , unordered-containers, vector, witherable + }: + mkDerivation { + pname = "hasklepias"; + version = "0.7.1"; + sha256 = "1w6gs3n1g12sw2w72l04l27na3kgmyqsip8d53wpmslqwccr6blc"; + libraryHaskellDepends = [ + aeson base bytestring containers flow interval-algebra QuickCheck + safe text time unordered-containers vector witherable + ]; + testHaskellDepends = [ + aeson base bytestring containers flow hspec interval-algebra + QuickCheck text time unordered-containers vector + ]; + description = "Define features from events"; + license = lib.licenses.bsd3; + }) {}; + "haskmon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-streams , io-streams, time, vector @@ -121058,8 +121179,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.13"; - sha256 = "1ms07ka51j20xb86b3i4gca9svh2wxa4i0wb6qxbwq7n2138ck0h"; + version = "0.53.2"; + sha256 = "04wm92b7687qivwjia69gahd9y2dasirmyxcbv8liqfp5xfmjbmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121104,8 +121225,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.13"; - sha256 = "08c95grxg11kf96di27z7d72c2l7h2qzb8p5446fd91pidzgz3zb"; + version = "0.53.2"; + sha256 = "1i949izj89g797zp07qxjx16sd2591gsxbpq94v52vzgd6rl9h7n"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -122346,6 +122467,24 @@ self: { license = lib.licenses.mit; }) {}; + "hasqlator-mysql" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers, dlist + , io-streams, megaparsec, mtl, mysql-haskell, pretty-simple + , prettyprinter, scientific, template-haskell, text, time + }: + mkDerivation { + pname = "hasqlator-mysql"; + version = "0.0.3"; + sha256 = "1b1nw3l96gvf2laxw7w72w8ya8aazdhv4w7c5ly47n09hx9q77zp"; + libraryHaskellDepends = [ + aeson base binary bytestring containers dlist io-streams megaparsec + mtl mysql-haskell pretty-simple prettyprinter scientific + template-haskell text time + ]; + description = "composable SQL generation"; + license = lib.licenses.bsd3; + }) {}; + "hasqly-mysql" = callPackage ({ mkDerivation, base, binary, bytestring, dlist, mtl , mysql-haskell, scientific, text, time @@ -125697,8 +125836,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.2.0.0"; - sha256 = "1649vhzymizmmi3ggmqxyq4b0fhrpipj4ljy1w7hca2wyh4jm1yw"; + version = "0.2.1.0"; + sha256 = "0wjj5sy4mpd4ahavdmi67j70xs1wrga8dnzr5jv8cjnqjj2p8f59"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -126061,8 +126200,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.44.1"; - sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97"; + version = "0.46.0"; + sha256 = "1pqs4hcjy1gipdp63d8jcy035n96rfx14x0s67ihmh16s11i85bz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -129551,20 +129690,24 @@ self: { "hledger-stockquotes" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers - , hedgehog, hledger-lib, req, safe, scientific, split, tasty - , tasty-hedgehog, tasty-hunit, text, time, unordered-containers + , directory, hedgehog, hledger-lib, raw-strings-qq, req, safe + , safe-exceptions, scientific, split, tasty, tasty-hedgehog + , tasty-hunit, text, time, unordered-containers, xdg-basedir, yaml }: mkDerivation { pname = "hledger-stockquotes"; - version = "0.1.1.0"; - sha256 = "1srgl70zsixbfgmh22psg7q4wqfiay2jiybyvml42iv712n7z8xx"; + version = "0.1.2.0"; + sha256 = "064q6qz6rrahk9ri5hr1y6n17nmd4l124xb3l8q5rvm81x3hzp3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers hledger-lib req safe scientific split text time unordered-containers ]; - executableHaskellDepends = [ base bytestring cmdargs text time ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs directory raw-strings-qq + safe-exceptions text time xdg-basedir yaml + ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit ]; @@ -131053,10 +131196,10 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.13.0.1"; - sha256 = "1c01ns9h7va6ri568c0hzcdkmr0jdiay5z1vwwva7cv7dlvn6wl7"; - revision = "2"; - editedCabalFile = "148w8jbn4hrhp8zk90vr5grc4fsnsq4him6ii21imikril4ib7ya"; + version = "0.13.1"; + sha256 = "12mqwhvxk0w0fjbdl3ignayp08nm31qi028wq5qrkcyxw29ff1k7"; + revision = "1"; + editedCabalFile = "01dmzpcqav7p764dpicih8jm0g6yiiqgww8b5m6c0bfvvgfqyx2h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131095,16 +131238,16 @@ self: { ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, directory, filepath, hashable, lifted-base - , monad-control, mtl, nix-derivation, process, saltine, tasty - , tasty-discover, tasty-golden, tasty-hspec, tasty-hunit + , cryptohash-sha512, directory, filepath, hashable, hspec + , lifted-base, monad-control, mtl, nix-derivation, process, saltine + , tasty, tasty-discover, tasty-golden, tasty-hspec, tasty-hunit , tasty-quickcheck, temporary, text, time, unix , unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.4.2.0"; - sha256 = "02i7vxhpaqwyjvd6w2raxjz7r0xxs37x5b6pq9rw6l1l0k18nx5i"; + version = "0.4.3.0"; + sha256 = "17l7198s3dzjx416nplinyghbqgignvpvxkww241gjv4p23izf77"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring bytestring cereal containers cryptohash-md5 @@ -131114,8 +131257,9 @@ self: { ]; testHaskellDepends = [ attoparsec base base16-bytestring base64-bytestring binary - bytestring containers directory filepath process tasty tasty-golden - tasty-hspec tasty-hunit tasty-quickcheck temporary text unix + bytestring containers directory filepath hspec process tasty + tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary + text unix ]; testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; @@ -131129,8 +131273,8 @@ self: { }: mkDerivation { pname = "hnix-store-remote"; - version = "0.4.2.0"; - sha256 = "17v785dql4rl2yn1qdagvnyx8y9r3bd02npg51mfqhl49knd92fr"; + version = "0.4.3.1"; + sha256 = "1wp6z5f13fkgh3mdzr1zcqdvsx1j90l5isf671gsg43brsv4c2vl"; libraryHaskellDepends = [ attoparsec base binary bytestring containers hnix-store-core mtl network nix-derivation text time unordered-containers @@ -133538,8 +133682,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.1.0"; - sha256 = "13q20ak0zakwvlc05y187iq2vpvdjx9dlmvmgvv2gjd263sqcgm2"; + version = "1.9.1.1"; + sha256 = "0s5dyia6v59vz7xk8m6gj0shdygk39pmks5yr7dlzksb8gqfgral"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -133570,6 +133714,8 @@ self: { pname = "hpqtypes-extras"; version = "1.11.0.0"; sha256 = "0574ma8b149rhpdk9mdg5sawhl3db4d0qxs5az31g83i93hf4mwq"; + revision = "2"; + editedCabalFile = "1n98wpppwd0gwchwfis525qac3808j1vnvb3vxziq1d9x088gqf6"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -140003,14 +140149,14 @@ self: { "http-client-websockets" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client - , http-client-tls, network-uri, utf8-string, websockets + , http-client-tls, network-uri, text, websockets }: mkDerivation { pname = "http-client-websockets"; - version = "0.1.1.1"; - sha256 = "0b5kvyrfhhj7c5ys8ccxwv6prhb6sj0ycinzbk1yrwnd3wrmzk78"; + version = "0.1.1.2"; + sha256 = "0g2zhj0fzhynyls5rxpzh50hxjsygx7037rw2h79ihca10crsqgm"; libraryHaskellDepends = [ - base bytestring http-client network-uri utf8-string websockets + base bytestring http-client network-uri text websockets ]; testHaskellDepends = [ base bytestring hspec http-client-tls network-uri websockets @@ -147345,17 +147491,17 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable + ({ mkDerivation, aeson, base, base-compat, deepseq, hashable , indexed-traversable, lens, optics-core, optics-extra, QuickCheck , semigroupoids, semigroups, tasty, tasty-quickcheck, text , transformers, unordered-containers }: mkDerivation { pname = "insert-ordered-containers"; - version = "0.2.4"; - sha256 = "174maygil2mffjz2ssqawlmv36413m65zp3ng67hzij4dh8piz7x"; + version = "0.2.5"; + sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; libraryHaskellDepends = [ - aeson base base-compat hashable indexed-traversable lens + aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers unordered-containers ]; @@ -147673,8 +147819,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "3"; - editedCabalFile = "1b99lqxwbhg96iykfr2l7qd388cbx9sf8bln728505qgj6kgsvj7"; + revision = "4"; + editedCabalFile = "1l5n3hsa8gr0wzc3cb32ha2j8kcf976i84z04580q41macf0r0h6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -148297,8 +148443,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.8.0"; - sha256 = "1mayv7rqpbx09y82vyzdvbdjrqgk4vpsbz7qx9cy2h09q355zs7d"; + version = "0.8.2"; + sha256 = "1xa9rlb9klf0bnig0ccryjxcbz023hwy1wnxp4vwn5ggb0fbmzys"; libraryHaskellDepends = [ base containers QuickCheck safe time witherable ]; @@ -148550,17 +148696,15 @@ self: { }: mkDerivation { pname = "invert"; - version = "1.0"; - sha256 = "18q070bawfnyi4wl6rxb6l5ihda0xzmlb8g1z0sg46vghvbs985v"; - revision = "2"; - editedCabalFile = "1829iy3jg0zwms16cqd4rdg5khl348ih44b3mz7l7cy9wlci3cli"; + version = "1.0.0.1"; + sha256 = "07p7vcc3mc4zq0j2qlm4yp0cfsashb32ndx5i9ib0x6lk6rb9djp"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; - description = "Automatically generate a function's inverse"; + description = "Automatically generate a function’s inverse"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; @@ -148781,6 +148925,8 @@ self: { pname = "io-streams"; version = "1.5.2.1"; sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; + revision = "1"; + editedCabalFile = "0zgrhvafnk9ds29n6x93cifw4993mgvvx3p2d3922frkjvd6xa5v"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -151384,8 +151530,8 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.4"; - sha256 = "0rrqaibgafbynrlcsp7f7hkzgkp2gix7ji2hkpgpby6fvp6965fh"; + version = "1.3.5"; + sha256 = "0k5z2lxj5xp9hpr3mmdbzkd0yn718477pqjvymyz361h938rqnz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -151395,6 +151541,22 @@ self: { license = lib.licenses.mit; }) {}; + "jira-wiki-markup_1_4_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.4.0"; + sha256 = "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -151858,8 +152020,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.7.1"; - sha256 = "1igkv5lvlbq0xl2dp6d8fp4ybwnwmgrc3r4sfjsric0bj8sq2k86"; + version = "0.9.8.0"; + sha256 = "0g3jdh4x80fsbrcj5kd81inv8hcx662v5dsn9d6q1dla0cz8w8i9"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -151876,8 +152038,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.7.1"; - sha256 = "07s2iy136dm526mr7q43mxqq9qndg8jbi9kz1652qgl0ivn8lapc"; + version = "0.9.8.0"; + sha256 = "0axgfkxgvm4awvklss2pqa8a4112m3q7k38h71anxs6i199lgkyq"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -151925,8 +152087,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.7.1"; - sha256 = "1piyxxmik1bwdzkz46vgdhdp0gw4p01fww591zqbxzjk6rmrpby0"; + version = "0.9.8.0"; + sha256 = "06bf071xnfx7mjzf7jdyjspjw28s2z3br5gmx9vcs7paji20c8np"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -151950,8 +152112,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.7.1"; - sha256 = "0f2siaid0b03zrjzpb3lr9k9w5np2vml6apd961zd97dghvvhiix"; + version = "0.9.8.0"; + sha256 = "01iav691d3h6l9x7vw0spb68n4y5m9pb8d02iyp5lvkqr2y4h9kv"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading @@ -151984,17 +152146,11 @@ self: { }) {}; "jsaddle-wkwebview" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, jsaddle, text - }: + ({ mkDerivation }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.7.1"; - sha256 = "0dfaysw7fzmv2b62wi5id45f4i0x2vbjp9irbdkmv1h2z3ydwy20"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory jsaddle - text - ]; + version = "0.9.8.0"; + sha256 = "1cjncl2jqnx4j83pmcnnvcc0rswhwwb5grwh636b11yyp4vv58dw"; description = "Interface for JavaScript that works with GHCJS and GHC"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -153011,26 +153167,26 @@ self: { }) {}; "jsonnet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , containers, data-fix, deriving-compat, directory, exceptions - , filepath, hashable, megaparsec, mtl, optparse-applicative - , parser-combinators, scientific, semigroupoids, tasty + , filepath, hashable, lens, megaparsec, mtl, optparse-applicative + , parser-combinators, scientific, semigroupoids, tasty, tasty-bench , tasty-golden, tasty-hunit, template-haskell, text - , transformers-compat, unbound-generics, unordered-containers - , vector + , th-lift-instances, th-utilities, transformers-compat + , unbound-generics, unordered-containers, vector }: mkDerivation { pname = "jsonnet"; - version = "0.2.0.0"; - sha256 = "0ns2yij8yl555n5rb0pahxpqrwxgzfvdr4ajp0dy5amqsv13hhmh"; + version = "0.3.1.1"; + sha256 = "021kklj3ycpm5n2r6bjqc0vicn9vdv5a56sd1la6pf430i1fd7z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base bytestring containers data-fix - deriving-compat directory exceptions filepath hashable megaparsec - mtl optparse-applicative parser-combinators scientific - semigroupoids template-haskell text transformers-compat - unbound-generics unordered-containers vector + aeson ansi-wl-pprint base binary bytestring containers data-fix + deriving-compat directory exceptions filepath hashable lens + megaparsec mtl parser-combinators scientific semigroupoids + template-haskell text th-lift-instances th-utilities + transformers-compat unbound-generics unordered-containers vector ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring mtl optparse-applicative text @@ -153039,6 +153195,9 @@ self: { ansi-wl-pprint base bytestring filepath mtl tasty tasty-golden tasty-hunit text ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base bytestring tasty-bench text + ]; description = "Jsonnet implementaton in pure Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -154995,8 +155154,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.3"; - sha256 = "0bki6h5qk78d3qgprn8k1av2xxlb43bxb07qqk4x1x5diy92mc5x"; + version = "0.2.0.4"; + sha256 = "0rzpid5lnjnjgsip3fvm5d313hh8wb7gqla3dyf56l9q7y4r20js"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -159739,8 +159898,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.9.4"; - sha256 = "0w17ymj7k4sr9jwp9yrgh3l94l3kgjyxxnpxwj2sdqk8fvmjpkny"; + version = "0.9.6"; + sha256 = "0nw7hm9aawv6xljii3cjy9qbdbb5p05k5rmc9qv4dkajjjyhyna9"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -162189,15 +162348,18 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, process }: + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , http-client, http-client-tls, process, tar, temporary, zlib + }: mkDerivation { pname = "licensor"; - version = "0.4.3"; - sha256 = "19ydisxc5yzm0ccj76p7sg39cpjg5c57wd3gaybc5k7bqrlv14c6"; + version = "0.5.0"; + sha256 = "0i49l4d5dvvj4s6fbdhg38dmdclxr4ld69lzm1s5xx9m7aqy3al9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal containers directory process + base bytestring Cabal containers directory http-client + http-client-tls process tar temporary zlib ]; executableHaskellDepends = [ base Cabal containers directory ]; description = "A license compatibility helper"; @@ -163063,18 +163225,24 @@ self: { "linearmap-category" = callPackage ({ mkDerivation, base, call-stack, constrained-categories - , containers, free-vector-spaces, ieee754, lens, linear - , manifolds-core, QuickCheck, semigroups, tagged, transformers - , vector, vector-space + , containers, data-default-class, free-vector-spaces, hashable + , ieee754, lens, linear, manifolds-core, MemoTrie, QuickCheck + , semigroups, tagged, tasty, tasty-quickcheck, template-haskell + , transformers, vector, vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.4.0.1"; - sha256 = "1zc7zns49d832wm22dsbv5xvh5x6s4zg6ky1vr941rs1z9jskmyj"; + version = "0.4.1.0"; + sha256 = "01cpl44wg5kyx9lxv23hcsxd8dw90psqj9sgaklhxklbdvn77bvr"; libraryHaskellDepends = [ base call-stack constrained-categories containers - free-vector-spaces ieee754 lens linear manifolds-core QuickCheck - semigroups tagged transformers vector vector-space + data-default-class free-vector-spaces hashable ieee754 lens linear + manifolds-core MemoTrie QuickCheck semigroups tagged + template-haskell transformers vector vector-space + ]; + testHaskellDepends = [ + base constrained-categories linear manifolds-core QuickCheck tasty + tasty-quickcheck vector-space ]; description = "Native, complete, matrix-free linear algebra"; license = lib.licenses.gpl3Only; @@ -164500,6 +164668,42 @@ self: { broken = true; }) {}; + "literatex" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.1.0.0"; + sha256 = "0nfmvblm3a370a59hyd28wv8xnq1wlxcm5xz4n6b3n5cprj4h99z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + }) {}; + + "little-earley" = callPackage + ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "little-earley"; + version = "0.2.0.0"; + sha256 = "0zqlnaj1w6m2h7g55xg9cjl978ij66lw69x4v5b9vi7x7maa44ms"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers mtl tasty tasty-hunit ]; + description = "Simple implementation of Earley parsing"; + license = lib.licenses.mit; + }) {}; + "little-logger" = callPackage ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty , tasty-hunit, text, unliftio-core @@ -165539,8 +165743,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.9.1.0"; - sha256 = "0p0zb805a8zlxdnii6r0gmf0zic4g4zxkvcq84j6g8973qx1fch9"; + version = "0.9.1.1"; + sha256 = "0b69q4vhayqg0n8kzqb4lma289av39zm5qbinnam4hh9inqhayfk"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -165632,10 +165836,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.4"; - sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx"; - revision = "1"; - editedCabalFile = "0yyaxibkq8c9bwhaday8ijmfbm8k3i14wd9zsgfby99b6rxra351"; + version = "0.7.1.5"; + sha256 = "0g89403ijgp2xznd497xhvifh2jlgph4raz4l5fh5ajxvcf33hvn"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -174839,8 +175041,8 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.5.3.1"; - sha256 = "1g19y0kkksx87i8azqndikpwans7061fj7z255vssl1x46vh843h"; + version = "0.5.7.0"; + sha256 = "0fnf165ff6c4vbc2hlfrydb7w8csk1hjxd86lvnh4y9w6sc9g6hp"; libraryHaskellDepends = [ base collect-errors hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell @@ -174852,6 +175054,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_8_0" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.8.0"; + sha256 = "1i40g6kf4my91i7xg54wfi6n2s8ivmx5k08ccqz3iycn6gha8pr7"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -176163,8 +176385,8 @@ self: { }: mkDerivation { pname = "monad-coroutine"; - version = "0.9.1"; - sha256 = "1d85jyfwf4h60cfp3dyrkmf7kw7ya37z2vqmv6rdbpqc1pslmb1i"; + version = "0.9.1.2"; + sha256 = "1s4975q1k23b2skyq9mwkkda08f2zxkv96x0yplzhz9n64kchhf3"; libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; @@ -177267,8 +177489,8 @@ self: { }: mkDerivation { pname = "monadic-recursion-schemes"; - version = "0.1.12.0"; - sha256 = "0h5syc9p4imlf03qfb1rjsk4rq2kqry522zvw67x122q1xzdnwnw"; + version = "0.1.13.0"; + sha256 = "04n81zx1h68w9v8fihwhfbkyv7lb84p3nzppqf7zc55znbn67lym"; libraryHaskellDepends = [ base comonad containers free mtl recursion-schemes transformers ]; @@ -178098,6 +178320,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "moo-nad" = callPackage + ({ mkDerivation, base, dep-t, mtl, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "moo-nad"; + version = "0.1.0.2"; + sha256 = "017yl4vy7apa6p91y4mhk4p36b4dgvwqdjplc38gijvk9zqd3rbm"; + libraryHaskellDepends = [ base dep-t mtl transformers ]; + testHaskellDepends = [ base dep-t mtl tasty tasty-hunit ]; + doHaddock = false; + description = "Invocation helpers for the ReaderT-record-of-functions style"; + license = lib.licenses.bsd3; + }) {}; + "moonshine" = callPackage ({ mkDerivation, aeson, base, bytestring, canteven-config, ekg , ekg-core, hslogger, snap, text, time, transformers, yaml @@ -180143,12 +180379,13 @@ self: { }) {}; "multi-except" = callPackage - ({ mkDerivation, base, dlist, semigroupoids }: + ({ mkDerivation, base, dlist, hspec, semigroupoids }: mkDerivation { pname = "multi-except"; - version = "0.1.1.0"; - sha256 = "18zs66sn31wjngi7iibf1wc3jz15c6rz6sx424n6j88nzwd3wzq7"; + version = "0.2.1.0"; + sha256 = "0ai19lk32wbpsmwxig5wzc7iqi81h0mxpykrmfw05vv4zwjqiqfz"; libraryHaskellDepends = [ base dlist semigroupoids ]; + testHaskellDepends = [ base hspec semigroupoids ]; description = "Multiple Exceptions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -186253,6 +186490,28 @@ self: { broken = true; }) {}; + "nix-graph" = callPackage + ({ mkDerivation, algebraic-graphs, attoparsec, base, containers + , hashable, nix-derivation, optparse-applicative, stm, text, ttrie + , unliftio + }: + mkDerivation { + pname = "nix-graph"; + version = "1.0.0.0"; + sha256 = "1hxby1xpzld55whpb1kzzdl3gi250svpl1lw5xw9qg10a3md29zh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs attoparsec base containers hashable nix-derivation + stm text ttrie unliftio + ]; + executableHaskellDepends = [ + algebraic-graphs base optparse-applicative + ]; + description = "Reify the Nix build graph into a Haskell graph data structure"; + license = lib.licenses.bsd3; + }) {}; + "nix-narinfo" = callPackage ({ mkDerivation, attoparsec, base, containers, filepath, hspec , QuickCheck, text @@ -187645,6 +187904,73 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_6_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text + , time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.6.0.1"; + sha256 = "10gfw6vs2vc1jll80lirzjplwx3p3l9yssddqjklnd67rnvm95r4"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-coloured-text-terminfo + safe-exceptions terminal-size text time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "nri-redis" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis + , nri-env-parser, nri-observability, nri-prelude, resourcet + , safe-exceptions, text, unordered-containers, uuid + }: + mkDerivation { + pname = "nri-redis"; + version = "0.1.0.0"; + sha256 = "00im3rnb7w45xm60l42kzrj3sc9dg3098w988fdhdschwk34zqpc"; + libraryHaskellDepends = [ + aeson async base bytestring conduit hedis nri-env-parser + nri-observability nri-prelude resourcet safe-exceptions text + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson async base bytestring conduit hedis nri-env-parser + nri-observability nri-prelude resourcet safe-exceptions text + unordered-containers uuid + ]; + description = "An intuitive hedis wrapper library"; + license = lib.licenses.bsd3; + }) {}; + + "nri-test-encoding" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, filepath + , nri-prelude, servant, servant-auth-server, servant-server, text + }: + mkDerivation { + pname = "nri-test-encoding"; + version = "0.1.0.0"; + sha256 = "11vk1f99xbqs678rxldxh9qfwailinxpjl6q6pvikb8f32rrb74y"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring filepath nri-prelude servant + servant-auth-server servant-server text + ]; + description = "A library to simplify writing golden tests for encoding types"; + license = lib.licenses.bsd3; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -188161,18 +188487,32 @@ self: { broken = true; }) {}; + "numhask_0_8_0_0" = callPackage + ({ mkDerivation, base, doctest, QuickCheck }: + mkDerivation { + pname = "numhask"; + version = "0.8.0.0"; + sha256 = "104vc3b43lbck6r39kv5rscvqx3hxxf8nyvzsw8shb9xifmnijkh"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "A numeric class hierarchy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , numhask, vector + ({ mkDerivation, adjunctions, base, distributive, doctest, numhask + , vector }: mkDerivation { pname = "numhask-array"; - version = "0.8.0"; - sha256 = "03c12d34s20f01vc9kpgrm3n4xi8h4kqzlndj1ncpqb69xx3fhc5"; + version = "0.9.0"; + sha256 = "09l0cm2f66c5bagrwby8bj22b6lklbi8mbsgxxh0gw5zvb9bhgmr"; libraryHaskellDepends = [ - adjunctions base deepseq distributive numhask vector + adjunctions base distributive numhask vector ]; - testHaskellDepends = [ base doctest numhask ]; + testHaskellDepends = [ base doctest ]; description = "Multi-dimensional array interface for numhask"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -188273,13 +188613,13 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.7.1.0"; - sha256 = "1wn4fi2778dxmqfimwx9favwd6v507vzpwms04w2bk5gn1fxgcdg"; + version = "0.8.0.0"; + sha256 = "1ya4fcr0mxj4blijl2k2sdfkkywjmr616qcaddl7zqphjvrc4gd0"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector ]; - testHaskellDepends = [ base doctest numhask ]; + testHaskellDepends = [ base doctest ]; description = "Numerical spaces"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -188389,23 +188729,25 @@ self: { }) {}; "nvfetcher" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, extra, free - , neat-interpolation, shake, text, tomland, transformers - , unordered-containers, validation-selective + ({ mkDerivation, aeson, base, binary, bytestring, containers, extra + , free, microlens, microlens-th, neat-interpolation + , optparse-simple, shake, text, tomland, transformers + , validation-selective }: mkDerivation { pname = "nvfetcher"; - version = "0.1.0.0"; - sha256 = "1flzivh84fxik5zw3n8j4b65lh8cxd15mjh72y4622rnlnfn2xvv"; + version = "0.2.0.0"; + sha256 = "04gslnmamy79i563ma7kj2b36mqr2c1wlcivqs70akr7s4my3g7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring extra free neat-interpolation shake - text transformers unordered-containers + aeson base binary bytestring containers extra free microlens + microlens-th neat-interpolation shake text transformers ]; executableHaskellDepends = [ - aeson base binary bytestring extra free neat-interpolation shake - text tomland transformers unordered-containers validation-selective + aeson base binary bytestring containers extra free microlens + microlens-th neat-interpolation optparse-simple shake text tomland + transformers validation-selective ]; description = "Generate nix sources expr for the latest version of packages"; license = lib.licenses.mit; @@ -190585,8 +190927,8 @@ self: { }: mkDerivation { pname = "openid-connect"; - version = "0.1.0.0"; - sha256 = "12qp155dazycypv0fvw8mbh3rl5j5ybd2vyfga8wi55n16v1w8mv"; + version = "0.1.1"; + sha256 = "16qqndcvbs30nraik0ida1dw40hk3k9mi318dnqnjx64x6wvcgmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192174,8 +192516,8 @@ self: { }: mkDerivation { pname = "ordinal"; - version = "0.4.0.3"; - sha256 = "1ar7l68cx9zci7mi6qx7a6ja7vp9axxjczyzxrbnjrvd2k3zxg51"; + version = "0.4.0.5"; + sha256 = "0m073n6yln9rfdzlkwd10fl04b725h3hpybz01r0wiyw4bfv2n3b"; libraryHaskellDepends = [ base containers data-default QuickCheck regex template-haskell text time vector @@ -193120,6 +193462,25 @@ self: { broken = true; }) {}; + "packstream" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, hspec, mtl, text + }: + mkDerivation { + pname = "packstream"; + version = "0.1.0.2"; + sha256 = "0skp7n6y9wzsa4mr456cpmqw0fzyb5613hqw7fs0qyzwb5swna2c"; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl text + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 hspec mtl + text + ]; + description = "PackStream converter for Neo4j BOLT protocol"; + license = lib.licenses.bsd3; + }) {}; + "packunused" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, haskell-src-exts , optparse-applicative, process, split @@ -193537,6 +193898,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.0.1"; + sha256 = "0fyhmdd1qnf9z4k1m8mm4m1p4lvpirlxx78plglch5h4xqidibr3"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -193592,7 +194012,7 @@ self: { }) {}; "pandoc-crossref" = callPackage - ({ mkDerivation, base, containers, data-accessor + ({ mkDerivation, base, containers, criterion, data-accessor , data-accessor-template, data-accessor-transformers, data-default , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb @@ -193600,10 +194020,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.10.0"; - sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; - revision = "1"; - editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; + version = "0.3.11.0"; + sha256 = "1czz54px5pv5a5ijxllz3nrq5s5k4rb05xb8r29drrnz13j45chk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193614,17 +194032,17 @@ self: { utility-ht ]; executableHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default deepseq directory filepath - gitrev mtl open-browser optparse-applicative pandoc pandoc-types - roman-numerals syb template-haskell temporary text utility-ht + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text ]; testHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath hspec - mtl pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht + base containers data-accessor data-default directory filepath hspec + mtl pandoc pandoc-types text ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; }) {}; @@ -193916,25 +194334,25 @@ self: { "pandoc-plot" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, filepath, githash, hashable, hspec + , data-default, directory, filepath, gitrev, hashable, hspec , hspec-expectations, lifted-async, lifted-base, mtl , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup , tasty, tasty-hspec, tasty-hunit, template-haskell, text - , typed-process, yaml + , typed-process, unix, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "1.2.1"; - sha256 = "1jz8q3qv9m837zwl2lhrcqfjmfs08gcv7qfxiw3w21nfl8gxbgqx"; + version = "1.2.2"; + sha256 = "0lj4a1nn78zsv7rms3irk0fy390k2yfd6ck687x9h1xqmsdhd3kd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hashable lifted-async lifted-base mtl pandoc pandoc-types shakespeare - tagsoup template-haskell text typed-process yaml + tagsoup template-haskell text typed-process unix yaml ]; executableHaskellDepends = [ - base containers directory filepath githash optparse-applicative + base containers directory filepath gitrev optparse-applicative pandoc pandoc-types template-haskell text typed-process ]; testHaskellDepends = [ @@ -194872,10 +195290,8 @@ self: { ({ mkDerivation, base, containers, extensible-exceptions, random }: mkDerivation { pname = "parallel-io"; - version = "0.3.3"; - sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; - revision = "2"; - editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym"; + version = "0.3.4"; + sha256 = "10bglxm685pljh0i896zrgs6g3iz0n7gl1qslvfn63pjxgvz5v2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195736,6 +196152,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "parsley" = callPackage + ({ mkDerivation, array, base, bytestring, containers, cpphs + , dependent-map, dependent-sum, ghc-prim, hashable, mtl + , pretty-terminal, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "parsley"; + version = "0.1.0.1"; + sha256 = "01rslkkisbrgdn2d8hzrag2z6hh9gjilp2bg0j87n8awzm1i2n19"; + revision = "1"; + editedCabalFile = "16rpf1l3ph3yil2jnyp9z0j46afb38bii52bwkl4blk2f781k97z"; + libraryHaskellDepends = [ + array base bytestring containers dependent-map dependent-sum + ghc-prim hashable mtl pretty-terminal template-haskell text + unordered-containers + ]; + libraryToolDepends = [ cpphs ]; + description = "A fast parser combinator library backed by Typed Template Haskell"; + license = lib.licenses.bsd3; + }) {}; + "parsnip" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default, ghc-prim, primitive @@ -195857,8 +196294,8 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.1.8"; - sha256 = "1lxvgz0z04fkd67lnva902j8y5qxp6naga7gfnnazwafsb0s9kww"; + version = "0.5.1.12"; + sha256 = "0dkbw136cgqqhgckcn7wj39gd8ng8jmbdbq99qan5l2h5090k30h"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; @@ -195869,8 +196306,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.6"; - sha256 = "0n0j8xlrz66mzkvrsa083b9057n3rgbir7pwqxqycwzgj18g68s6"; + version = "0.6.0.8"; + sha256 = "0gldqqrfc87x1ff33qgan3pp62siqgal3imkf81b9rynws0saxh7"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; @@ -197042,8 +197479,8 @@ self: { }: mkDerivation { pname = "pcre2"; - version = "1.1.4"; - sha256 = "0wrw2slmkxxmw3zx85f9xv8374fsvhxsyf1l149fvkaqnvf19bs2"; + version = "1.1.5"; + sha256 = "0kwlcv2rh8hyx93i3q3xv8ijxccl02n5nbkv4g74dr12d41ggc1h"; libraryHaskellDepends = [ base containers mtl template-haskell text ]; @@ -198268,47 +198705,18 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, fast-logger, hspec - , http-api-data, monad-logger, mtl, path-pieces, resource-pool - , resourcet, scientific, shakespeare, silently, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector - }: - mkDerivation { - pname = "persistent"; - version = "2.11.0.4"; - sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently text time - transformers unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - containers hspec http-api-data path-pieces scientific shakespeare - text time transformers unordered-containers vector - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_13_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq - , deepseq-generics, fast-logger, file-embed, hspec, http-api-data - , lift-type, monad-logger, mtl, path-pieces, QuickCheck - , quickcheck-instances, resource-pool, resourcet, scientific - , shakespeare, silently, template-haskell, text, th-lift-instances - , time, transformers, unliftio, unliftio-core, unordered-containers - , vector + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent"; - version = "2.13.0.1"; - sha256 = "0yvipx9y33pr1vz7818w2ylr5zf9bmng8ka70mdb4f563l4ynp96"; + version = "2.13.0.2"; + sha256 = "1fn3hjn3pxxnawvdif691vmxahnmal5ivr5rll0f26ia7rjqrnn2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -198325,12 +198733,10 @@ self: { unordered-containers vector ]; benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics file-embed template-haskell - text + base criterion deepseq file-embed template-haskell text ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -198435,6 +198841,8 @@ self: { pname = "persistent-documentation"; version = "0.1.0.2"; sha256 = "0ys864vjzl97c9qv0gg5q9zviammrfvm0schvh7ckr9pdg062z17"; + revision = "1"; + editedCabalFile = "0pzgmwqjyzpql7d6bk9xkzkjvm21giq7f420y4fqq4wli3g2cwmx"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -198613,34 +199021,6 @@ self: { }) {}; "persistent-mysql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, HUnit, monad-logger, mysql - , mysql-simple, persistent, persistent-qq, persistent-template - , persistent-test, QuickCheck, quickcheck-instances, resource-pool - , resourcet, text, time, transformers, unliftio-core - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.10.3.1"; - sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7"; - revision = "1"; - editedCabalFile = "1nd3l499kpv2rfhqqjw1b3qsn558rwz3794cy2x493l98rsspszp"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers monad-logger - mysql mysql-simple persistent resource-pool resourcet text - transformers unliftio-core - ]; - testHaskellDepends = [ - base bytestring containers fast-logger hspec HUnit monad-logger - mysql persistent persistent-qq persistent-template persistent-test - QuickCheck quickcheck-instances resourcet text time transformers - unliftio-core - ]; - description = "Backend for the persistent library using MySQL database server"; - license = lib.licenses.mit; - }) {}; - - "persistent-mysql_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, http-api-data, HUnit , monad-logger, mysql, mysql-simple, path-pieces, persistent @@ -198649,8 +199029,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.13.0.0"; - sha256 = "1lqd1j9r973081yzvvz9c65csqjd8bzapb4dayzwbhwjq2p0sxiz"; + version = "2.13.0.1"; + sha256 = "1gl48xcsczpzipg9v107x970rzi66vr26772ml9z8szxygamgsdb"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -198664,7 +199044,6 @@ self: { ]; description = "Backend for the persistent library using MySQL database server"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-mysql-haskell" = callPackage @@ -198759,16 +199138,19 @@ self: { "persistent-postgresql" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations - , HUnit, monad-logger, mtl, persistent, persistent-qq - , persistent-template, persistent-test, postgresql-libpq - , postgresql-simple, QuickCheck, quickcheck-instances - , resource-pool, resourcet, string-conversions, text, time - , transformers, unliftio-core, unordered-containers, vector + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent-postgresql"; - version = "2.11.0.1"; - sha256 = "08bmf52fqjwzyw4dnvh2ql4q3ai05fzzicgd5z6bim13b9s4ggmk"; + version = "2.13.0.1"; + sha256 = "186anbb0sgml094pw1nb529pddi4q1af0mcv3xa8bshr1xywpnd8"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring conduit containers monad-logger mtl persistent postgresql-libpq postgresql-simple @@ -198777,16 +199159,16 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers fast-logger hspec - hspec-expectations HUnit monad-logger persistent persistent-qq - persistent-template persistent-test QuickCheck quickcheck-instances - resourcet text time transformers unliftio-core unordered-containers - vector + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; }) {}; - "persistent-postgresql_2_13_0_0" = callPackage + "persistent-postgresql_2_13_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations , hspec-expectations-lifted, http-api-data, HUnit, monad-logger @@ -198798,8 +199180,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.0.0"; - sha256 = "0a18h7ib01if2dspq8f3vwb02cwi74c12i0n3ax4aq6819qy12gb"; + version = "2.13.0.2"; + sha256 = "1cbrwzk2s3xrdxpas64slk1habn38xspdg09xj2yazszkmr31hrh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198839,36 +199221,14 @@ self: { }) {}; "persistent-qq" = callPackage - ({ mkDerivation, aeson, base, bytestring, fast-logger - , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent - , persistent-sqlite, persistent-template, resourcet - , template-haskell, text, unliftio - }: - mkDerivation { - pname = "persistent-qq"; - version = "2.9.2.1"; - sha256 = "0gnwkrjyh9fkli35qp0mvivbsycz58ng26z6rfqv377hgrjsvjiq"; - libraryHaskellDepends = [ - base haskell-src-meta mtl persistent template-haskell text - ]; - testHaskellDepends = [ - aeson base bytestring fast-logger haskell-src-meta hspec HUnit - monad-logger mtl persistent persistent-sqlite persistent-template - resourcet template-haskell text unliftio - ]; - description = "Provides a quasi-quoter for raw SQL for persistent"; - license = lib.licenses.mit; - }) {}; - - "persistent-qq_2_12_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, fast-logger , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent , persistent-sqlite, resourcet, template-haskell, text, unliftio }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.0"; - sha256 = "1mw565rwnzdsw0vc0gs31z4l4pw8qxb70l898invj7dfnq5vj62f"; + version = "2.12.0.1"; + sha256 = "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -198879,7 +199239,6 @@ self: { ]; description = "Provides a quasi-quoter for raw SQL for persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-ratelimit" = callPackage @@ -198978,38 +199337,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th - , monad-logger, mtl, persistent, persistent-template - , persistent-test, QuickCheck, resource-pool, resourcet, sqlite - , system-fileio, system-filepath, temporary, text, time - , transformers, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.11.1.0"; - sha256 = "04rdzcckdkvs8nisx0hh96sdfyly82yr8c0mx6nsxpyi7m52by9j"; - configureFlags = [ "-fsystemlib" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers microlens-th monad-logger - mtl persistent resource-pool resourcet text time transformers - unliftio-core unordered-containers - ]; - librarySystemDepends = [ sqlite ]; - testHaskellDepends = [ - base bytestring conduit containers exceptions fast-logger hspec - HUnit microlens monad-logger mtl persistent persistent-template - persistent-test QuickCheck resourcet system-fileio system-filepath - temporary text time transformers unliftio-core - ]; - description = "Backend for the persistent library using sqlite3"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {inherit (pkgs) sqlite;}; - - "persistent-sqlite_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th , monad-logger, mtl, persistent, persistent-test, QuickCheck @@ -199019,10 +199346,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.0.0"; - sha256 = "1xbf22cnvhjs59wqml0n5flk1fhrhjw3flm3lnhh1nik3scfny0w"; - revision = "1"; - editedCabalFile = "0y21azb1cvaxwlypprh3wqxr0w0hchf3r509vqxvywqymckqc71i"; + version = "2.13.0.3"; + sha256 = "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -199040,41 +199365,10 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; "persistent-template" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, deepseq-generics, file-embed, hspec, http-api-data - , monad-control, monad-logger, path-pieces, persistent, QuickCheck - , template-haskell, text, th-lift-instances, transformers - , unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.9.1.0"; - sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca"; - revision = "2"; - editedCabalFile = "1lyrnh2lskkbvpjhbjiyh2ibndldsr8zgaiws7n37pa3vnmfx0qw"; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data monad-control - monad-logger path-pieces persistent template-haskell text - th-lift-instances transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text - ]; - benchmarkHaskellDepends = [ - base criterion deepseq deepseq-generics file-embed persistent - template-haskell text - ]; - description = "Type-safe, non-relational, multi-backend persistence"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_12_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "persistent-template"; @@ -199084,7 +199378,6 @@ self: { doHaddock = false; description = "Type-safe, non-relational, multi-backend persistence"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -199094,8 +199387,8 @@ self: { }: mkDerivation { pname = "persistent-template-classy"; - version = "0.1.0.1"; - sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a"; + version = "0.2.0"; + sha256 = "0grfr7bb0c9m4fhg27g4qch43mgjqfrzw2c0gi0arq5ibm3n17kk"; libraryHaskellDepends = [ base lens persistent persistent-sqlite persistent-template template-haskell text @@ -199111,29 +199404,6 @@ self: { }) {}; "persistent-test" = callPackage - ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit - , containers, exceptions, hspec, hspec-expectations, HUnit - , monad-control, monad-logger, mtl, path-pieces, persistent - , persistent-template, QuickCheck, quickcheck-instances, random - , resourcet, text, time, transformers, transformers-base, unliftio - , unliftio-core, unordered-containers - }: - mkDerivation { - pname = "persistent-test"; - version = "2.0.3.5"; - sha256 = "16m3nlmpwxibfhgrfl3xqh3a518bkrd7qaa8hklfq2qwlvjbb31v"; - libraryHaskellDepends = [ - aeson base blaze-html bytestring conduit containers exceptions - hspec hspec-expectations HUnit monad-control monad-logger mtl - path-pieces persistent persistent-template QuickCheck - quickcheck-instances random resourcet text time transformers - transformers-base unliftio unliftio-core unordered-containers - ]; - description = "Tests for Persistent"; - license = lib.licenses.mit; - }) {}; - - "persistent-test_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, exceptions, hspec, hspec-expectations, http-api-data , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent @@ -199143,10 +199413,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.13.0.0"; - sha256 = "1fyahnnx9f3dg36kqviah5l9410d0x819dz3afxapcq27myccdw7"; - revision = "1"; - editedCabalFile = "16yzpsy11bcglipgcy0x8mcxlx7w00gfvnw5fhjkbj99lxdwwgm0"; + version = "2.13.0.3"; + sha256 = "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions hspec hspec-expectations http-api-data HUnit monad-control @@ -199156,43 +199424,18 @@ self: { ]; description = "Tests for Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec - , http-api-data, monad-logger, path-pieces, persistent - , persistent-template, resource-pool, resourcet, template-haskell - , text, transformers + , hspec-discover, http-api-data, monad-logger, path-pieces + , persistent, resource-pool, resourcet, template-haskell, text + , transformers }: mkDerivation { pname = "persistent-typed-db"; - version = "0.1.0.2"; - sha256 = "1pdhdb29b7gyaw3kh1vr76dyr7gvwpx9ymib17fzfsxks6s76dxc"; - libraryHaskellDepends = [ - aeson base bytestring conduit http-api-data monad-logger - path-pieces persistent persistent-template resource-pool resourcet - template-haskell text transformers - ]; - testHaskellDepends = [ - aeson base bytestring conduit esqueleto hspec http-api-data - monad-logger path-pieces persistent persistent-template - resource-pool resourcet template-haskell text transformers - ]; - description = "Type safe access to multiple database schemata"; - license = lib.licenses.bsd3; - }) {}; - - "persistent-typed-db_0_1_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec - , http-api-data, monad-logger, path-pieces, persistent - , persistent-template, resource-pool, resourcet, template-haskell - , text, transformers - }: - mkDerivation { - pname = "persistent-typed-db"; - version = "0.1.0.3"; - sha256 = "15x4qfk4bwafqa495y8dsywa5mrcfnmqm7pyn419p20yngnyhzn8"; + version = "0.1.0.4"; + sha256 = "1dd5kig6zkiq5qkqv63icz9z8mn0b56b06w6z980hi7a2bmp6pk8"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent resource-pool resourcet template-haskell @@ -199200,12 +199443,12 @@ self: { ]; testHaskellDepends = [ aeson base bytestring conduit esqueleto hspec http-api-data - monad-logger path-pieces persistent persistent-template - resource-pool resourcet template-haskell text transformers + monad-logger path-pieces persistent resource-pool resourcet + template-haskell text transformers ]; + testToolDepends = [ hspec-discover ]; description = "Type safe access to multiple database schemata"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -199953,8 +200196,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.6.2.0"; - sha256 = "1vzx21pp9hkksbw5vpl8rarxpnbhmj04xys3qx0xk0zqf2p1f86q"; + version = "0.6.3.0"; + sha256 = "1hc1wmq2syvi0xsbkrm52hd5k8j2kk80n45695zd85fqwbayhj2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200059,8 +200302,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.4.1.0"; - sha256 = "02z7c3ngcj4dz473j0ha05qh5wviiy4qp1mk3p4gidxrhkgbxhyc"; + version = "0.4.2.0"; + sha256 = "02lv4w9v8jf7v6dkrwwmy79h7yphmk37n54r9whii6kicns80ff2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200120,8 +200363,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.1.1.0"; - sha256 = "04b65k6jjrlfx93m7625f991vll136y0lbh82f9qgxlmwv1vwmm8"; + version = "0.2.1.0"; + sha256 = "0bz5lyl75i143crva3piz4005k81ia26rj455cgbgz3yknj3qpaf"; libraryHaskellDepends = [ base heaps mmsyn2-array parallel phonetic-languages-constraints-array @@ -200142,8 +200385,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.1.1.0"; - sha256 = "0yhpw7bpfag5d6cbm385dy5jxll2vn8104ypqngdv0qlxqx25m9l"; + version = "0.1.2.0"; + sha256 = "1k65ynaz2mh35nqsf3izqq0lxqbkyj24i1g3r3gbfpbkajdhqz0v"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics subG ]; @@ -200158,8 +200401,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.1.1.0"; - sha256 = "04jg2b2qzm3yhbckbpn7zarfdy921lryx8d5r3cx9vcp55xvain0"; + version = "0.1.2.0"; + sha256 = "1vlzgcq8pv22m9pxwx0p1xss9zzlvwap11gn88pdgn0zgkhcsm0b"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -200839,8 +201082,8 @@ self: { }: mkDerivation { pname = "pinch-gen"; - version = "0.4.1.0"; - sha256 = "11sk0lmzsxw0k8i8airpv7p461z25n6y2fygx0l7gv0zadaici2v"; + version = "0.4.2.0"; + sha256 = "0saacr8q2varfqcq386dk9k04caijm90yi106wyl88pn3f5piaq3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203045,8 +203288,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.0.0"; - sha256 = "1x49b7js161bhdr8v631qr1r4cjnxg9kdvnlc55b5g5kajwf714w"; + version = "0.2.1.1"; + sha256 = "1i5rgbnvi7s5rq13kj4fnanzmalzh53rim0r3nxxa82i25nb1sfq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206565,6 +206808,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "powerdns" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, http-client, servant + , servant-client, servant-client-core, tasty, tasty-hunit, text + , time + }: + mkDerivation { + pname = "powerdns"; + version = "0.1"; + sha256 = "1fg698m3qmm5f0g0fl394hx593pwg7ai730imwahv00fr846lqm1"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq servant servant-client servant-client-core text time + ]; + testHaskellDepends = [ + base http-client servant-client servant-client-core tasty + tasty-hunit + ]; + description = "PowerDNS API bindings for api/v1"; + license = lib.licenses.bsd3; + }) {}; + "powermate" = callPackage ({ mkDerivation, base, directory, unix }: mkDerivation { @@ -209094,8 +209359,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.5.1"; - sha256 = "0mq2fal93v42rkgiq0xwqzqc413dgkiawa09bxgv0sgajzslqx80"; + version = "0.4.6.0"; + sha256 = "0jkrx34hymx70aqxjcnw2a7pdiw1hy4nc6m2larjrgxjczshpfqx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -210516,8 +210781,8 @@ self: { }: mkDerivation { pname = "proton"; - version = "0.0.3"; - sha256 = "0w68v8sglyg99jni1p1cz6x87cm6x1ayll08wlijaiwpqc2pma2n"; + version = "0.0.4"; + sha256 = "1z8w3ymn893jgzanxp89x6kga9d79kggvcgkm9mhwd9q88h97v91"; libraryHaskellDepends = [ adjunctions async base bifunctors comonad compactable containers contravariant distributive folds linear mtl profunctors tagged @@ -210588,8 +210853,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.1.0"; - sha256 = "020kfw1laishiqy8npg2f2llq7dv1djii0d0khjfw7f1scy4x10n"; + version = "0.1.2.0"; + sha256 = "0irhlscjq3anfhzn2qs28w4k6z48p557a060iqpimjw2kjkyrr4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210976,8 +211241,10 @@ self: { }: mkDerivation { pname = "publish"; - version = "2.1.6"; - sha256 = "1clb9sxrsskklzany9q5600v77qywdszgzxjxrvsihrirf0akry2"; + version = "2.2.2"; + sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28"; + revision = "2"; + editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -214212,29 +214479,35 @@ self: { }) {}; "raaz" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, criterion + ({ mkDerivation, attoparsec, base, bytestring , criterion-measurement, deepseq, hspec, hspec-discover, HUnit - , optparse-applicative, pretty, QuickCheck, transformers, vector + , optparse-applicative, pretty, QuickCheck, vector }: mkDerivation { pname = "raaz"; - version = "0.2.2"; - sha256 = "1v7zyk61vk4d6xniqq4fglwccgpx9clx7hxp1xr531spshadq99p"; + version = "0.3.0"; + sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring deepseq vector ]; - executableHaskellDepends = [ base optparse-applicative ]; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring criterion-measurement deepseq hspec HUnit pretty + QuickCheck vector + ]; + executableHaskellDepends = [ + base bytestring deepseq optparse-applicative vector + ]; testHaskellDepends = [ - base bytestring hspec hspec-discover HUnit QuickCheck transformers - vector + attoparsec base bytestring deepseq hspec hspec-discover HUnit + QuickCheck vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion criterion-measurement - pretty + base bytestring criterion-measurement deepseq pretty vector ]; - description = "The raaz cryptographic library"; - license = lib.licenses.bsd3; + doHaddock = false; + description = "Fast and type safe cryptography"; + license = "(Apache-2.0 OR BSD-3-Clause)"; }) {}; "rabocsv2qif" = callPackage @@ -216961,7 +217234,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_12_0_1" = callPackage + "rebase_1_13" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, hashable, hashable-time , mtl, profunctors, scientific, selective, semigroupoids, stm, text @@ -216970,8 +217243,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.12.0.1"; - sha256 = "1yl09702psialskvm39i9rl3sag853qr1237jhs79yk7nhvdlaqx"; + version = "1.13"; + sha256 = "0cqpp2cn3yi9d825qzavs52ky77b628fm8p7w51zy9qjx1p7650v"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either hashable hashable-time mtl profunctors scientific @@ -217060,8 +217333,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.10"; - sha256 = "1zwkc5mqcxlv4cm7qd75sdmvjckvpchcrqphsq82val41mp27nk5"; + version = "0.2.11"; + sha256 = "1hsk7n8hrskj30wcil4rvjhng3zcj7f9a0dn69371iay4x8d75md"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -218075,6 +218348,22 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "reflex-dom-ace" = callPackage + ({ mkDerivation, base, containers, data-default, ghcjs-dom, jsaddle + , lens, mtl, reflex-dom-core, text + }: + mkDerivation { + pname = "reflex-dom-ace"; + version = "0.3.0.3"; + sha256 = "024xwgqasf2sciz0paq7p1ry1njcz46pz2l1cyjxm562hjqvsb0h"; + libraryHaskellDepends = [ + base containers data-default ghcjs-dom jsaddle lens mtl + reflex-dom-core text + ]; + description = "Basic support for using the Ace editor with Reflex"; + license = lib.licenses.bsd3; + }) {}; + "reflex-dom-colonnade" = callPackage ({ mkDerivation, base, colonnade, containers, contravariant, reflex , reflex-dom, semigroups, text, vector @@ -221270,12 +221559,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_12_0_1" = callPackage + "rerebase_1_13" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.12.0.1"; - sha256 = "0kh0022hfviywa4rkwnrqygc7s3vg8qvr9znh66v5c1i3gaibzq5"; + version = "1.13"; + sha256 = "1ng16dnlrxcy76mpw21mwf2sk70q4i0kmqhxikjhc2h06zdpkqfr"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -223788,15 +224077,16 @@ self: { "rollbar" = callPackage ({ mkDerivation, aeson, base, basic-prelude, http-conduit - , lifted-base, monad-control, network, resourcet, text, vector + , lifted-base, monad-control, network, network-bsd, resourcet, text + , vector }: mkDerivation { pname = "rollbar"; - version = "1.1.2"; - sha256 = "1ip4bsnav2bwbbasz0mmfkq7cvi72jfdbz00r1ql4kpgwwkdhysz"; + version = "1.1.3"; + sha256 = "0mj8s2kfv8fw8mpb3xz8fvlyvdx46nsh1waw7jvw4cxphywfq9b8"; libraryHaskellDepends = [ aeson base basic-prelude http-conduit lifted-base monad-control - network resourcet text vector + network network-bsd resourcet text vector ]; description = "error tracking through rollbar.com"; license = lib.licenses.mit; @@ -224595,8 +224885,8 @@ self: { }: mkDerivation { pname = "rp-tree"; - version = "0.3.5"; - sha256 = "06av43wbyy68flcfdbz20dd3vmh4na44mh041z7h7rh6hzilzr1j"; + version = "0.3.6"; + sha256 = "0dz2xkgmk3lfr0pnc7xzfz756bzdkbmb2m96zdpw7vgyz59h9i64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224697,8 +224987,10 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.4"; - sha256 = "17zqnjn6zib0rvzj8gzpaj87b79v8fx5qlc6ifidi6rmykjqnx42"; + version = "0.4.5"; + sha256 = "1lz6w2nd8yq0arfpp6vnv7lazr9289wan00b6layfdhlql9f21vl"; + revision = "1"; + editedCabalFile = "05arkmpbh5fdqbqhkwl76isbigrsc0f54zkbdl21jap6k4g9kzsk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224709,7 +225001,7 @@ self: { base directory extra fgl optparse-applicative simple-cmd-args ]; testHaskellDepends = [ base extra hspec simple-cmd unix ]; - description = "Order RPM packages by dependencies"; + description = "Sort RPM packages in dependency order"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -225491,6 +225783,90 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, text, validity + , validity-bytestring, validity-text + }: + mkDerivation { + pname = "safe-coloured-text"; + version = "0.1.0.0"; + sha256 = "1fcqwllpbp9x1r1bvyry6bmp2s9rp8rlr3i94hdiydc71hpl7a0w"; + libraryHaskellDepends = [ + base bytestring text validity validity-bytestring validity-text + ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "safe-coloured-text-gen" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-bytestring + , genvalidity-sydtest, genvalidity-text, safe-coloured-text + , sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "safe-coloured-text-gen"; + version = "0.0.0.0"; + sha256 = "1z5livjv0n1i05i3fi58hi7vqwvycapnr5rp1m8rpgj8lhsbi9qx"; + libraryHaskellDepends = [ + base genvalidity genvalidity-bytestring genvalidity-text + safe-coloured-text + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + }) {}; + + "safe-coloured-text-layout" = callPackage + ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest + , sydtest-discover, text, validity + }: + mkDerivation { + pname = "safe-coloured-text-layout"; + version = "0.0.0.0"; + sha256 = "11fbfqs96dlhyywkmy97b2fsws0fdsv3illdd61w3fckbxbdw6bw"; + libraryHaskellDepends = [ base safe-coloured-text text validity ]; + testHaskellDepends = [ + base bytestring safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + description = "Safely layout output coloured text"; + license = lib.licenses.mit; + }) {}; + + "safe-coloured-text-layout-gen" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest + , safe-coloured-text, safe-coloured-text-gen + , safe-coloured-text-layout, sydtest, sydtest-discover + }: + mkDerivation { + pname = "safe-coloured-text-layout-gen"; + version = "0.0.0.0"; + sha256 = "1v4in8zl689j47jwac0z1k3rnnsc54qdclrbzja9aa364bmczzv8"; + libraryHaskellDepends = [ + base genvalidity safe-coloured-text-gen safe-coloured-text-layout + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text safe-coloured-text-gen + safe-coloured-text-layout sydtest + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + }) {}; + + "safe-coloured-text-terminfo" = callPackage + ({ mkDerivation, base, safe-coloured-text, terminfo }: + mkDerivation { + pname = "safe-coloured-text-terminfo"; + version = "0.0.0.0"; + sha256 = "0f94zzmanmxplkcg1s954rq00ppv69icyjpzr5s0g6c14zp1k85b"; + libraryHaskellDepends = [ base safe-coloured-text terminfo ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + }) {}; + "safe-decimal" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , exceptions, hspec, hspec-discover, QuickCheck, scientific @@ -225834,6 +226210,18 @@ self: { license = lib.licenses.mit; }) {}; + "safe-wild-cards" = callPackage + ({ mkDerivation, base, template-haskell, th-abstraction }: + mkDerivation { + pname = "safe-wild-cards"; + version = "1.0.0"; + sha256 = "1cgs7v30jamk2i8xbis7gc5n0f3c9rykxq7s81mxafyyj33ac36d"; + libraryHaskellDepends = [ base template-haskell th-abstraction ]; + testHaskellDepends = [ base ]; + description = "Use RecordWildCards safely"; + license = lib.licenses.bsd3; + }) {}; + "safecopy" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , generic-data, HUnit, lens, lens-action, old-time, QuickCheck @@ -226194,6 +226582,32 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsodium;}; + "saltine_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , libsodium, profunctors, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "saltine"; + version = "0.2.0.0"; + sha256 = "1xgrnm6qmm0mymq3dh4mdvzi8sfssnpz06xsrw8zdpa1vl0a0gm6"; + libraryHaskellDepends = [ + base bytestring deepseq hashable profunctors text + ]; + libraryPkgconfigDepends = [ libsodium ]; + testHaskellDepends = [ + base bytestring QuickCheck semigroups test-framework + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + benchmarkSystemDepends = [ libsodium ]; + description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsodium;}; + "saltine-quickcheck" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex , libsodium, QuickCheck, saltine, tasty, tasty-quickcheck @@ -226550,6 +226964,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich_0_1_0_7" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, directory, exceptions, filepath + , free, haskell-src-exts, lens, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.0.7"; + sha256 = "1ndw054vp2ygxd86whqbsdvrbv49khh1a6ia9zlqzx3gjbhqpxxi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sandwich-quickcheck" = callPackage ({ mkDerivation, base, brick, free, monad-control, QuickCheck , safe-exceptions, sandwich, string-interpolate, text, time @@ -226643,6 +227101,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "sandwich-webdriver_0_1_0_5" = callPackage + ({ mkDerivation, aeson, base, containers, convertible, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, lifted-base, microlens, microlens-aeson + , monad-control, monad-logger, mtl, network, process, random, retry + , safe, safe-exceptions, sandwich, string-interpolate, temporary + , text, time, transformers, unix, unordered-containers, vector + , webdriver, X11 + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.1.0.5"; + sha256 = "113as1i4f3hghbwrf4ii8lnxxb8nih177ffjbx3shsddnhx0fa8y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + executableHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + testHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -226990,8 +227492,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "8.14"; - sha256 = "1yf350daksxwz084j81ngamr53jpz7y2fi4cnpni6vy16mb0sxz1"; + version = "8.15"; + sha256 = "11qzh2gfq9v8cxz6jjbipnfiwjs0hw34ghg5gdpr0h7bj77in30p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -227818,20 +228320,20 @@ self: { "scientific" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, hashable, integer-gmp, integer-logarithms, primitive - , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, template-haskell, text }: mkDerivation { pname = "scientific"; - version = "0.3.6.2"; - sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397"; + version = "0.3.7.0"; + sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp - integer-logarithms primitive text + integer-logarithms primitive template-haskell text ]; testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text + base binary bytestring QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck text ]; benchmarkHaskellDepends = [ base criterion ]; description = "Numbers represented using scientific notation"; @@ -230261,13 +230763,13 @@ self: { , cassava, containers, data-default, directory, doctest , doctest-discover, file-embed, filepath, hlint, hspec , hspec-discover, html-charset, http-client, http-types - , optparse-applicative, QuickCheck, temporary, text, text-trie - , unicode-show, wai, warp, zip + , interpolatedstring-perl6, optparse-applicative, QuickCheck + , random, temporary, text, text-trie, unicode-show, wai, warp, zip }: mkDerivation { pname = "seonbi"; - version = "0.1.1"; - sha256 = "1jsikmlr647c51zmd471wnff6wzxybmp7bvidvyx5fkzb3nlhrqb"; + version = "0.2.0"; + sha256 = "1bj428ds0lw6vg0927mn9ss63zrrzfi9jn7fy1hpr583vywc8pba"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -230284,8 +230786,9 @@ self: { optparse-applicative text wai warp ]; testHaskellDepends = [ - aeson base bytestring containers doctest doctest-discover hlint - hspec hspec-discover QuickCheck text unicode-show + aeson base bytestring containers directory doctest doctest-discover + filepath hlint hspec hspec-discover interpolatedstring-perl6 + QuickCheck random text unicode-show ]; testToolDepends = [ hspec-discover ]; description = "SmartyPants for Korean language"; @@ -231153,8 +231656,8 @@ self: { }: mkDerivation { pname = "servant-auth-wordpress"; - version = "1.0.0.1"; - sha256 = "08ngbgmzksp27n8znigrj5i2nvsqjansn4vv3my38vdqqgzm09w8"; + version = "1.0.0.2"; + sha256 = "0j4n5anlw3a2cgclmyblg01dcls91hzlmxgc2jkcdpwd49i0pv5n"; libraryHaskellDepends = [ base mtl servant-server text time wai wordpress-auth ]; @@ -237457,12 +237960,12 @@ self: { , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network , network-transport, optparse-applicative, QuickCheck, random , simple-logger, sqlite-simple, stm, template-haskell, text, time - , timeit, transformers, unliftio, unliftio-core, x509 + , timeit, transformers, unliftio, unliftio-core, websockets, x509 }: mkDerivation { pname = "simplexmq"; - version = "0.3.1"; - sha256 = "0rc443nq4m1ghi5wbsaj6ravqs488lb2si0xmisg9h5ghsh204bf"; + version = "0.3.2"; + sha256 = "1bxg91ycmpa8762v5vdviqvyzkfap4iv9plnr7gcibf8vsd39qxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237470,7 +237973,8 @@ self: { base64-bytestring bytestring containers cryptonite directory filepath generic-random iso8601-time memory mtl network network-transport QuickCheck random simple-logger sqlite-simple stm - template-haskell text time transformers unliftio unliftio-core x509 + template-haskell text time transformers unliftio unliftio-core + websockets x509 ]; executableHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base @@ -237478,7 +237982,7 @@ self: { directory filepath generic-random ini iso8601-time memory mtl network network-transport optparse-applicative QuickCheck random simple-logger sqlite-simple stm template-haskell text time - transformers unliftio unliftio-core x509 + transformers unliftio unliftio-core websockets x509 ]; testHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base @@ -237486,7 +237990,7 @@ self: { filepath generic-random hspec hspec-core HUnit iso8601-time memory mtl network network-transport QuickCheck random simple-logger sqlite-simple stm template-haskell text time timeit transformers - unliftio unliftio-core x509 + unliftio unliftio-core websockets x509 ]; description = "SimpleXMQ message broker"; license = lib.licenses.agpl3Only; @@ -237574,15 +238078,15 @@ self: { }) {inherit (pkgs.xorg) libXft;}; "single-tuple" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, OneTuple, Only }: + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, OneTuple + , Only + }: mkDerivation { pname = "single-tuple"; - version = "0.1.1.0"; - sha256 = "1cviix5did4pm4bimg12v2qa9ms5icf19k3iz13g07d5q9jyiwji"; - revision = "1"; - editedCabalFile = "0gmki1bz7sn1lw5f1f1zp3rfphwba03fv6825djlidybln8snld0"; - libraryHaskellDepends = [ base OneTuple Only ]; - testHaskellDepends = [ base hspec OneTuple Only ]; + version = "0.1.2.0"; + sha256 = "1dxrdddfdvs69icv6ixjv5crfznllxvg8sjiw9xwyn26f36g2mw8"; + libraryHaskellDepends = [ base ghc-prim OneTuple Only ]; + testHaskellDepends = [ base ghc-prim hspec OneTuple Only ]; testToolDepends = [ hspec-discover ]; description = "a class for single tuple implementations"; license = lib.licenses.asl20; @@ -238650,8 +239154,8 @@ self: { }: mkDerivation { pname = "slave-thread"; - version = "1.1"; - sha256 = "02b64s0m7k81s187wj81yzr7l73p79iyh7a59dqf7r72l4r7akbd"; + version = "1.1.0.1"; + sha256 = "05hz0qglxg889l3b0sw9f79xqssw70fd62a766xcvj7aalmrc32i"; libraryHaskellDepends = [ base deferred-folds focus foldl stm-containers ]; @@ -242883,6 +243387,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "speculate_0_4_8" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.8"; + sha256 = "1xrrd1r4sbhvahdd3k9xnh8w9mmk4zh738q9blrjnvnd560wybp4"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -243347,8 +243867,8 @@ self: { }: mkDerivation { pname = "splitmix-distributions"; - version = "0.8.0.0"; - sha256 = "1l7fh6nycsxy15m2w60pq6zp4iq811wzbklkyrc7z3wlghskqrmk"; + version = "0.9.0.0"; + sha256 = "0y6v93kgbldkf9pznrfy8848njy7cln7bd3nrx2b7dmrz6yd4rpz"; libraryHaskellDepends = [ base containers erf exceptions mtl splitmix transformers ]; @@ -244345,8 +244865,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.2.0.0"; - sha256 = "1qxns33mmr1nxw6gabi5s1i70ksp0ls54q7cf95fy7vs1nwngz0n"; + version = "0.2.1.0"; + sha256 = "1dv4333an20mlhmsxhaldjcj54pnkjvp7zpiasd6shii5d4cn0z1"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; @@ -245675,6 +246195,8 @@ self: { pname = "statestack"; version = "0.3"; sha256 = "1b8yd314h8a97ggjv82cy4mr0f4scb5pjvslxq7hwxxq7cw7mgns"; + revision = "1"; + editedCabalFile = "03kk2zab7mcr5m89mxxl0zivag2hb024ijfdi0mp794hswncwhxy"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -246476,14 +246998,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_0_0" = callPackage + "stm_2_5_0_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.0.0"; - sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr"; - revision = "1"; - editedCabalFile = "189fxk75h7n27kw7ndyn8nkxm3117qdh1dpag1mcs487kxghff62"; + version = "2.5.0.1"; + sha256 = "1fipf3bbk34mbld1apwnq6kbjxbrz2nc9cxxmhkk2bdcc2z4y7j5"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -248156,6 +248676,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "streamt" = callPackage + ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty + , tasty-hunit + }: + mkDerivation { + pname = "streamt"; + version = "0.5.0.0"; + sha256 = "0r2r6ribk85hwmzdn2imgajb28q5d5gbhysr62bw2jhmd5xy7985"; + libraryHaskellDepends = [ base logict mtl ]; + testHaskellDepends = [ + async base criterion hspec mtl tasty tasty-hunit + ]; + description = "Simple, Fair and Terminating Backtracking Monad Transformer"; + license = lib.licenses.bsd3; + }) {}; + "strelka" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude , base64-bytestring, bifunctors, bytestring @@ -248615,8 +249151,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.1.0"; - sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; + version = "0.3.1.1"; + sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -253003,8 +253539,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "3.2.4"; - sha256 = "1hv0s9kp0ixha9qjgrp1l52w48z68ngk17a0c6364qc95qsd2ycp"; + version = "3.2.5"; + sha256 = "1gfdlqgdqq2ivvzj7cgqahpm2bmwg90ri5ss7ah38alrp5rvda1v"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -253610,6 +254146,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "talash" = callPackage + ({ mkDerivation, alfred-margaret, base, brick, bytestring + , colorful-monoids, containers, directory, ghc-compact, intro + , microlens, microlens-th, text, unix, unordered-containers, vector + , vector-algorithms, vector-sized, vty + }: + mkDerivation { + pname = "talash"; + version = "0.1.0.1"; + sha256 = "1j28i5aipldjknfx22dil0xi1gwlv89frl1fn606yl1g84q1kr5n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alfred-margaret base brick bytestring colorful-monoids containers + directory ghc-compact intro microlens microlens-th text unix + unordered-containers vector vector-algorithms vector-sized vty + ]; + executableHaskellDepends = [ base ]; + description = "Line oriented fast enough text search"; + license = lib.licenses.gpl3Only; + }) {}; + "tamarin-prover" = callPackage ({ mkDerivation, aeson, array, base, binary, blaze-builder , blaze-html, bytestring, cmdargs, conduit, containers, deepseq @@ -254386,14 +254944,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tasty-hspec_1_1_7" = callPackage + "tasty-hspec_1_2" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.7"; - sha256 = "05738x9hvnwqlp91x2da3b3fpn84hbsha7850xphnh2bpbx3lbx1"; + version = "1.2"; + sha256 = "0hnq6q4mk2avirb8cgibaxj5m2c4rf5xsqry04zx4nc15la5xniw"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -257740,8 +258298,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.7.0.1"; - sha256 = "0y3z5jda7v2iyll2148ivxfd2yhp27d3ryxrspp0cdq394klqxp2"; + version = "0.7.1.0"; + sha256 = "0s9gcd9lcrhk92ydhizyk0vbpf542ipc4hj60fa02b2g2x9q93ij"; libraryHaskellDepends = [ base bytestring deepseq text ]; librarySystemDepends = [ icu ]; testHaskellDepends = [ @@ -258120,12 +258678,14 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.6"; - sha256 = "05hr2185q4rcn1hvrrkqy2sbl8xzk7ij00x61vhvmyk29dbbk2cf"; + version = "0.1"; + sha256 = "0jzqq709r4jpbvgkix9ybi6asvhshl0ayz5a4gddrccli5k430n6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base optparse-applicative parsec ]; + libraryHaskellDepends = [ base containers text ]; + executableHaskellDepends = [ + base optparse-applicative parsec text + ]; testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; license = lib.licenses.asl20; @@ -259865,8 +260425,8 @@ self: { pname = "through-text"; version = "0.1.0.0"; sha256 = "1kdl36n98kajaa7v7js2sy8bi09p8rrxmlfcclcfc1l92bd2aclk"; - revision = "5"; - editedCabalFile = "1fdy2wyczl2jncy9gg0asasb8bybcnif8aqnw9fq73sr1778kjpf"; + revision = "6"; + editedCabalFile = "12mqlm77g0fymx3xwlkf6s9nqivcf78szhrzkvssi7lq1lqq9lbc"; libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; license = lib.licenses.bsd3; @@ -260379,6 +260939,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "time-compat_1_9_6" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, hashable + , HUnit, QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck + , time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.6"; + sha256 = "0k466nyn7v8g3lx0gjfq6hzs4gmm4ws2wcm7xqyw48fmn55pb5rx"; + libraryHaskellDepends = [ + base base-orphans deepseq hashable time + ]; + testHaskellDepends = [ + base base-compat deepseq hashable HUnit QuickCheck tagged tasty + tasty-hunit tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -262654,6 +263235,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "tophat" = callPackage + ({ mkDerivation, base, filepath, hspec, profunctors, text }: + mkDerivation { + pname = "tophat"; + version = "1.0.0.0"; + sha256 = "0zwhik8x2z1kbyv873kvdbnzyyg4f6qky1gw03icarxan9553s7m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base profunctors text ]; + executableHaskellDepends = [ base filepath text ]; + testHaskellDepends = [ base hspec profunctors text ]; + description = "Template-to-Haskell preprocessor, and templating language"; + license = lib.licenses.gpl3Only; + }) {}; + "topkata" = callPackage ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL , OpenGL, parseargs, random @@ -267281,6 +267877,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "typed-time" = callPackage + ({ mkDerivation, base, hspec, hspec-core, time }: + mkDerivation { + pname = "typed-time"; + version = "0.1.0.0"; + sha256 = "0fk8zb198i5xfwrc820br8hh1nfcqcrzyzkyf0srijjf88m92y27"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base hspec hspec-core time ]; + description = "A strongly typed way to handle time and date formats"; + license = lib.licenses.isc; + }) {}; + "typed-uuid" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable , http-api-data, random, text, uuid, validity, validity-uuid @@ -268999,17 +269607,17 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, containers, data-default, hspec + ({ mkDerivation, base, containers, data-default, hashable, hspec , hspec-discover, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.9.1.0"; - sha256 = "1jqljawh6xvavp9g8mjlw4pkiagd59yybbizr9vcg70dd8pnanv2"; + version = "0.10.1.0"; + sha256 = "0f9giqhd4jjqdd0wcbrrd8f01bhqv25m13ss3f1jfaaacaiylpam"; libraryHaskellDepends = [ - base containers data-default QuickCheck text + base containers data-default hashable QuickCheck text ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base hashable hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; license = lib.licenses.bsd3; @@ -270144,8 +270752,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.16"; - sha256 = "1zawfyjr8immg5sqvwknwqp3xym0acjhlqm0y6xs63wjvp72wb3r"; + version = "0.2.17"; + sha256 = "1z37bqnrzhqhg7dfmsqz31lq8ng3qnkknc9d4pxbjbbmf1g21hfv"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -270162,6 +270770,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_18" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.18"; + sha256 = "0yg5x2v3p4pdw7892l1mkihmdbak14qvmni1vk2a0y2gdmxfvx1y"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -270300,8 +270934,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.13.0"; - sha256 = "0mbvld5dym17jc13ycl862k73kg26y9khb8578w13cwfmdli7c46"; + version = "0.2.14.0"; + sha256 = "0rw8kmg7xjlacmr1hcpin95abkd387awf154s9ran7zg9jllh3x1"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck random @@ -270576,6 +271210,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "unsatisfiable" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "unsatisfiable"; + version = "0"; + sha256 = "0cvlqrrr31dn2agd7cz2s5gnf2m1yy21kwmymcpdg5zk34dc19wh"; + libraryHaskellDepends = [ base ghc ]; + description = "Unsatisfiable type class"; + license = lib.licenses.bsd3; + }) {}; + "unscramble" = callPackage ({ mkDerivation, array, base, optparse-applicative, stream-fusion , unordered-containers @@ -270740,8 +271385,8 @@ self: { }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.2.5"; - sha256 = "0lga69cnzysayvsflbcf43i7ncnib9mq62azi30kpm860s0h5lfb"; + version = "0.2.7"; + sha256 = "0knwn11c3kdh1xbpa8l6kgskis9fcsjr06hxay3rl4yiqprf80xn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274476,8 +275121,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.13.2"; - sha256 = "1ymrh8ra54a2x3kmw87gfcrv413rbr4msy0ppppi6lh2lvq5zk09"; + version = "0.13.3"; + sha256 = "0mlk94n3s4ah8y9w9vcrk1n7gnsm19d1iijk9da4219dwrkaax2l"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ aeson base hspec lens lens-aeson microlens mtl should-not-typecheck @@ -277471,30 +278116,30 @@ self: { ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , http2, HUnit, iproute, network, process, QuickCheck , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, vault, wai, word8, x509 + , unix, unix-compat, unliftio, vault, wai, word8, x509 }: mkDerivation { pname = "warp"; - version = "3.3.15"; - sha256 = "0nj4xxzjcy33hyfdagpc2ij6ga71r1fmc248rjgwsyfflial63bz"; + version = "3.3.16"; + sha256 = "1qnngw7afh448hv7fzp4l36j7hz6f8a8f1qga976j8l53qhmgcf1"; libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 x509 + array auto-update base bsb-http-chunked bytestring case-insensitive + containers ghc-prim hashable http-date http-types http2 iproute + network simple-sendfile stm streaming-commons text time-manager + unix unix-compat unliftio vault wai word8 x509 ]; testHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute lifted-base - network process QuickCheck simple-sendfile stm streaming-commons - text time time-manager unix unix-compat vault wai word8 x509 + http-client http-date http-types http2 HUnit iproute network + process QuickCheck simple-sendfile stm streaming-commons text time + time-manager unix unix-compat unliftio vault wai word8 x509 ]; benchmarkHaskellDepends = [ auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat x509 + http-types network time-manager unix unix-compat unliftio x509 ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; @@ -277574,15 +278219,16 @@ self: { "warp-tls" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, wai, warp + , network, streaming-commons, tls, tls-session-manager, unliftio + , wai, warp }: mkDerivation { pname = "warp-tls"; - version = "3.3.0"; - sha256 = "03fwwggl6lhxs7swwylgpk9j8g5szq2h871nfbgs6xzr1b5hpas1"; + version = "3.3.1"; + sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager wai warp + streaming-commons tls tls-session-manager unliftio wai warp ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; @@ -279920,18 +280566,18 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec + ({ mkDerivation, base, bytestring, containers, HUnit , template-haskell, text, time }: mkDerivation { pname = "witch"; - version = "0.3.1.0"; - sha256 = "1jk0p1w5a3nr12nn6afwagpgkv1i6pyn83idkbps6kq3kb3l15w4"; + version = "0.3.3.0"; + sha256 = "0wckjjy7yxq899f515xhwl2izqmrr9zck0kjlgz6qfa1fsl6lbvx"; libraryHaskellDepends = [ base bytestring containers template-haskell text time ]; testHaskellDepends = [ - base bytestring containers hspec text time + base bytestring containers HUnit text time ]; description = "Convert values from one type into another"; license = lib.licenses.isc; @@ -280665,8 +281311,8 @@ self: { }: mkDerivation { pname = "wordpress-auth"; - version = "1.0.0.0"; - sha256 = "150rri8lrl6j3f9q7wc34ajg06rakgk8a5npzz7vdap64994wy5c"; + version = "1.0.0.1"; + sha256 = "10drplm0bg72ph87apbdmm4ar7gh09x6w6sgwgvdkz4zpkc48s0j"; libraryHaskellDepends = [ base base16-bytestring bytestring cookie cryptohash-md5 cryptohash-sha256 hs-php-session http-types mtl text time @@ -283499,6 +284145,8 @@ self: { pname = "xmonad"; version = "0.15"; sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa"; + revision = "1"; + editedCabalFile = "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283549,6 +284197,8 @@ self: { pname = "xmonad-contrib"; version = "0.16"; sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd"; + revision = "1"; + editedCabalFile = "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011"; libraryHaskellDepends = [ base bytestring containers directory extensible-exceptions filepath mtl old-locale old-time process random semigroups unix utf8-string @@ -284832,8 +285482,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.1"; - sha256 = "05z892g8c9alwmjwjm1405s43s8cdbj42ymqc9jlb27qc8ikc4n7"; + version = "0.1.0.2"; + sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64 bytestring conduit containers foldl hashable libyaml mtl scientific @@ -284893,8 +285543,8 @@ self: { }: mkDerivation { pname = "yamlparse-applicative"; - version = "0.1.0.3"; - sha256 = "14fp7qyfh9ax2cqp5amvj2hi8fl9imdq25j8bx5mil8f2jxqr6bi"; + version = "0.1.0.4"; + sha256 = "19z6bg8pvhaccc4pc89a2hc1f1g9x66ma179gfx36pjgqdkp0fg1"; libraryHaskellDepends = [ aeson base bytestring containers optparse-applicative path path-io prettyprinter safe-coloured-text scientific text @@ -285794,8 +286444,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.7.1.6"; - sha256 = "062f2fv4ixr5bd5xcs208xfg2i18z25g3imf86qrziv0yxxg5qpc"; + version = "1.7.1.7"; + sha256 = "1daibkn5qhw131pp0sfyahyicwlgpin90zkcrwr2qk05ms5j3hj5"; libraryHaskellDepends = [ aeson base bytestring persistent text yesod-auth yesod-core yesod-form yesod-persistent @@ -286036,6 +286686,25 @@ self: { broken = true; }) {}; + "yesod-autoreload" = callPackage + ({ mkDerivation, base, shakespeare, text, yesod-core + , yesod-websockets + }: + mkDerivation { + pname = "yesod-autoreload"; + version = "0.0.0.0"; + sha256 = "1dzig02l00hw9xz974pf923yr6045x45sw8nnhnqw8rd67r2l7d3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base shakespeare text yesod-core yesod-websockets + ]; + executableHaskellDepends = [ base yesod-core ]; + testHaskellDepends = [ base ]; + description = "Auto-reload a yesod app during development"; + license = lib.licenses.mit; + }) {}; + "yesod-bin" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath @@ -286175,8 +286844,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.20"; - sha256 = "1f3imbd22i9vl30760063p308byddwxafpl5hdric2z7vmnxayqy"; + version = "1.6.20.1"; + sha256 = "1y24sn30fm7bjq9rfv4lclz3vraaac9qbd2xgz949agm2irjwg4p"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -286818,8 +287487,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.7"; - sha256 = "1jkisnlbg5p5fd28r37xp844mjdpdz13s9dfpzbr30pxbyy57kf8"; + version = "2.0.0.8"; + sha256 = "1azd2kv5b36kryz3l587mn329a46m8mp4z8knzx5va24bmhca9jy"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core From 0b93c12bd43fed427bc1830c9094ab5450520076 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 00:53:44 +0200 Subject: [PATCH 04/42] haskell.packages: remove obsolete source overrides Both taffybar and ap-normalize where bumped to a version newer than the last hackage pin which we have caught up with now, so we can clean up those. --- .../haskell-modules/configuration-common.nix | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5cc0a3e79cd5..45a45b3c939d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1967,30 +1967,4 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; - # 2021-05-23: Override for a quite recent Hackage release. - taffybar = - if pkgs.lib.versionAtLeast super.taffybar.version "3.2.5" - then throw "Drop src override for taffybar >= 3.2.5" - else overrideCabal super.taffybar (drv: { - src = pkgs.fetchFromGitHub { - owner = "taffybar"; - repo = "taffybar"; - rev = "91c83e01e131d560e704b12f0d798905e4289a3d"; - sha256 = "1kkpkjdyd1yv8z1qlzr3jrzyk9lxac5m4f9py8igyars2nwnhhzr"; - }; - version = "3.2.5"; - editedCabalFile = null; - }); - - # 2021-05-25: Fixes darwin build: https://gitlab.com/lysxia/ap-normalize/-/issues/1 - ap-normalize = - assert pkgs.lib.versionOlder super.ap-normalize.version "0.1.0.1"; - overrideSrc super.ap-normalize rec { - version = "0.1.0.1"; - src = pkgs.fetchurl { - url = "https://hackage.haskell.org/package/ap-normalize-${version}/ap-normalize-${version}.tar.gz"; - sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2"; - }; - }; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f0db03628345a9c3dc3ec9a4fe7ea2a0552b4600 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 01:16:35 +0200 Subject: [PATCH 05/42] haskellPackages.parallel-io: update override comment --- 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 45a45b3c939d..15bfc1b24a05 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1943,8 +1943,8 @@ EOT # https://github.com/haskell-hvr/missingh/issues/56 MissingH = doJailbreak super.MissingH; - # Too strict bound on random - # https://github.com/batterseapower/parallel-io/issues/14 + # Too strict bound on containers + # https://github.com/batterseapower/parallel-io/issues/14#issuecomment-853441933 parallel-io = doJailbreak super.parallel-io; # Disable flaky tests From 5ccfe3400ea34aa87f5ca368aac9d16d4a68d4ab Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 23 May 2021 12:45:27 +0800 Subject: [PATCH 06/42] haskellPackages.update-nix-fetchgit: Remove patches now present on Hackage --- .../haskell-modules/configuration-common.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 15bfc1b24a05..d8d6d0aec726 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1398,22 +1398,6 @@ self: super: { pkgs.lib.makeBinPath deps }" ''; - - # These can both be removed upon the release of update-nix-fetchgit-0.2.7 - patches = [ - # 2021-05-17 compile with hnix >= 0.13 - # https://github.com/expipiplus1/update-nix-fetchgit/pull/64 - (pkgs.fetchpatch { - url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch"; - sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg"; - }) - # Fix test failure - # https://github.com/expipiplus1/update-nix-fetchgit/pull/60 - (pkgs.fetchpatch { - url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/4a43e1ea4e7e1c18de81e3f9fe0b86faa70865f5.patch"; - sha256 = "1z74c1blgwr4q37m1rhlj7534qbnp3nnxf63m8j2b7iz0ljgm0m9"; - }) - ] ++ (drv.patches or []); })); # Our quickcheck-instances is too old for the newer binary-instances, but From c5b75e96d9b9582ce0e2483911110ca9527ff5e7 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 23 May 2021 12:45:45 +0800 Subject: [PATCH 07/42] haskellPackages.hnix: Remove patches now present on Hackage --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d8d6d0aec726..4a85a2205f24 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -203,13 +203,6 @@ self: super: { sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; revert = true; }) - # fix broken location annotations (necessary for update-nix-fetchgit). - # Can be removed on the next hnix release after - # https://github.com/haskell-nix/hnix/pull/936 is merged. - (pkgs.fetchpatch { - url = "https://github.com/expipiplus1/hnix/commit/7cd998426ab7d930d288a1d6e266dc4e85cece3d.patch"; - sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6"; - }) ] ++ (drv.patches or []); # make sure patches are not broken by cabal file revisions revision = null; From 67c5d844e1ad4289823ea0d771b9ea9d1bc51314 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 01:35:28 +0200 Subject: [PATCH 08/42] haskellPackages.hnix: make build with relude < 1.0 The commits we revert still do the trick, but we need to revert one additional commit now which increases the lower version bound for relude. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a85a2205f24..96be9da9a20b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -203,6 +203,12 @@ self: super: { sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; revert = true; }) + # allow relude < 1.0 again + (pkgs.fetchpatch { + url = "https://github.com/haskell-nix/hnix/commit/f4ea5dcb344369916586498ba33c00d0fc605a79.patch"; + sha256 = "1ajl7d49d658xhalgf3pc5svmbq73dsysy6z434n75vb1357mx86"; + revert = true; + }) ] ++ (drv.patches or []); # make sure patches are not broken by cabal file revisions revision = null; From 1be4cb6748318e7a6e0f96908b095ea6fef5ac6c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 02:15:59 +0200 Subject: [PATCH 09/42] haskell-ci: no longer mark as broken haskell-ci just builds (again?) without any necessary changes --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index da10af5b53d6..1f3ac79cc923 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1832,7 +1832,6 @@ broken-packages: - haskell-awk - haskell-bitmex-rest - haskell-brainfuck - - haskell-ci - haskell-cnc - haskell-coffee - haskell-compression diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1acb41a9f743..f9ab52ff613d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -118430,8 +118430,6 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-cnc" = callPackage From 6c9f648f7572f54668f3a3b8f1a6259384d187c8 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Thu, 3 Jun 2021 11:51:26 +0800 Subject: [PATCH 10/42] haskellPackages.uusi: add to top-level --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 86edacf144ba..3680c0446820 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -126,6 +126,7 @@ package-maintainers: berberman: - nvfetcher - arch-web + - uusi bdesham: - pinboard-notes-backup cdepillabout: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f9ab52ff613d..0005cf86205d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -272815,6 +272815,7 @@ self: { ]; description = "Tweak .cabal files"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ berberman ]; }) {}; "uvector" = callPackage diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 043d76347418..934341194f6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4318,6 +4318,8 @@ in uudeview = callPackage ../tools/misc/uudeview { }; + uusi = haskell.lib.justStaticExecutables haskellPackages.uusi; + uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { inherit (python3Packages) sphinx; inherit (darwin.apple_sdk.frameworks) Security; From da993f42ee4fae6fbafa92db56b295aedeb92d21 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 11:51:34 +0200 Subject: [PATCH 11/42] top-level/release-haskell.nix: add missing top-level packages Inherit nvfetcher and uusi jobs from top-level for extra visibility. --- 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 7a3eb608389d..36a5835c9cd0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -175,6 +175,7 @@ let nix-tree nixfmt nota + nvfetcher ormolu pandoc pakcs @@ -199,6 +200,7 @@ let tldr-hs tweet-hs update-nix-fetchgit + uusi uqm uuagc vaultenv From 52d69816b0f86c67844bfa34c22e86cdc187d074 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 12:25:50 +0200 Subject: [PATCH 12/42] haskell.packages: remove constraint on monoid-extras Seems like the monoid-extras situation wasn't as bad as I thought and some new releases in the meantime make every diagrams package we had working previously work again. * haskellPackages.monoid-extras: 0.5.1 -> 0.6 * haskellPackages.diagrams-lib: remove now unnecessary patch * haskellPackages.namespace: jailbreak to build with new monoid-extras --- .../haskell-modules/configuration-common.nix | 18 ++++------ .../configuration-hackage2nix/main.yaml | 7 ---- .../haskell-modules/hackage-packages.nix | 36 ------------------- 3 files changed, 7 insertions(+), 54 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 96be9da9a20b..6363ab1ff0e6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -703,22 +703,18 @@ self: super: { # 2021-03-12: All of this libraries have to restrictive upper bounds # https://github.com/diagrams/diagrams-core/issues/112 + # https://github.com/diagrams/diagrams-cairo/issues/77 active = doJailbreak super.active; statestack = doJailbreak super.statestack; force-layout = doJailbreak super.force-layout; size-based = doJailbreak super.size-based; dual-tree = doJailbreak super.dual-tree; + diagrams-cairo = doJailbreak super.diagrams-cairo; diagrams-core = doJailbreak super.diagrams-core; diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; - # apply patch from master to add compat with optparse-applicative >= 0.16 - diagrams-lib = doJailbreak (appendPatch super.diagrams-lib - (pkgs.fetchpatch { - url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; - sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; - includes = [ "*/CmdLine.hs" ]; - })); + diagrams-lib = doJailbreak super.diagrams-lib; # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; @@ -1804,10 +1800,6 @@ self: super: { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; - # Too strict version bounds on base and optparse-applicative - # https://github.com/diagrams/diagrams-cairo/issues/77 - diagrams-cairo = doJailbreak super.diagrams-cairo; - # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; @@ -1950,4 +1942,8 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; + # 2021-06-03: Too strict bounds on monoid-extras + # https://github.com/xu-hao/namespace/issues/1 + namespace = doJailbreak super.namespace; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3680c0446820..dbf356292e99 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,13 +77,6 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # - # 2021-05-11: not all diagrams libraries have adjusted to - # monoid-extras 0.6 yet, keep them pinned to lower versions - # until we can do a full migration, see - # https://github.com/diagrams/diagrams-core/issues/115 - # We can keep this pin at most until base 4.15 - - monoid-extras < 0.6 - - diagrams-core < 1.5.0 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0005cf86205d..4b0c4f4edc18 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74287,25 +74287,6 @@ self: { }) {}; "diagrams-core" = callPackage - ({ mkDerivation, adjunctions, base, containers, distributive - , dual-tree, lens, linear, monoid-extras, mtl, profunctors - , semigroups, unordered-containers - }: - mkDerivation { - pname = "diagrams-core"; - version = "1.4.2"; - sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43"; - revision = "1"; - editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7"; - libraryHaskellDepends = [ - adjunctions base containers distributive dual-tree lens linear - monoid-extras mtl profunctors semigroups unordered-containers - ]; - description = "Core libraries for diagrams EDSL"; - license = lib.licenses.bsd3; - }) {}; - - "diagrams-core_1_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -74320,7 +74301,6 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -177965,21 +177945,6 @@ self: { }) {}; "monoid-extras" = callPackage - ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups - }: - mkDerivation { - pname = "monoid-extras"; - version = "0.5.1"; - sha256 = "0xfrkgqn9d31z54l617m3w3kkd5m9vjb4yl247r3zzql3mpb1f37"; - revision = "2"; - editedCabalFile = "0gbrwpr7rzh9mmf59yhs74hixgclmxngaxx51j7pvr6wnkbvz3a3"; - libraryHaskellDepends = [ base groups semigroupoids semigroups ]; - benchmarkHaskellDepends = [ base criterion semigroups ]; - description = "Various extra monoid-related definitions and utilities"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-extras_0_6" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { @@ -177990,7 +177955,6 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-owns" = callPackage From 6e9760124b11e5ea7ddd1607d873319910fa4baa Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 3 Jun 2021 12:31:24 +0200 Subject: [PATCH 13/42] haskellPackages.diagrams-rasterific: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6363ab1ff0e6..bbc5df3c6966 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -704,6 +704,7 @@ self: super: { # 2021-03-12: All of this libraries have to restrictive upper bounds # https://github.com/diagrams/diagrams-core/issues/112 # https://github.com/diagrams/diagrams-cairo/issues/77 + # https://github.com/diagrams/diagrams-rasterific/issues/63 active = doJailbreak super.active; statestack = doJailbreak super.statestack; force-layout = doJailbreak super.force-layout; @@ -715,6 +716,7 @@ self: super: { diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; diagrams-lib = doJailbreak super.diagrams-lib; + diagrams-rasterific = doJailbreak super.diagrams-rasterific; # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1f3ac79cc923..ae5e77644b1a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1005,7 +1005,6 @@ broken-packages: - diagrams-gtk - diagrams-pdf - diagrams-qrcode - - diagrams-rasterific - diagrams-tikz - dib - dice2tex diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4b0c4f4edc18..258ef9fea7b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74554,8 +74554,6 @@ self: { testHaskellDepends = [ base diagrams-core diagrams-lib ]; description = "Rasterific backend for diagrams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-reflex" = callPackage From 804dc91a4e9b9222db7473b76638139e3babf145 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 21:24:03 +0000 Subject: [PATCH 14/42] acme-sh: 2.8.9 -> 2.9.0 --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index a7e1d02cb302..0417e3079ceb 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.9"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk="; + sha256 = "sha256-BSKqfj8idpE4OV8/EJkCFo5i1vq/aEde/moqJcwuDvk="; }; nativeBuildInputs = [ makeWrapper ]; From 947df26862a63a4c251f5b8752073e8930cd3c66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Jun 2021 03:51:07 +0000 Subject: [PATCH 15/42] flyctl: 0.0.220 -> 0.0.222 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index f531c9a902d6..e0412b0dd366 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.220"; + version = "0.0.222"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-QuNe2Q7d0WSF3pkDNKxs6b6hO9Q99oJM+ZddHD/tOaI="; + sha256 = "sha256-yFcsbk5CAOqnT1ljOe+lGfEj1sCBsaFNZnfcQOfezs4="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-zoheYyeofg8oVRicnZt+lFOixIH/Ssv7Kh7zC6yT/uY="; + vendorSha256 = "sha256-NnHnSfm3XYiwgGn56GsthFKiflJvhYhjoxmm8ogm+Uc="; doCheck = false; From 4355ebb00e6bf725fc4330d3c9c117b709ef7a81 Mon Sep 17 00:00:00 2001 From: toastal Date: Thu, 3 Jun 2021 23:24:19 +0700 Subject: [PATCH 16/42] himalaya: 0.3.2 -> 0.4.0 --- .../networking/mailreaders/himalaya/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index b810103cf2ed..b1c709b055b9 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wiasnkoIU4l1yyhUSTahOJMCOyhpz2w4WJzi/UBmiHE="; + sha256 = "sha256-6RgT/SxO4vsk8Yx2AbaNIFvnAvgDmeTXvb/v6nUJxhc="; }; - cargoSha256 = "sha256-VXSJLDpT0s+sh6buOP63QSiUp34H6G/FWibemtNU9wQ="; + cargoSha256 = "sha256-NEuIh7FwIdAWzlChna3+G0VukfV8nYZfVWa+3LxQCIA="; # use --lib flag to avoid test with imap server # https://github.com/soywod/himalaya/issues/145 From 083ac8e64cfc33be74909e572622117927c45d73 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 4 Jun 2021 11:36:24 +0200 Subject: [PATCH 17/42] haskellPackages.llvmPackages: dontRecurseIntoAttrs They are not an exposed part of haskellPackages per se, so we shouldn't list them in nix-env. Additionally this should prevent the failed lldb build from cluttering our jobset output. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-head.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 9866364e34a0..36fe13151f3c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 9.x. - llvmPackages = pkgs.llvmPackages_9; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_9; # Disable GHC 8.10.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index bcce0bb897c5..99b53b9f14f3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 6.x. - llvmPackages = pkgs.llvmPackages_6; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_6; # Disable GHC 8.6.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8fb10d8b05f5..aab26897cca4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 7.x. - llvmPackages = pkgs.llvmPackages_7; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_7; # Disable GHC 8.8.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index ff82fc8c199c..16c85d1fef76 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # This compiler version needs llvm 10.x. - llvmPackages = pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; # Disable GHC 9.0.x core libraries. array = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2b136c6bf83e..ca455a7c8929 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -11,7 +11,7 @@ with haskellLib; self: super: { - llvmPackages = pkgs.llvmPackages_10; + llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10; # Disable GHC 8.7.x core libraries. array = null; From e57b58bd0e292c866f790475dd035ac3e2543dd1 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 4 Jun 2021 21:44:23 +0900 Subject: [PATCH 18/42] glibc: fix build vs host tool confusion Fixes cross compilation from aarch64-linux -> armv7l-linux --- pkgs/development/libraries/glibc/common.nix | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3597dd70f2c9..888548d79f03 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -226,6 +226,28 @@ stdenv.mkDerivation ({ libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes EOF + + # ./configure has logic like + # + # AR=`$CC -print-prog-name=ar` + # + # This searches various directories in the gcc and its wrapper. In nixpkgs, + # this returns the bare string "ar", which is build ar. This can result as + # a build failure with the following message: + # + # libc_pic.a: error adding symbols: archive has no index; run ranlib to add one + # + # (Observed cross compiling from aarch64-linux -> armv7l-linux). + # + # Nixpkgs passes a correct value for AR and friends, so to use the correct + # set of tools, we only need to delete this special handling. + sed -i \ + -e '/^AR=/d' \ + -e '/^AS=/d' \ + -e '/^LD=/d' \ + -e '/^OBJCOPY=/d' \ + -e '/^OBJDUMP=/d' \ + $configureScript ''; preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; From 9a0592e6829229406c8b9d283ecbd678c46fe79c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 01:01:56 +0200 Subject: [PATCH 19/42] Revert "haskell.packages: remove constraint on monoid-extras" This reverts commit 52d69816b0f86c67844bfa34c22e86cdc187d074. Unfortunately there is no way to update to monoid-extras 0.6 yet without marking some packages as broken. The issue is that not all diagrams* packages have had an update adding support for GHC 9.x yet (which would also include monoid-extras 0.6 support). The only alternative to pinning diagrams* and monoid-extras would be to have mismatched versions between them which always causes issues with haskellPackages.diagrams. Note that this commit re-introduces some build failures which are to be fixed in a follow-up commit. --- .../haskell-modules/configuration-common.nix | 17 +++++---- .../configuration-hackage2nix/main.yaml | 7 ++++ .../haskell-modules/hackage-packages.nix | 36 +++++++++++++++++++ 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bbc5df3c6966..d4a51216dc68 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -710,12 +710,17 @@ self: super: { force-layout = doJailbreak super.force-layout; size-based = doJailbreak super.size-based; dual-tree = doJailbreak super.dual-tree; - diagrams-cairo = doJailbreak super.diagrams-cairo; diagrams-core = doJailbreak super.diagrams-core; diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; - diagrams-lib = doJailbreak super.diagrams-lib; + # Apply patch from master to add compat with optparse-applicative >= 0.16. + diagrams-lib = doJailbreak (appendPatch super.diagrams-lib + (pkgs.fetchpatch { + url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; + sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; + includes = [ "*/CmdLine.hs" ]; + })); diagrams-rasterific = doJailbreak super.diagrams-rasterific; # https://github.com/danidiaz/streaming-eversion/issues/1 @@ -1802,6 +1807,10 @@ self: super: { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; + # Too strict version bounds on base and optparse-applicative + # https://github.com/diagrams/diagrams-cairo/issues/77 + diagrams-cairo = doJailbreak super.diagrams-cairo; + # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; @@ -1944,8 +1953,4 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; - # 2021-06-03: Too strict bounds on monoid-extras - # https://github.com/xu-hao/namespace/issues/1 - namespace = doJailbreak super.namespace; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index dbf356292e99..3680c0446820 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,6 +77,13 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # + # 2021-05-11: not all diagrams libraries have adjusted to + # monoid-extras 0.6 yet, keep them pinned to lower versions + # until we can do a full migration, see + # https://github.com/diagrams/diagrams-core/issues/115 + # We can keep this pin at most until base 4.15 + - monoid-extras < 0.6 + - diagrams-core < 1.5.0 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 258ef9fea7b4..ff8e55e51f89 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74287,6 +74287,25 @@ self: { }) {}; "diagrams-core" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , dual-tree, lens, linear, monoid-extras, mtl, profunctors + , semigroups, unordered-containers + }: + mkDerivation { + pname = "diagrams-core"; + version = "1.4.2"; + sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43"; + revision = "1"; + editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7"; + libraryHaskellDepends = [ + adjunctions base containers distributive dual-tree lens linear + monoid-extras mtl profunctors semigroups unordered-containers + ]; + description = "Core libraries for diagrams EDSL"; + license = lib.licenses.bsd3; + }) {}; + + "diagrams-core_1_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -74301,6 +74320,7 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -177943,6 +177963,21 @@ self: { }) {}; "monoid-extras" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.5.1"; + sha256 = "0xfrkgqn9d31z54l617m3w3kkd5m9vjb4yl247r3zzql3mpb1f37"; + revision = "2"; + editedCabalFile = "0gbrwpr7rzh9mmf59yhs74hixgclmxngaxx51j7pvr6wnkbvz3a3"; + libraryHaskellDepends = [ base groups semigroupoids semigroups ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + }) {}; + + "monoid-extras_0_6" = callPackage ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups }: mkDerivation { @@ -177953,6 +177988,7 @@ self: { benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "monoid-owns" = callPackage From e6cf0980db2a901aa9ba116e3d5ec00c6929e232 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 01:05:49 +0200 Subject: [PATCH 20/42] haskellPackages.diagrams-lib: pin to < 1.4.4 While diagrams-lib 1.4.4 doesn't per se require us to update any diagrams lib to 1.5.0 it would require monoid-extras 0.6 which would force us to update diagrams-core to 1.5.0, thus breaking haskellPackages.diagrams. Since we can just keep the patch we fetch and downgrade to 1.4.3, we can continue sitting out the slow update cycle of the diagrams universe. --- .../haskell-modules/configuration-common.nix | 2 ++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 34 +++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d4a51216dc68..f0c275c32fc6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -715,6 +715,8 @@ self: super: { diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; # Apply patch from master to add compat with optparse-applicative >= 0.16. + # We unfortunately can't upgrade to 1.4.4 which includes this patch yet + # since it would require monoid-extras 0.6 which breaks other diagrams libs. diagrams-lib = doJailbreak (appendPatch super.diagrams-lib (pkgs.fetchpatch { url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3680c0446820..3cdb1b4b7dd7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -84,6 +84,7 @@ default-package-overrides: # We can keep this pin at most until base 4.15 - monoid-extras < 0.6 - diagrams-core < 1.5.0 + - diagrams-lib < 1.4.4 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ff8e55e51f89..c10984beff3c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74425,6 +74425,39 @@ self: { }) {}; "diagrams-lib" = callPackage + ({ mkDerivation, active, adjunctions, array, base, bytestring + , cereal, colour, containers, criterion, data-default-class + , deepseq, diagrams-core, diagrams-solve, directory, distributive + , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable + , intervals, JuicyPixels, lens, linear, monoid-extras, mtl + , numeric-extras, optparse-applicative, process, profunctors + , QuickCheck, semigroups, tagged, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.4.3"; + sha256 = "0gqrcyjyp3p78vmfxvhfjbkkl2xvwcv3qyyinbdcmalb5zb8vyy6"; + revision = "1"; + editedCabalFile = "0cqhqm2nz2ls00pfhx8hz6z6g17qhl380h24wp4d6l5msiw7gxq4"; + libraryHaskellDepends = [ + active adjunctions array base bytestring cereal colour containers + data-default-class diagrams-core diagrams-solve directory + distributive dual-tree exceptions filepath fingertree fsnotify + hashable intervals JuicyPixels lens linear monoid-extras mtl + optparse-applicative process profunctors semigroups tagged text + transformers unordered-containers + ]; + testHaskellDepends = [ + base deepseq diagrams-solve distributive lens numeric-extras + QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion diagrams-core ]; + description = "Embedded domain-specific language for declarative graphics"; + license = lib.licenses.bsd3; + }) {}; + + "diagrams-lib_1_4_4" = callPackage ({ mkDerivation, active, adjunctions, array, base, bytestring , cereal, colour, containers, criterion, data-default-class , deepseq, diagrams-core, diagrams-solve, directory, distributive @@ -74453,6 +74486,7 @@ self: { benchmarkHaskellDepends = [ base criterion diagrams-core ]; description = "Embedded domain-specific language for declarative graphics"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-pandoc" = callPackage From 66090354101d4175fd2ad271b773131ec29f6ddd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 01:08:43 +0200 Subject: [PATCH 21/42] haskell.packages: group all diagrams overrides --- .../haskell-modules/configuration-common.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f0c275c32fc6..fb5a70eb6fac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -705,6 +705,7 @@ self: super: { # https://github.com/diagrams/diagrams-core/issues/112 # https://github.com/diagrams/diagrams-cairo/issues/77 # https://github.com/diagrams/diagrams-rasterific/issues/63 + # https://github.com/diagrams/diagrams-cairo/issues/77 active = doJailbreak super.active; statestack = doJailbreak super.statestack; force-layout = doJailbreak super.force-layout; @@ -724,6 +725,10 @@ self: super: { includes = [ "*/CmdLine.hs" ]; })); diagrams-rasterific = doJailbreak super.diagrams-rasterific; + diagrams-cairo = doJailbreak super.diagrams-cairo; + + # https://github.com/diagrams/diagrams-solve/issues/4 + diagrams-solve = dontCheck super.diagrams-solve; # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; @@ -741,9 +746,6 @@ self: super: { # Has a dependency on outdated versions of directory. cautious-file = doJailbreak (dontCheck super.cautious-file); - # https://github.com/diagrams/diagrams-solve/issues/4 - diagrams-solve = dontCheck super.diagrams-solve; - # test suite does not compile with recent versions of QuickCheck integer-logarithms = dontCheck (super.integer-logarithms); @@ -1809,10 +1811,6 @@ self: super: { passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; }; - # Too strict version bounds on base and optparse-applicative - # https://github.com/diagrams/diagrams-cairo/issues/77 - diagrams-cairo = doJailbreak super.diagrams-cairo; - # Too strict version bounds on base # https://github.com/gibiansky/IHaskell/issues/1217 ihaskell-display = doJailbreak super.ihaskell-display; From cab9d7a1ae523dd4ede22c3f9469d3329b37baee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 5 Jun 2021 00:28:35 +0000 Subject: [PATCH 22/42] bacula: 11.0.3 -> 11.0.5 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index aca741175e57..c37e78933849 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.3"; + version = "11.0.5"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-AVh3NPdJD8t3N4AbLh/hsflHB7s/sLcbNnE8eqsDkjw="; + sha256 = "sha256-71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 9b1e0e4b7492c4bdba7d91d0c927144217e80cc7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 02:29:27 +0200 Subject: [PATCH 23/42] haskellPackages.jsaddle-webkit2gtk: remove now unnecessary patch Upstream seems to have fixed the issue in the meantime -- without merging Malte's PR, however. --- .../haskell-modules/configuration-common.nix | 4 -- .../patches/jsaddle-webkit2gtk.patch | 65 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb5a70eb6fac..ee94b13bfbe3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1311,10 +1311,6 @@ self: super: { gi-gdkx11 = self.gi-gdkx11_3_0_11; gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; - # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25 - # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 - jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; - # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 massiv = dontCheck super.massiv; diff --git a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch deleted file mode 100644 index 33c276926f4b..000000000000 --- a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001 -From: Malte Brandy -Date: Fri, 14 Aug 2020 17:52:28 +0200 -Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound - ---- - jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal -index 93d0b77..60c2312 100644 ---- a/jsaddle-webkit2gtk.cabal -+++ b/jsaddle-webkit2gtk.cabal -@@ -35,7 +35,7 @@ library - gi-gtk >=3.0.17 && <3.1, - gi-webkit2 >=4.0.14 && <4.1, - gi-javascriptcore >=4.0.14 && <4.1, -- haskell-gi-base >=0.20 && <0.24, -+ haskell-gi-base >=0.20 && <0.26, - haskell-gi-overloading >=0.0 && < 2.0, - jsaddle >=0.9.4.0 && <0.10, - text >=1.2.1.3 && <1.3, - -From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001 -From: Malte Brandy -Date: Fri, 14 Aug 2020 18:10:26 +0200 -Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable - -Those two convenience definitions disappeared from gi-gio and gi-gtk in -newer versions. ---- - .../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs -index 898dac2..5249477 100644 ---- a/src/Language/Javascript/JSaddle/WebKitGTK.hs -+++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs -@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF - import qualified GI.Gtk as Gtk (main, init) - import GI.Gtk - (windowSetPosition, windowSetDefaultSize, windowNew, -- scrolledWindowNew, noAdjustment, containerAdd, -+ scrolledWindowNew, Adjustment, containerAdd, - WindowType(..), WindowPosition(..), widgetDestroy, - widgetGetToplevel, widgetShowAll, onWidgetDestroy, - mainQuit) --import GI.Gio (noCancellable) -+import GI.Gio (Cancellable) - import GI.JavaScriptCore (valueToString) - import GI.WebKit2 - (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText, -@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch) - import Language.Javascript.JSaddle.Run (runJavaScript) - import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers) - -+noAdjustment :: Maybe Adjustment -+noAdjustment = Nothing -+ -+noCancellable :: Maybe Cancellable -+noCancellable = Nothing -+ - quitWebView :: WebView -> IO () - quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync? - widgetDestroy w From b00bcf21abc392ecb1d93bd49f7a5ffbc8524ecf Mon Sep 17 00:00:00 2001 From: Mewp Date: Sat, 5 Jun 2021 10:35:20 +0200 Subject: [PATCH 24/42] nixos/acme: Remove an incorrect assertion from tests Commit 3a2e0c36e79cecaf196cbea23e75e74710140ea4 has removed `--reuse-key` from default renew options, yet the tests still expected keys not to change. This assertion is now removed, as they are supposed to change on each renew/change. --- nixos/tests/acme.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 6f98b0da3780..fe8c4af3ea21 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -392,14 +392,11 @@ in import ./make-test-python.nix ({ lib, ... }: { # Check the key hash before and after adding an alias. It should not change. # The previous test reverts the ed384 change webserver.wait_for_unit("acme-finished-a.example.test.target") - keyhash_old = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem") switch_to(webserver, "nginx-aliases") webserver.wait_for_unit("acme-finished-a.example.test.target") check_issuer(webserver, "a.example.test", "pebble") check_connection(client, "a.example.test") check_connection(client, "b.example.test") - keyhash_new = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem") - assert keyhash_old == keyhash_new with subtest("Can request certificates for vhost + aliases (apache-httpd)"): try: From 24a4c65ca97e8f474e7af35c67fb1fce5a1c1f55 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 12:59:38 +0200 Subject: [PATCH 25/42] haskellPackages.pandoc-crossref: downgrade to retain pandoc 2.13 support --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3cdb1b4b7dd7..58ba5ec683e7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -91,6 +91,8 @@ default-package-overrides: - hls-explicit-imports-plugin < 1.0.0.2 # 2021-05-12: remove once versions >= 5.0.0 is in stackage - futhark < 0.19.5 + # 2021-06-05: remove once pandoc 2.14 is in stackage + - pandoc-crossref < 0.3.11.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c10984beff3c..002629c61fd3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -194042,6 +194042,44 @@ self: { }) {}; "pandoc-crossref" = callPackage + ({ mkDerivation, base, containers, data-accessor + , data-accessor-template, data-accessor-transformers, data-default + , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser + , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb + , template-haskell, temporary, text, utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.10.0"; + sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; + revision = "1"; + editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default directory filepath mtl + pandoc pandoc-types roman-numerals syb template-haskell text + utility-ht + ]; + executableHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default deepseq directory filepath + gitrev mtl open-browser optparse-applicative pandoc pandoc-types + roman-numerals syb template-haskell temporary text utility-ht + ]; + testHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default directory filepath hspec + mtl pandoc pandoc-types roman-numerals syb template-haskell text + utility-ht + ]; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + }) {}; + + "pandoc-crossref_0_3_11_0" = callPackage ({ mkDerivation, base, containers, criterion, data-accessor , data-accessor-template, data-accessor-transformers, data-default , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser @@ -194075,6 +194113,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage From 51f2030430b7318c4577c1e5d63387bc09553515 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 5 Jun 2021 16:52:14 +0200 Subject: [PATCH 26/42] haskellPackages.cabal2nix-unstable: Use justStaticExecutables --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a9f6263ab5dd..1270d2a98183 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -819,4 +819,8 @@ self: super: builtins.intersectAttrs super { # itself causing an infinite recursion at evaluation # time random = dontCheck super.random; + + # Since this package is primarily used by nixpkgs maintainers and is probably + # not used to link against by anyone, we can make it’s closure smaller. + cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable; } From 1e7351550cf05f2c467c240ea93b245a2b6bf7c2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 16:08:32 +0200 Subject: [PATCH 27/42] =?UTF-8?q?maintainers/=E2=80=A6/regenerate-hackage-?= =?UTF-8?q?packages.sh:=20overrideable=20hackage2nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow setting the HACKAGE2NIX environment variable to change the hackage2nix the script uses to an absolute path to a local build. Useful to test local changes in a realistic environment. --- maintainers/scripts/haskell/regenerate-hackage-packages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 1effa5e2596c..e7f91f2d79d1 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -14,6 +14,8 @@ set -euo pipefail +HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" + # To prevent hackage2nix fails because of encoding. # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 @@ -23,7 +25,7 @@ unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." -hackage2nix \ +"$HACKAGE2NIX" \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ --nixpkgs "$PWD" \ From 776e8fd668560745d20bffc765a94400ef4a523b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 17:56:33 +0200 Subject: [PATCH 28/42] haskellPackages.nri-redis: disable tests They require a local redis daemon running. --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1270d2a98183..643e9edc627b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -823,4 +823,7 @@ self: super: builtins.intersectAttrs super { # Since this package is primarily used by nixpkgs maintainers and is probably # not used to link against by anyone, we can make it’s closure smaller. cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable; + + # test suite needs local redis daemon + nri-redis = dontCheck super.nri-redis; } From 26ac257e4fecc050f28da30399afdfee83d98836 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 4 Jun 2021 18:22:19 +0200 Subject: [PATCH 29/42] doc: nix-gitignore to CommonMark Closes #125670 --- doc/functions.xml | 2 +- doc/functions/nix-gitignore.section.md | 49 ++++++++++++++++++ doc/functions/nix-gitignore.xml | 70 -------------------------- 3 files changed, 50 insertions(+), 71 deletions(-) create mode 100644 doc/functions/nix-gitignore.section.md delete mode 100644 doc/functions/nix-gitignore.xml diff --git a/doc/functions.xml b/doc/functions.xml index 5a9240ec800e..e8ab8d97b913 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -10,5 +10,5 @@ - + diff --git a/doc/functions/nix-gitignore.section.md b/doc/functions/nix-gitignore.section.md new file mode 100644 index 000000000000..2fb833b23000 --- /dev/null +++ b/doc/functions/nix-gitignore.section.md @@ -0,0 +1,49 @@ +# pkgs.nix-gitignore {#sec-pkgs-nix-gitignore} + +`pkgs.nix-gitignore` is a function that acts similarly to `builtins.filterSource` but also allows filtering with the help of the gitignore format. + +## Usage {#sec-pkgs-nix-gitignore-usage} + +`pkgs.nix-gitignore` exports a number of functions, but you\'ll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. + +```nix +{ pkgs ? import {} }: + + nix-gitignore.gitignoreSource [] ./source + # Simplest version + + nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source + # This one reads the ./source/.gitignore and concats the auxiliary ignores + + nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source + # Use this string as gitignore, don't read ./source/.gitignore. + + nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source + # It also accepts a list (of strings and paths) that will be concatenated + # once the paths are turned to strings via readFile. +``` + +These functions are derived from the `Filter` functions by setting the first filter argument to `(_: _: true)`: + +```nix +gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true); +gitignoreSource = gitignoreFilterSource (_: _: true); +``` + +Those filter functions accept the same arguments the `builtins.filterSource` function would pass to its filters, thus `fn: gitignoreFilterSourcePure fn ""` should be extensionally equivalent to `filterSource`. The file is blacklisted if it\'s blacklisted by either your filter or the gitignoreFilter. + +If you want to make your own filter from scratch, you may use + +```nix +gitignoreFilter = ign: root: filterPattern (gitignoreToPatterns ign) root; +``` + +## gitignore files in subdirectories {#sec-pkgs-nix-gitignore-usage-recursive} + +If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function: + +```nix +gitignoreFilterRecursiveSource = filter: patterns: root: +# OR +gitignoreRecursiveSource = gitignoreFilterSourcePure (_: _: true); +``` diff --git a/doc/functions/nix-gitignore.xml b/doc/functions/nix-gitignore.xml deleted file mode 100644 index 37a82b196ccf..000000000000 --- a/doc/functions/nix-gitignore.xml +++ /dev/null @@ -1,70 +0,0 @@ -
- pkgs.nix-gitignore - - - pkgs.nix-gitignore is a function that acts similarly to builtins.filterSource but also allows filtering with the help of the gitignore format. - - -
- Usage - - - pkgs.nix-gitignore exports a number of functions, but you'll most likely need either gitignoreSource or gitignoreSourcePure. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. - - - {} }: - - nix-gitignore.gitignoreSource [] ./source - # Simplest version - - nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source - # This one reads the ./source/.gitignore and concats the auxiliary ignores - - nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source - # Use this string as gitignore, don't read ./source/.gitignore. - - nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n", ~/.gitignore] ./source - # It also accepts a list (of strings and paths) that will be concatenated - # once the paths are turned to strings via readFile. - ]]> - - - These functions are derived from the Filter functions by setting the first filter argument to (_: _: true): - - - - - - Those filter functions accept the same arguments the builtins.filterSource function would pass to its filters, thus fn: gitignoreFilterSourcePure fn "" should be extensionally equivalent to filterSource. The file is blacklisted iff it's blacklisted by either your filter or the gitignoreFilter. - - - - If you want to make your own filter from scratch, you may use - - - -
- -
- gitignore files in subdirectories - - - If you wish to use a filter that would search for .gitignore files in subdirectories, just like git does by default, use this function: - - - -
-
From e4d21886f43a8092331bb229601c3d624d3b1455 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 18:39:33 +0200 Subject: [PATCH 30/42] haskellPackages.tophat: unbreak --- 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 643e9edc627b..538d5381a96a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -826,4 +826,11 @@ self: super: builtins.intersectAttrs super { # test suite needs local redis daemon nri-redis = dontCheck super.nri-redis; + + # Make tophat find itself for _compiling_ its test suite + tophat = overrideCabal super.tophat (drv: { + postPatch = '' + sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs + '' + (drv.postPatch or ""); + }); } From 5591b8e1fc39a05e4a6f792dc54d9085f6ad004c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 01:27:00 +0200 Subject: [PATCH 31/42] haskell.packages: let me maintain some more packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 6 ++++++ pkgs/development/haskell-modules/hackage-packages.nix | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 58ba5ec683e7..56e2791c4f1d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -306,6 +306,12 @@ package-maintainers: - yarn-lock - yarn2nix - large-hashable + - haskell-ci + - diagrams + # owothia + - irc-client + - chatter + - envy terlar: - nix-diff turion: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 002629c61fd3..be5fecbe9ad3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53410,6 +53410,7 @@ self: { ]; description = "A library of simple NLP algorithms"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "chatty" = callPackage @@ -74144,6 +74145,7 @@ self: { doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "diagrams-boolean" = callPackage @@ -84196,6 +84198,7 @@ self: { ]; description = "An environmentally friendly way to deal with environment variables"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "envy-extensible" = callPackage @@ -118462,6 +118465,7 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "haskell-cnc" = callPackage @@ -149530,6 +149534,7 @@ self: { ]; description = "An IRC client library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "irc-colors" = callPackage From 47371be95b595923c6c3d2736e2ed339a8457f0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 6 Jun 2021 08:03:43 +0000 Subject: [PATCH 32/42] exploitdb: 2021-06-03 -> 2021-06-05 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e32386acbb2d..a1e43618346b 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-03"; + version = "2021-06-05"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-a2x9Hfo39VeaMsio9VbOPe5hr2xLjmAzlSNUWtaXG6A="; + sha256 = "sha256-91BJ0rgR9pP4rlLz38Tug0Cd5s7WajgdxA7Dtm4Pre0="; }; installPhase = '' From fdca90d07f654cb54f41659567bed130524cece6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 6 Jun 2021 14:27:13 +0200 Subject: [PATCH 33/42] docs: acme: Fix typo --- nixos/modules/security/acme.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index a78ff05f2eaa..8249da948c6d 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -194,7 +194,7 @@ services.httpd = { This is useful if you want to generate a wildcard certificate, since ACME servers will only hand out wildcard certs over DNS validation. - There a number of supported DNS providers and servers you can utilise, + There are a number of supported DNS providers and servers you can utilise, see the lego docs for provider/server specific configuration values. For the sake of these docs, we will provide a fully self-hosted example using bind. From 690496c4e545e68482b5c162a03f0a4f97d35373 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 05:35:05 -0300 Subject: [PATCH 34/42] ocamlPackages.ppx_gen_rec: 1.1.0 -> 2.0.0 --- .../ocaml-modules/ppx_gen_rec/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index 87ccd85a07df..ee801f6adfd8 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl, buildDunePackage, ocaml-migrate-parsetree }: +{ lib, fetchurl, buildDunePackage, ppxlib }: buildDunePackage rec { pname = "ppx_gen_rec"; - version = "1.1.0"; - - useDune2 = true; + version = "2.0.0"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0fwi4bknq8h9zgpsarjvnzdm9bm8qlyyw0lz30pihg02aiiljqbh"; + sha256 = "sha256-/mMj5UT22KQGVy1sjgEoOgPzyCYyeDPtWJYNDvQ9nlk="; }; - buildInputs = [ ocaml-migrate-parsetree ]; + minimumOCamlVersion = "4.07"; + useDune2 = true; + + buildInputs = [ ppxlib ]; meta = with lib; { homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec"; - description = "ocaml preprocessor that generates a recursive module"; + description = "A ppx rewriter that transforms a recursive module expression into a struct."; license = licenses.mit; - maintainers = [ maintainers.frontsideair ]; + maintainers = with maintainers; [ frontsideair ]; }; } From b24cc395ccf892827585d32246b4902bd9379113 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 6 Jun 2021 16:08:22 +0200 Subject: [PATCH 35/42] maintainers/teams: remove pacien from the matrix team I prefer to focus only on the individual packages which I know. --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ab05ab7a5b23..3e6843f0e573 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -155,7 +155,6 @@ with lib.maintainers; { matrix = { members = [ ma27 - pacien fadenb mguentner ekleog From 92f62de6f1ee9c9e31a8432ad222e79deef2ad87 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 6 Jun 2021 16:09:19 +0200 Subject: [PATCH 36/42] matrix-appservice-discord: increase test timeout Hydra and my local machine are sometimes hitting the default timeout. See https://hydra.nixos.org/build/138032455/nixlog/8/tail --- pkgs/servers/matrix-appservice-discord/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index 4a41f019e179..7b7a67821f9e 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -43,7 +43,8 @@ in mkYarnPackage rec { doCheck = true; checkPhase = '' - yarn --offline test + # the default 2000ms timeout is sometimes too short on our busy builders + yarn --offline test --timeout 10000 ''; postInstall = '' From 3b4cace64dc19096e6696cfc474fc47b7189e73b Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Sun, 6 Jun 2021 15:14:51 +1000 Subject: [PATCH 37/42] vim-utils: append customRC after plug / pathogen plugins are loaded --- pkgs/misc/vim-plugins/vim-utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 52bf4341fa5b..1163f5dd9f0e 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -341,10 +341,10 @@ let beforePlugins vamImpl (nativeImpl packages) - customRC ] ++ lib.optional (pathogen != null) pathogenImpl - ++ lib.optional (plug != null) plugImpl; + ++ lib.optional (plug != null) plugImpl + ++ [ customRC ]; in lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); From bd103151ea885a9802fa25f359f19ed0a0e162ef Mon Sep 17 00:00:00 2001 From: ernestkz Date: Sun, 6 Jun 2021 02:45:12 +0100 Subject: [PATCH 38/42] haskellPackages.reactive-banana: unbreak Co-authored-by: sterni --- 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 ee94b13bfbe3..cc39fb4fd10f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1949,4 +1949,8 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; + # unrestrict bounds for hashable and semigroups + # https://github.com/HeinrichApfelmus/reactive-banana/issues/215 + reactive-banana = doJailbreak super.reactive-banana; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ae5e77644b1a..20ecee3bd7c4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3798,7 +3798,6 @@ broken-packages: - react-haskell - reaction-logic - reactive-bacon - - reactive-banana - reactive-thread - react-tutorial-haskell-server - readability diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be5fecbe9ad3..f35eb8c26a6e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -216649,8 +216649,6 @@ self: { ]; description = "Library for functional reactive programming (FRP)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "reactive-banana-automation" = callPackage From 778f07cea82267a0969c01a0a62239b43d8b2b37 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 17:27:18 +0200 Subject: [PATCH 39/42] hackage2nix: Mark failing builds broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 16 ++++ .../transitive-broken.yaml | 53 +++--------- .../haskell-modules/hackage-packages.nix | 81 +++++++++---------- 3 files changed, 65 insertions(+), 85 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 20ecee3bd7c4..dc827a1b6f14 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -703,6 +703,7 @@ broken-packages: - commander - Commando - commodities + - commonmark-cli - commsec - compactable - Compactable @@ -1038,6 +1039,7 @@ broken-packages: - direct-plugins - direct-rocksdb - direm + - discord-haskell - discordian-calendar - discord-types - discrete @@ -1884,6 +1886,7 @@ broken-packages: - haskey - haskheap - haskhol-core + - hasklepias - haskmon - haskoin - haskoin-util @@ -1895,6 +1898,7 @@ broken-packages: - haskus-binary - haskyapi - hasmin + - hasqlator-mysql - hasql-backend - hasql-class - hasql-cursor-transaction @@ -2079,6 +2083,7 @@ broken-packages: - hlogger - HLogger - hlongurl + - hlrdb-core - hls-exactprint-utils - hls-floskell-plugin - hls-fourmolu-plugin @@ -3405,6 +3410,7 @@ broken-packages: - parser-helper - parsers-megaparsec - parsimony + - parsley - parsnip - partage - partial-records @@ -3465,6 +3471,7 @@ broken-packages: - persistent-cereal - persistent-database-url - persistent-discover + - persistent-documentation - persistent-equivalence - persistent-migration - persistent-mongoDB @@ -3610,6 +3617,7 @@ broken-packages: - postmaster - potato-tool - potoki-core + - powerdns - powermate - powerpc - powerqueue-levelmem @@ -3761,6 +3769,7 @@ broken-packages: - quiver - quokka - quoridor-hs + - raaz - RabbitMQ - rad - radian @@ -3982,6 +3991,9 @@ broken-packages: - SableCC2Hs - safe-buffer-monad - safe-coerce + - safe-coloured-text-gen + - safe-coloured-text-layout + - safe-coloured-text-terminfo - safecopy-migrate - safecopy-store - safe-freeze @@ -4334,6 +4346,7 @@ broken-packages: - sparse-lin-alg - special-functors - special-keys + - speculate - speculation - sphinx - sphinxesc @@ -4817,6 +4830,7 @@ broken-packages: - typed-encoding - typedflow - typedquery + - typed-time - typed-wire - type-eq - type-fun @@ -4887,6 +4901,7 @@ broken-packages: - unpack-funcs - unroll-ghc-plugin - unsafely + - unsatisfiable - unsequential - unused - uom-plugin @@ -5182,6 +5197,7 @@ broken-packages: - yahoo-web-search - yajl - yall + - yam-app - yam-config - yaml-pretty-extras - YamlReference diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 20d6617d3c78..e9be7c64c648 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -29,6 +29,7 @@ dont-distribute-packages: - Advgame - Advise-me - aern2-real + - aern2-real_0_2_7_0 - AERN-Net - AERN-Real - AERN-Real-Double @@ -93,7 +94,6 @@ dont-distribute-packages: - ApplePush - approx-rand-test - arbor-monad-metric-datadog - - arch-hs - archlinux-web - arduino-copilot - arff @@ -399,9 +399,7 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc - - clash-ghc_1_4_2 - clash-lib - - clash-lib_1_4_2 - clash-multisignal - clash-prelude-quickcheck - clash-systemverilog @@ -440,6 +438,7 @@ dont-distribute-packages: - cnc-spec-compiler - Coadjute - codec + - code-conjure - codec-rpm - codemonitor - cognimeta-utils @@ -625,11 +624,8 @@ dont-distribute-packages: - dhall-docs - dhcp-lease-parser - dia-functions - - diagrams-braille - - diagrams-builder - diagrams-haddock - diagrams-html5 - - diagrams-pandoc - diagrams-pgf - diagrams-reflex - diagrams-wx @@ -782,9 +778,9 @@ dont-distribute-packages: - extemp - extensible-data - extract-dependencies + - extrapolate - Facts - factual-api - - fadno-braids - FailureT - fakedata-quickcheck - fallingblocks @@ -970,7 +966,6 @@ dont-distribute-packages: - global-config - glome-hs - GlomeView - - gloss-banana - gloss-devil - gloss-examples - gloss-sodium @@ -1086,29 +1081,8 @@ dont-distribute-packages: - hadoop-tools - haggis - hails-bin - - hakyll-agda - - hakyll-alectryon - - hakyll-blaze-templates - - hakyll-contrib - - hakyll-contrib-csv - - hakyll-contrib-elm - - hakyll-contrib-hyphenation - - hakyll-contrib-i18n - - hakyll-contrib-links - - hakyll-dhall - - hakyll-dir-list - hakyll-elm - - hakyll-favicon - - hakyll-filestore - - hakyll-images - hakyll-ogmarkup - - hakyll-process - - hakyll-R - - hakyll-sass - - hakyll-series - - hakyll-shakespeare - - hakyll-shortcut-links - - hakyll-typescript - halberd - hall-symbols - halma-gui @@ -1351,10 +1325,10 @@ dont-distribute-packages: - HLearn-datastructures - HLearn-distributions - hledger-api + - hlrdb - hls - hly - hmark - - hmatrix-sundials - hmeap - hmeap-utils - hmep @@ -1610,7 +1584,6 @@ dont-distribute-packages: - iteratee-parsec - iteratee-stm - iterio-server - - iterm-show-diagrams - iter-stats - ivor - ivory-avr-atmega328p-registers @@ -1680,7 +1653,6 @@ dont-distribute-packages: - karakuri - katip-elasticsearch - katip-rollbar - - kawaii - keera-hails-i18n - keera-hails-mvc-environment-gtk - keera-hails-mvc-model-lightmodel @@ -1917,7 +1889,6 @@ dont-distribute-packages: - marquise - marvin - masakazu-bot - - master-plan - matchers - mathblog - mathlink @@ -2000,6 +1971,7 @@ dont-distribute-packages: - Monocle - monte-carlo - moo + - moo-nad - morley - morloc - morphisms-functors-inventory @@ -2118,6 +2090,7 @@ dont-distribute-packages: - NoSlow - notmuch-haskell - notmuch-web + - nri-prelude_0_6_0_1 - numerical - numeric-ode - numhask-hedgehog @@ -2344,8 +2317,6 @@ dont-distribute-packages: - push-notify-apn - push-notify-ccs - push-notify-general - - puzzle-draw - - puzzle-draw-cmdline - pvd - qd-vec - qhs @@ -2417,18 +2388,10 @@ dont-distribute-packages: - rdioh - react-flux-servant - reactive - - reactive-balsa - - reactive-banana-automation - - reactive-banana-bunch - - reactive-banana-gi-gtk - reactive-banana-sdl - - reactive-banana-sdl2 - - reactive-banana-threepenny - reactive-banana-wx - reactive-fieldtrip - reactive-glut - - reactive-jack - - reactive-midyim - reactor - readline-statevar - readpyc @@ -2559,6 +2522,7 @@ dont-distribute-packages: - ruler-core - runtime-arbitrary - S3 + - safe-coloured-text-layout-gen - safe-numeric - safer-file-handles - safer-file-handles-bytestring @@ -2929,7 +2893,6 @@ dont-distribute-packages: - tensorflow-core-ops - tensorflow-logging - tensorflow-ops - - termbox-banana - terminal-text - terrahs - testbench @@ -3248,6 +3211,7 @@ dont-distribute-packages: - yajl-enumerator - yam - yam-datasource + - yam-job - yam-logger - yaml-rpc-scotty - yaml-rpc-snap @@ -3255,6 +3219,7 @@ dont-distribute-packages: - yam-redis - yam-transaction - yam-transaction-odbc + - yam-transaction-postgresql - yam-web - yarr-image-io - yavie diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f35eb8c26a6e..bc3fbd9b7b16 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32268,7 +32268,6 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "arch-web" = callPackage @@ -57601,6 +57600,7 @@ self: { testHaskellDepends = [ base express leancheck speculate ]; description = "conjure Haskell functions out of partial definitions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "code-page" = callPackage @@ -59049,6 +59049,8 @@ self: { ]; description = "Command-line commonmark converter and highlighter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "commonmark-extensions" = callPackage @@ -74186,7 +74188,6 @@ self: { ]; description = "Braille diagrams with plain text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-builder" = callPackage @@ -74215,7 +74216,6 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -74514,7 +74514,6 @@ self: { ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "diagrams-pdf" = callPackage @@ -76088,6 +76087,8 @@ self: { executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -87936,6 +87937,7 @@ self: { testHaskellDepends = [ base express leancheck speculate ]; description = "generalize counter-examples of test properties"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -88147,7 +88149,6 @@ self: { ]; description = "Braid representations in Haskell"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "fadno-xml" = callPackage @@ -106057,7 +106058,6 @@ self: { libraryHaskellDepends = [ base gloss reactive-banana ]; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "gloss-devil" = callPackage @@ -114982,7 +114982,6 @@ self: { ]; description = "A package allowing to write Hakyll blog posts in Rmd"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-agda" = callPackage @@ -114999,7 +114998,6 @@ self: { ]; description = "Wrapper to integrate literate Agda files with Hakyll"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-alectryon" = callPackage @@ -115016,7 +115014,6 @@ self: { ]; description = "Hakyll extension for rendering Coq code using Alectryon"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-blaze-templates" = callPackage @@ -115028,7 +115025,6 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; description = "Blaze templates for Hakyll"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib" = callPackage @@ -115044,7 +115040,6 @@ self: { executableHaskellDepends = [ base directory filepath hakyll ]; description = "Extra modules for the hakyll website compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-csv" = callPackage @@ -115061,7 +115056,6 @@ self: { testHaskellDepends = [ base blaze-html bytestring cassava hspec ]; description = "Generate Html tables from Csv files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-elm" = callPackage @@ -115080,7 +115074,6 @@ self: { executableHaskellDepends = [ base hakyll ]; description = "Compile Elm code for inclusion in Hakyll static site"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -115092,7 +115085,6 @@ self: { libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; description = "automatic hyphenation for Hakyll"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ erictapen ]; }) {}; @@ -115138,7 +115130,6 @@ self: { ]; description = "A hakyll library that helps maintain a separate links database"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-convert" = callPackage @@ -115187,7 +115178,6 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-dir-list" = callPackage @@ -115202,7 +115192,6 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -115232,7 +115221,6 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-filestore" = callPackage @@ -115247,7 +115235,6 @@ self: { ]; description = "FileStore utilities for Hakyll"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-images" = callPackage @@ -115269,7 +115256,6 @@ self: { ]; description = "Hakyll utilities to work with images"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage @@ -115293,7 +115279,6 @@ self: { libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-sass" = callPackage @@ -115309,7 +115294,6 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-series" = callPackage @@ -115321,7 +115305,6 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -115339,7 +115322,6 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-shortcode" = callPackage @@ -115379,7 +115361,6 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "hakyll-typescript" = callPackage @@ -115396,7 +115377,6 @@ self: { testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hal" = callPackage @@ -121000,6 +120980,8 @@ self: { ]; description = "Define features from events"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskmon" = callPackage @@ -122517,6 +122499,8 @@ self: { ]; description = "composable SQL generation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasqly-mysql" = callPackage @@ -130065,6 +130049,7 @@ self: { ]; description = "High-level Redis Database"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hlrdb-core" = callPackage @@ -130083,6 +130068,8 @@ self: { ]; description = "High-level Redis Database Core API"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls" = callPackage @@ -130818,7 +130805,6 @@ self: { ]; description = "hmatrix interface to sundials"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -150423,7 +150409,6 @@ self: { ]; description = "Orphan Show instances for diagrams package that render inline in some terminals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ival" = callPackage @@ -154592,7 +154577,6 @@ self: { ]; description = "Utilities for serving static sites and blogs with Wai/Warp"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "kawhi" = callPackage @@ -170469,7 +170453,6 @@ self: { ]; description = "The project management tool for hackers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "mastermind" = callPackage @@ -178367,6 +178350,7 @@ self: { doHaddock = false; description = "Invocation helpers for the ReaderT-record-of-functions style"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "moonshine" = callPackage @@ -196245,6 +196229,8 @@ self: { libraryToolDepends = [ cpphs ]; description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "parsnip" = callPackage @@ -198927,6 +198913,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Documentation DSL for persistent entities"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "persistent-equivalence" = callPackage @@ -206902,6 +206890,8 @@ self: { ]; description = "PowerDNS API bindings for api/v1"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "powermate" = callPackage @@ -212309,7 +212299,6 @@ self: { ]; description = "Creating graphics for pencil puzzles"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "puzzle-draw-cmdline" = callPackage @@ -212328,7 +212317,6 @@ self: { ]; description = "Creating graphics for pencil puzzles, command line tools"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pvar" = callPackage @@ -214582,6 +214570,8 @@ self: { doHaddock = false; description = "Fast and type safe cryptography"; license = "(Apache-2.0 OR BSD-3-Clause)"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rabocsv2qif" = callPackage @@ -216626,7 +216616,6 @@ self: { ]; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana" = callPackage @@ -216665,7 +216654,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-bunch" = callPackage @@ -216681,7 +216669,6 @@ self: { ]; description = "Extend reactive-banana to multiple events per time point"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-gi-gtk" = callPackage @@ -216698,7 +216685,6 @@ self: { testHaskellDepends = [ base ]; description = "Simple reactive programming with GTK GObject Introspection"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -216728,7 +216714,6 @@ self: { testHaskellDepends = [ base ]; description = "Reactive Banana integration with SDL2"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-threepenny" = callPackage @@ -216743,7 +216728,6 @@ self: { libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; description = "Examples for the reactive-banana library, using threepenny-gui"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-banana-wx" = callPackage @@ -216837,7 +216821,6 @@ self: { ]; description = "Process MIDI events via reactive-banana and JACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -216857,7 +216840,6 @@ self: { ]; description = "Process MIDI events via reactive-banana"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -225889,6 +225871,8 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-coloured-text-layout" = callPackage @@ -225906,6 +225890,8 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Safely layout output coloured text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-coloured-text-layout-gen" = callPackage @@ -225926,6 +225912,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "safe-coloured-text-terminfo" = callPackage @@ -225937,6 +225924,8 @@ self: { libraryHaskellDepends = [ base safe-coloured-text terminfo ]; description = "Safely output coloured text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "safe-decimal" = callPackage @@ -243457,6 +243446,8 @@ self: { benchmarkHaskellDepends = [ base express leancheck ]; description = "discovery of properties about Haskell functions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "speculate_0_4_8" = callPackage @@ -243473,6 +243464,7 @@ self: { description = "discovery of properties about Haskell functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "speculation" = callPackage @@ -256992,7 +256984,6 @@ self: { libraryHaskellDepends = [ base reactive-banana termbox ]; description = "reactive-banana + termbox"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "termbox-bindings" = callPackage @@ -267959,6 +267950,8 @@ self: { testHaskellDepends = [ base hspec hspec-core time ]; description = "A strongly typed way to handle time and date formats"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typed-uuid" = callPackage @@ -271291,6 +271284,8 @@ self: { libraryHaskellDepends = [ base ghc ]; description = "Unsatisfiable type class"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unscramble" = callPackage @@ -285166,6 +285161,8 @@ self: { ]; description = "Yam App"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yam-config" = callPackage @@ -285212,6 +285209,7 @@ self: { sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895"; libraryHaskellDepends = [ base cron yam-app ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "yam-logger" = callPackage @@ -285311,6 +285309,7 @@ self: { base containers persistent-postgresql unliftio-core yam-app ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "yam-web" = callPackage From 1fca83e1b6765313e92ef7dc609ae1f50e773766 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 17:57:14 +0200 Subject: [PATCH 40/42] haskellPakcages.reactive-balsa: disable on darwin --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 56e2791c4f1d..6f3808103063 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -405,6 +405,7 @@ unsupported-platforms: PortMidi: [ x86_64-darwin ] posix-api: [ x86_64-darwin ] Raincat: [ x86_64-darwin ] + reactive-balsa: [ x86_64-darwin ] # depends on alsa-core reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ] reflex-dom: [ x86_64-darwin, aarch64-linux ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc3fbd9b7b16..6f04f9a75acc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -216616,6 +216616,9 @@ self: { ]; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "reactive-banana" = callPackage From 05813f4bf45718dbcca29f467755fedcc97168e9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 6 Jun 2021 18:07:16 +0200 Subject: [PATCH 41/42] hackage2nix: Mark failing builds broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 21 +++++++++ .../transitive-broken.yaml | 3 ++ .../haskell-modules/hackage-packages.nix | 45 +++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index dc827a1b6f14..bc9881ee1fca 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1001,6 +1001,7 @@ broken-packages: - dhrun - dia-base - diagrams-boolean + - diagrams-builder - diagrams-canvas - diagrams-graphviz - diagrams-gtk @@ -1283,6 +1284,7 @@ broken-packages: - Facebook-Password-Hacker-Online-Latest-Version - faceted - facts + - fadno-braids - failable-list - failure-detector - fakedata @@ -1636,6 +1638,7 @@ broken-packages: - global-variables - glob-posix - GlomeTrace + - gloss-banana - gloss-export - gloss-game - glpk-headers @@ -1759,7 +1762,18 @@ broken-packages: - hakismet - hakka - hako + - hakyll-blaze-templates + - hakyll-contrib + - hakyll-contrib-csv + - hakyll-contrib-elm + - hakyll-contrib-links + - hakyll-dhall + - hakyll-dir-list + - hakyll-process + - hakyll-R + - hakyll-series - hakyll-shortcode + - hakyll-shortcut-links - HaLeX - halfs - halipeto @@ -2095,6 +2109,7 @@ broken-packages: - hmatrix-nipals - hmatrix-sparse - hmatrix-static + - hmatrix-sundials - hmatrix-svdlibc - hmatrix-syntax - hmatrix-tests @@ -2560,6 +2575,7 @@ broken-packages: - katip-syslog - katt - katydid + - kawaii - kawhi - kdesrc-build-extra - kd-tree @@ -2860,6 +2876,7 @@ broken-packages: - MASMGen - massiv-persist - massiv-serialise + - master-plan - mathflow - math-grads - math-interpolate @@ -3725,6 +3742,7 @@ broken-packages: - pushme - push-notifications - putlenses + - puzzle-draw - pyffi - pyfi - python-pickle @@ -3807,6 +3825,9 @@ broken-packages: - react-haskell - reaction-logic - reactive-bacon + - reactive-banana-gi-gtk + - reactive-banana-sdl2 + - reactive-banana-threepenny - reactive-thread - react-tutorial-haskell-server - readability diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e9be7c64c648..e813a2a83475 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -626,6 +626,7 @@ dont-distribute-packages: - dia-functions - diagrams-haddock - diagrams-html5 + - diagrams-pandoc - diagrams-pgf - diagrams-reflex - diagrams-wx @@ -1083,6 +1084,7 @@ dont-distribute-packages: - hails-bin - hakyll-elm - hakyll-ogmarkup + - hakyll-typescript - halberd - hall-symbols - halma-gui @@ -2317,6 +2319,7 @@ dont-distribute-packages: - push-notify-apn - push-notify-ccs - push-notify-general + - puzzle-draw-cmdline - pvd - qd-vec - qhs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6f04f9a75acc..459821f253f5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74216,6 +74216,8 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "diagrams-cairo" = callPackage @@ -74514,6 +74516,7 @@ self: { ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-pdf" = callPackage @@ -88149,6 +88152,8 @@ self: { ]; description = "Braid representations in Haskell"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fadno-xml" = callPackage @@ -106058,6 +106063,8 @@ self: { libraryHaskellDepends = [ base gloss reactive-banana ]; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "gloss-devil" = callPackage @@ -114982,6 +114989,8 @@ self: { ]; description = "A package allowing to write Hakyll blog posts in Rmd"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-agda" = callPackage @@ -115025,6 +115034,8 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; description = "Blaze templates for Hakyll"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib" = callPackage @@ -115040,6 +115051,8 @@ self: { executableHaskellDepends = [ base directory filepath hakyll ]; description = "Extra modules for the hakyll website compiler"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-csv" = callPackage @@ -115056,6 +115069,8 @@ self: { testHaskellDepends = [ base blaze-html bytestring cassava hspec ]; description = "Generate Html tables from Csv files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-elm" = callPackage @@ -115074,6 +115089,8 @@ self: { executableHaskellDepends = [ base hakyll ]; description = "Compile Elm code for inclusion in Hakyll static site"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -115130,6 +115147,8 @@ self: { ]; description = "A hakyll library that helps maintain a separate links database"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-convert" = callPackage @@ -115178,6 +115197,8 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-dir-list" = callPackage @@ -115192,6 +115213,8 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-elm" = callPackage @@ -115279,6 +115302,8 @@ self: { libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-sass" = callPackage @@ -115305,6 +115330,8 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-shakespeare" = callPackage @@ -115361,6 +115388,8 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-typescript" = callPackage @@ -115377,6 +115406,7 @@ self: { testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hal" = callPackage @@ -130805,6 +130835,8 @@ self: { ]; description = "hmatrix interface to sundials"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {sundials_arkode = null; sundials_cvode = null;}; "hmatrix-svdlibc" = callPackage @@ -154577,6 +154609,8 @@ self: { ]; description = "Utilities for serving static sites and blogs with Wai/Warp"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kawhi" = callPackage @@ -170453,6 +170487,8 @@ self: { ]; description = "The project management tool for hackers"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mastermind" = callPackage @@ -212299,6 +212335,8 @@ self: { ]; description = "Creating graphics for pencil puzzles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "puzzle-draw-cmdline" = callPackage @@ -212317,6 +212355,7 @@ self: { ]; description = "Creating graphics for pencil puzzles, command line tools"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "pvar" = callPackage @@ -216688,6 +216727,8 @@ self: { testHaskellDepends = [ base ]; description = "Simple reactive programming with GTK GObject Introspection"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reactive-banana-sdl" = callPackage @@ -216717,6 +216758,8 @@ self: { testHaskellDepends = [ base ]; description = "Reactive Banana integration with SDL2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reactive-banana-threepenny" = callPackage @@ -216731,6 +216774,8 @@ self: { libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; description = "Examples for the reactive-banana library, using threepenny-gui"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "reactive-banana-wx" = callPackage From 97d2cfaf810607f590b1b133c4b3d447b9f6f198 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Jun 2021 13:23:22 +0000 Subject: [PATCH 42/42] adwaita-qt: 1.3.0 -> 1.3.1 --- pkgs/data/themes/adwaita-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 2722c4fe20c9..fa69afe50c5e 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "1fkivdiz4al84nhgg1srj33l109j9si63biw3asy339cyyzj28c9"; + sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg="; }; nativeBuildInputs = [