From e4541bccd57496562b9f885c19a5ce9c009778b8 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 28 Jan 2023 15:25:40 +0900 Subject: [PATCH 01/73] haskellPackages: stackage LTS 20.6 -> LTS 20.8 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index dff7577fedca..e2f7c3b8b708 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.6 +# Stackage LTS 20.8 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -123,9 +123,9 @@ default-package-overrides: - aura ==3.2.9 - authenticate ==1.3.5.1 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.1 + - autodocodec ==0.2.0.2 - autodocodec-openapi3 ==0.2.1.1 - - autodocodec-schema ==0.1.0.2 + - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.2 - auto-update ==0.1.6 @@ -188,7 +188,7 @@ default-package-overrides: - binary-instances ==1.0.3 - binary-list ==1.1.1.2 - binary-orphans ==1.0.3 - - binary-parser ==0.5.7.2 + - binary-parser ==0.5.7.3 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -232,7 +232,7 @@ default-package-overrides: - boots ==0.2.0.1 - bordacount ==0.1.0.0 - boring ==0.2 - - bound ==2.0.5 + - bound ==2.0.6 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 @@ -301,7 +301,7 @@ default-package-overrides: - calligraphy ==0.1.3 - call-plantuml ==0.0.1.1 - call-stack ==0.4.0 - - can-i-haz ==0.3.1.0 + - can-i-haz ==0.3.1.1 - capability ==0.5.0.1 - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 @@ -340,7 +340,7 @@ default-package-overrides: - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - checkers ==0.6.0 - - checksum ==0.0 + - checksum ==0.0.0.1 - chimera ==0.3.3.0 - choice ==0.2.2 - chronologique ==0.3.1.3 @@ -350,7 +350,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - - citeproc ==0.8.0.2 + - citeproc ==0.8.1 - classy-prelude ==1.5.0.2 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -385,7 +385,7 @@ default-package-overrides: - comfort-graph ==0.0.3.2 - commonmark ==0.2.2 - commonmark-extensions ==0.2.3.3 - - commonmark-pandoc ==0.2.1.2 + - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 @@ -406,7 +406,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.16 + - concurrent-output ==1.10.17 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -506,9 +506,9 @@ default-package-overrides: - cyclotomic ==1.1.1 - czipwith ==1.0.1.4 - d10 ==1.0.1.2 - - data-accessor ==0.2.3 - - data-accessor-mtl ==0.2.0.4 - - data-accessor-transformers ==0.2.1.7 + - data-accessor ==0.2.3.1 + - data-accessor-mtl ==0.2.0.5 + - data-accessor-transformers ==0.2.1.8 - data-array-byte ==0.1.0.1 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.2 @@ -574,7 +574,7 @@ default-package-overrides: - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - - deriving-aeson ==0.2.8 + - deriving-aeson ==0.2.9 - deriving-compat ==0.6.2 - detour-via-sci ==1.0.0 - df1 ==0.4 @@ -669,10 +669,10 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - effectful ==2.2.1.0 - - effectful-core ==2.2.1.0 + - effectful ==2.2.2.0 + - effectful-core ==2.2.2.1 - effectful-plugin ==1.0.0.0 - - effectful-th ==1.0.0.0 + - effectful-th ==1.0.0.1 - either ==5.0.2 - either-both ==0.1.1.1 - either-unwrap ==1.1 @@ -684,12 +684,12 @@ default-package-overrides: - elm-bridge ==0.8.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elynx ==0.7.0.1 - - elynx-markov ==0.7.0.1 - - elynx-nexus ==0.7.0.1 - - elynx-seq ==0.7.0.1 - - elynx-tools ==0.7.0.1 - - elynx-tree ==0.7.0.1 + - elynx ==0.7.1.0 + - elynx-markov ==0.7.1.0 + - elynx-nexus ==0.7.1.0 + - elynx-seq ==0.7.1.0 + - elynx-tools ==0.7.1.0 + - elynx-tree ==0.7.1.0 - emacs-module ==0.1.1.1 - email-validate ==2.3.2.18 - emojis ==0.1.2 @@ -736,7 +736,7 @@ default-package-overrides: - experimenter ==0.1.0.14 - expiring-cache-map ==0.0.6.1 - explainable-predicates ==0.1.2.3 - - explicit-exception ==0.1.10 + - explicit-exception ==0.1.10.1 - exp-pairs ==0.2.1.0 - express ==1.0.10 - extended-reals ==0.2.4.0 @@ -809,7 +809,7 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.3 - focuslist ==0.1.1.0 - - foldl ==1.4.13 + - foldl ==1.4.14 - folds ==0.7.8 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 @@ -1103,7 +1103,7 @@ default-package-overrides: - hkd-default ==1.1.0.0 - hkgr ==0.4.2 - hledger ==1.27.1 - - hledger-interest ==1.6.4 + - hledger-interest ==1.6.5 - hledger-lib ==1.27.1 - hledger-stockquotes ==0.1.2.1 - hledger-ui ==1.27.1 @@ -1123,7 +1123,7 @@ default-package-overrides: - hnock ==0.4.0 - hoauth2 ==2.6.0 - hoogle ==5.0.18.3 - - hopenssl ==2.2.4 + - hopenssl ==2.2.5 - hopfli ==0.2.2.1 - horizontal-rule ==0.5.0.0 - hosc ==0.19.1 @@ -1416,7 +1416,7 @@ default-package-overrides: - lame ==0.2.0 - language-avro ==0.1.4.0 - language-bash ==0.9.2 - - language-c ==0.9.1 + - language-c ==0.9.2 - language-c-quote ==0.13 - language-docker ==12.0.0 - language-dot ==0.1.1 @@ -1429,7 +1429,7 @@ default-package-overrides: - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.3 + - lapack-ffi-tools ==0.1.3.1 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==2.0.3 @@ -1481,7 +1481,7 @@ default-package-overrides: - ListLike ==4.7.8 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-t ==1.0.5.3 + - list-t ==1.0.5.6 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1490,7 +1490,7 @@ default-package-overrides: - little-rio ==1.0.1 - lmdb ==0.2.5 - load-env ==0.2.1.0 - - loc ==0.1.4.0 + - loc ==0.1.4.1 - locators ==0.3.0.3 - loch-th ==0.2.2 - lockfree-queue ==0.2.4 @@ -1547,7 +1547,7 @@ default-package-overrides: - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 - maximal-cliques ==0.1.1 - - mcmc ==0.8.0.1 + - mcmc ==0.8.1.0 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.2.2 @@ -1579,9 +1579,9 @@ default-package-overrides: - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.11 - microspec ==0.2.1.3 - - microstache ==1.0.2.2 + - microstache ==1.0.2.3 - midair ==0.2.0.1 - - midi ==0.2.2.3 + - midi ==0.2.2.4 - midi-music-box ==0.0.1.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 @@ -1808,7 +1808,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.17.0.0 - optparse-enum ==1.0.0.0 - - optparse-generic ==1.4.8 + - optparse-generic ==1.4.9 - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 @@ -1844,7 +1844,7 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.3.0 - partial-order ==0.2.0.0 - - partial-semigroup ==0.6.0.0 + - partial-semigroup ==0.6.0.1 - password ==3.0.2.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 @@ -1858,7 +1858,7 @@ default-package-overrides: - path-io ==1.7.0 - path-like ==0.2.0.2 - path-pieces ==0.2.1 - - path-text-utf8 ==0.0.1.10 + - path-text-utf8 ==0.0.1.11 - pathtype ==0.8.1.1 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 @@ -2361,7 +2361,7 @@ default-package-overrides: - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.2 - - slynx ==0.7.0.1 + - slynx ==0.7.1.0 - smallcheck ==1.2.1 - smtp-mail ==0.3.0.0 - snowflake ==0.1.1.1 @@ -2374,7 +2374,7 @@ default-package-overrides: - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.7 - - sox ==0.2.3.1 + - sox ==0.2.3.2 - spacecookie ==1.0.0.2 - sparse-linear-algebra ==0.3.1 - spdx ==1.0.0.3 @@ -2393,7 +2393,7 @@ default-package-overrides: - Spock-lucid ==0.4.0.1 - Spock-worker ==0.3.1.0 - spoon ==0.3.1 - - spreadsheet ==0.1.3.8 + - spreadsheet ==0.1.3.9 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.2 @@ -2487,7 +2487,7 @@ default-package-overrides: - swish ==0.10.3.0 - syb ==0.7.2.2 - syb-with-class ==0.6.1.14 - - sydtest ==0.13.0.0 + - sydtest ==0.13.0.1 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 @@ -2540,7 +2540,7 @@ default-package-overrides: - tasty-golden ==2.3.5 - tasty-hedgehog ==1.3.1.0 - tasty-hslua ==1.0.2 - - tasty-hspec ==1.2.0.1 + - tasty-hspec ==1.2.0.2 - tasty-html ==0.4.1.4 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 @@ -2585,7 +2585,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.5.4 + - texmath ==0.12.5.5 - text-ansi ==0.2.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2611,7 +2611,7 @@ default-package-overrides: - th-bang-compat ==0.0.1.0 - th-compat ==0.1.4 - th-constraint-compat ==0.0.1.0 - - th-data-compat ==0.1.1.0 + - th-data-compat ==0.1.2.0 - th-desugar ==1.13.1 - th-env ==0.1.1 - these ==1.1.1.1 @@ -2663,7 +2663,7 @@ default-package-overrides: - tls ==1.5.8 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.7.0.1 + - tlynx ==0.7.1.0 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 @@ -2754,7 +2754,7 @@ default-package-overrides: - uniplate ==1.6.13 - uniq-deep ==1.2.1 - unique ==0.0.1 - - unique-logic ==0.4 + - unique-logic ==0.4.0.1 - unique-logic-tf ==0.5.1 - unit-constraint ==0.0.0 - units-parser ==0.1.1.4 @@ -2827,10 +2827,10 @@ default-package-overrides: - vector-extras ==0.2.8 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-rotcev ==0.1.0.1 + - vector-rotcev ==0.1.0.2 - vector-sized ==1.5.0 - vector-space ==0.16 - - vector-split ==1.0.0.2 + - vector-split ==1.0.0.3 - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 @@ -2942,7 +2942,7 @@ with-compiler: ghc-9.2.5 - xlsx ==1.0.0.1 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - - xml-basic ==0.1.3.1 + - xml-basic ==0.1.3.2 - xmlbf ==0.6.2 - xmlbf-xeno ==0.2.1 - xmlbf-xmlhtml ==0.2 From c4d081132770679ff27ea4422e38526d9a524a55 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 28 Jan 2023 15:26:22 +0900 Subject: [PATCH 02/73] all-cabal-hashes: 2023-01-12T12:18:29Z -> 2023-01-28T02:06:09Z 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 3cb903245f89..c62287f69cf7 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz", - "sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l", - "msg": "Update from Hackage at 2023-01-12T12:18:29Z" + "commit": "5214fcc83cc588cb286c8cd5a08ff366143cbd51", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5214fcc83cc588cb286c8cd5a08ff366143cbd51.tar.gz", + "sha256": "0fcrqf913qfz5p6hh44iz552mz3wy8b46nm7vgsmqfmrkf3jhcbs", + "msg": "Update from Hackage at 2023-01-28T02:06:09Z" } From 0c439eaa451dd19d6d35c627300d4a2e1ab10205 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sat, 28 Jan 2023 15:28:05 +0900 Subject: [PATCH 03/73] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 2836 ++++++++++++----- 1 file changed, 2042 insertions(+), 794 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3fb5c3e88a3e..b5fee8137685 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6000,10 +6000,8 @@ self: { }: mkDerivation { pname = "FailT"; - version = "0.1.0.0"; - sha256 = "13ai9w5i3ay3v0skn32fllymnywd77zdr4lvf16k99lnimbzzm6y"; - revision = "2"; - editedCabalFile = "1cvw3icblydaid9w74dqaprsp8556zapr4ajw8qi8iw8y3kss891"; + version = "0.1.1.0"; + sha256 = "1hv9zycvsf696x9g73w9jhlipw826vl71gix09jmm02i9jpyr4q2"; libraryHaskellDepends = [ base exceptions mtl text ]; testHaskellDepends = [ base doctest exceptions hspec mtl QuickCheck quickcheck-classes @@ -6335,6 +6333,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "FirstPrelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "FirstPrelude"; + version = "0.1.2.0"; + sha256 = "00qv9h9i3yy7rh6wl8qs2r00z9hqpm56y9g717qh0skrl1fdk3yk"; + libraryHaskellDepends = [ base ]; + description = "A version of Prelude suitable for teaching"; + license = lib.licenses.bsd3; + }) {}; + "FixedPoint-simple" = callPackage ({ mkDerivation, base, deepseq, template-haskell }: mkDerivation { @@ -10083,6 +10092,8 @@ self: { pname = "HaXml"; version = "1.25.12"; sha256 = "1xaqp519dw948v00q309msx07yhzxbd0k8ds5q434l6g6cmsqqgc"; + revision = "1"; + editedCabalFile = "1bx5gw3jg6j0rppf5297grw9cv1vccvj5av1hny5i60nrj1725rc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12622,6 +12633,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "LPFP" = callPackage + ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib + , gloss, gnuplot, linear, not-gloss, spatial-math + }: + mkDerivation { + pname = "LPFP"; + version = "1.0"; + sha256 = "0sxl6zwji66blk2vamc6ffb17ibbxp3ypnq14xr2y5vlqj0v2flq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers diagrams-cairo diagrams-lib gloss gnuplot not-gloss + spatial-math + ]; + executableHaskellDepends = [ + base diagrams-cairo diagrams-lib gloss gnuplot linear not-gloss + spatial-math + ]; + description = "Code for the book Learn Physics with Functional Programming"; + license = lib.licenses.bsd3; + }) {}; + "LPPaver" = callPackage ({ mkDerivation, aern2-mfun, aern2-mp, base, collect-errors , containers, directory, mixed-types-num, optparse-applicative @@ -14016,6 +14049,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "MissingH_1_6_0_0" = callPackage + ({ mkDerivation, array, base, containers, directory, filepath + , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time + , parsec, process, regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.6.0.0"; + sha256 = "0krd15c5c1k92zm1w2qmqwib2gg93bxqz76xmyhcjkx1l229cfzw"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process regex-compat time + unix + ]; + testHaskellDepends = [ + base containers directory filepath HUnit old-time parsec + regex-compat time unix + ]; + description = "Large utility library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -20651,6 +20707,8 @@ self: { pname = "TeX-my-math"; version = "0.202.2.0"; sha256 = "1w074jr2qr603hjh644cvlc0n1miaz10r8mhkskq39jn184kriyl"; + revision = "1"; + editedCabalFile = "1chcybl7wf1kkf4mnjxm3vd7hdjmq6fkc8x1hn9fydln57wjzw0v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24903,6 +24961,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ad_4_5_3" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , criterion, data-reify, erf, free, nats, reflection, semigroups + , tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.5.3"; + sha256 = "1p4r70s9xslza7ag3ifnf69ji37mkkj2gabfi1lj0fyssm0jyy5y"; + libraryHaskellDepends = [ + adjunctions array base comonad containers data-reify erf free nats + reflection semigroups transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ad-delcont" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -25823,8 +25901,8 @@ self: { }: mkDerivation { pname = "aeson-flowtyped"; - version = "0.13.2.1"; - sha256 = "03zs0mz6fxgvcvfnx3j55yj2hi4npfj10kirjysnx0icypqy6x7g"; + version = "0.14.0"; + sha256 = "1w7bc2i6ncnzyaxrzl1r0p54s7b579q3n83bg5621zn5m2y450gv"; libraryHaskellDepends = [ aeson base containers data-fix deriving-compat free generics-sop mtl recursion-schemes reflection scientific text time @@ -26737,6 +26815,27 @@ self: { mainProgram = "agda2lagda"; }) {}; + "agda2lagda_0_2023_1_12" = callPackage + ({ mkDerivation, base, directory, filepath, goldplate + , optparse-applicative, process + }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2023.1.12"; + sha256 = "0arcap9vpa6yfj7mhdsljrkr0581d3jfnkxr1d8fb35mdawsiikl"; + 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; + mainProgram = "agda2lagda"; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -33472,7 +33571,7 @@ self: { mainProgram = "refactor"; }) {}; - "apply-refact_0_11_0_0" = callPackage + "apply-refact_0_12_0_0" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths , optparse-applicative, process, refact, silently, syb, tasty @@ -33481,14 +33580,13 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.11.0.0"; - sha256 = "1bmm9s8h5grqp1c8m1x9icbhznfc565za8w3sqfpiylid7c7fz72"; + version = "0.12.0.0"; + sha256 = "0xwlvygz5mvcsklqxlm34jhibwighp1v0gin2w95j0ncs96s47yc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory extra filemanip ghc ghc-boot-th - ghc-exactprint ghc-paths process refact syb transformers uniplate - unix-compat + ghc-exactprint process refact syb transformers uniplate unix-compat ]; executableHaskellDepends = [ base containers directory extra filemanip filepath ghc ghc-boot-th @@ -34194,8 +34292,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.5"; - sha256 = "1rmxahc4fp62c00k9j4p3952wl2cqny9adlhd7l1h4z3wml7mwsv"; + version = "1.7.6"; + sha256 = "1s6fmz4mz333q8blj0x9c8wl8hh7zxq7b7jz0icdkc53ncghbfhv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -35111,15 +35209,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_5_1_0" = callPackage + "ascii_1_5_2_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.5.1.0"; - sha256 = "01a2xrkk60bpbz4x337jp66fy7zhdpb2c649c62inx723cc1q4il"; + version = "1.5.2.0"; + sha256 = "0j5jj23rdv6if9bzindispq2yyn9y2dmbhvxw0dqs7fdcxa7npgq"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -37409,6 +37507,8 @@ self: { pname = "audacity"; version = "0.0.2.1"; sha256 = "04r36gy8z0d2fz1l5px6yajp7izf3zpda9vci6q0wc273pxc8ck6"; + revision = "1"; + editedCabalFile = "0f43s469wgrp6vkiqz1ibnvcv37zjsng2pdzkhhpg9v4syi30r3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37727,8 +37827,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.1"; - sha256 = "1pjv2nk8g7cvck2g6nm15dy2bwg3hqdhyyi4c0q7x2k0awn2qkjg"; + version = "0.2.0.2"; + sha256 = "0mmh6zb660wafizf40a96f30pswv3xyry5r0i0n17w70p3jwa14k"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -37762,8 +37862,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.1.0.2"; - sha256 = "0vvwjz8abn6qmk2801p7vyrbjkqcxdqjlc82ha8l9xvb6mmvqy3i"; + version = "0.1.0.3"; + sha256 = "1rb9ff1n0pllx02g1741mkvil2hz5km306pbyqm15h17vlpa5kdw"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -41627,6 +41727,28 @@ self: { license = lib.licenses.mit; }) {}; + "beam-core_0_10_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, scientific + , tagged, tasty, tasty-hunit, text, time, vector, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.10.0.0"; + sha256 = "0567j05c3ihr5j3n3pl39x84xp4p6y2haxybwc22acbami1hqrkw"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri scientific tagged text time vector + vector-sized + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit text time + ]; + description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable @@ -43121,24 +43243,6 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, bytestring, mtl, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "binary-parser"; - version = "0.5.7.2"; - sha256 = "1p17v5fspislzmqy5wxrnmbfg0l0yvm35mk034q4imkmjy0pa1w7"; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A highly-efficient but limited parser API specialised for bytestrings"; - license = lib.licenses.mit; - }) {}; - - "binary-parser_0_5_7_3" = callPackage ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text , transformers @@ -43154,7 +43258,6 @@ self: { ]; description = "An efficient but limited parser API specialised to bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parsers" = callPackage @@ -45324,6 +45427,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bitfield" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-sydtest, QuickCheck + , sydtest, sydtest-discover, validity + }: + mkDerivation { + pname = "bitfield"; + version = "0.0.0.0"; + sha256 = "1b9jqbcyzp1ajcgjiipjgn1h514kl6zav4ai474x6xalhvwfcpx9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base genvalidity genvalidity-sydtest QuickCheck sydtest validity + ]; + testToolDepends = [ sydtest-discover ]; + description = "Generic and easy to use haskell bitfields"; + license = lib.licenses.mit; + }) {}; + "bitly-cli" = callPackage ({ mkDerivation, base, Bitly, directory, filepath, regexpr }: mkDerivation { @@ -47132,29 +47252,30 @@ self: { }) {}; "board-games" = callPackage - ({ mkDerivation, array, base, cgi, containers, criterion - , enummapset, html, httpd-shed, network-uri, non-empty, parallel - , QuickCheck, random, transformers, utility-ht + ({ mkDerivation, array, base, boxes, cgi, combinatorial, containers + , criterion, doctest-exitcode-stdio, doctest-lib, enummapset + , explicit-exception, haha, html, httpd-shed, network-uri + , non-empty, parallel, QuickCheck, random, semigroups + , shell-utility, transformers, utility-ht }: mkDerivation { pname = "board-games"; - version = "0.3"; - sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7"; - revision = "1"; - editedCabalFile = "0rb5bqjg6r8p2v2wfdhivsbgbn55acdjsj6hcy6bv5w50qmg1l6c"; + version = "0.4"; + sha256 = "05lrjgxdg836ik7ry5h9m9diirfc55086winssr9y0g6vbgbifpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base cgi containers enummapset html non-empty QuickCheck - random transformers utility-ht + array base boxes cgi combinatorial containers enummapset + explicit-exception haha html non-empty QuickCheck random semigroups + transformers utility-ht ]; executableHaskellDepends = [ array base cgi containers html httpd-shed network-uri non-empty - random transformers utility-ht + random shell-utility transformers utility-ht ]; testHaskellDepends = [ - array base containers enummapset non-empty QuickCheck random - transformers utility-ht + array base containers doctest-exitcode-stdio doctest-lib enummapset + non-empty QuickCheck random transformers utility-ht ]; benchmarkHaskellDepends = [ base containers criterion enummapset non-empty parallel QuickCheck @@ -48030,8 +48151,8 @@ self: { }: mkDerivation { pname = "bound"; - version = "2.0.5"; - sha256 = "1cnw0q97bys7jcpjds2fb6zkq9pyqxcb8v0b5dvkckqmlp8agn4v"; + version = "2.0.6"; + sha256 = "1mlnpc4x7gn97b8pqiwj3shv23slfylwplp7zr37ar5ff9isbm28"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -48604,7 +48725,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_1_5" = callPackage + "brick_1_6" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck @@ -48613,8 +48734,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "1.5"; - sha256 = "0kszp6yrpqc9v87m38rladhmn8xcdbrrh05xr6fi936n34bhi432"; + version = "1.6"; + sha256 = "18vx2p8yfraxb77cd9pvdvsqgm3pcvrkc6wa74jsr7177akgnga6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50368,8 +50489,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "1.0.4"; - sha256 = "0c6d8b11dgg585fvql0h2rrmiw2l8831ig2f89jlqzkdsa0asm67"; + version = "1.0.5"; + sha256 = "1ydldi9q9rxggjh6mncg7mwggi0wpigld96nqqgw33ldcid8b7as"; libraryHaskellDepends = [ base bitwise bytestring deepseq panic parameterized-utils random th-lift @@ -50420,8 +50541,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "1.1.1"; - sha256 = "0yy9hd8yhpi175fgnp8cd4h0bifx2zvy82jmbkd28kpbgw6b49vi"; + version = "1.1.2"; + sha256 = "11z9dga8jq3f0h4v0c3s2brrcqb029h6wsn0x97393vkx7pjhai2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50613,6 +50734,8 @@ self: { pname = "bytepatch"; version = "0.4.0"; sha256 = "0algbhwzkhj5l98djzhy6ayd4wpldxv75zvqhpp6ckm94ryvb4v9"; + revision = "1"; + editedCabalFile = "1n4cff6wfbgdrw2hn7q1ns346w3mcn6a84v15hw4yzd173pbk4k3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50744,14 +50867,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "bytestring_0_11_3_1" = callPackage + "bytestring_0_11_4_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck, random, tasty , tasty-bench, tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "bytestring"; - version = "0.11.3.1"; - sha256 = "0nh75v2hmmcq650q51sv28yprrnnah80spiqvw4js8dy48bqwlah"; + version = "0.11.4.0"; + sha256 = "1lvnjnrsnwbyn5day55fkhzrwggjrabz1rvaq833lsawcbvsw6j9"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base deepseq ghc-prim QuickCheck tasty tasty-quickcheck @@ -51569,8 +51692,8 @@ self: { pname = "c2hs"; version = "0.28.8"; sha256 = "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir"; - revision = "1"; - editedCabalFile = "0hbv1j9b04gm617c5xqndr4iqidabwdpcn2dcrnaacc04ylchvl2"; + revision = "2"; + editedCabalFile = "14j3sjxvwhj32zpz0iyigc6wdn6pjm3vlgs0prq0grvk48p176f3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -52787,8 +52910,8 @@ self: { }: mkDerivation { pname = "cabal-sort"; - version = "0.0.5.4"; - sha256 = "1pssbb9i5h3q97i3qrybz9iyd1nsh9y27ykxvda6vk820jxjvb9b"; + version = "0.0.5.5"; + sha256 = "0lxw7kbqpaf4j03rrlivkb0imvnw0wsnxjy8gvcjs0jb101dzf8g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -54133,8 +54256,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, HUnit, mtl }: mkDerivation { pname = "can-i-haz"; - version = "0.3.1.0"; - sha256 = "0pwwl5pawvd1sygc8k7ichfk15inhcy4has40zplqqws5lmm6mz8"; + version = "0.3.1.1"; + sha256 = "19518f7xrki9igv4i9ish1v3cgix5g0mgvwrkrjgq3ny2jwmqljw"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base deepseq hspec HUnit mtl ]; description = "Generic implementation of the Has and CoHas patterns"; @@ -54627,8 +54750,8 @@ self: { }: mkDerivation { pname = "car-pool"; - version = "0.0.1"; - sha256 = "1y674qnixmk6l4yvbvz3vsxzpfchy5vq0qsn4b2xyziqxscz9aih"; + version = "0.0.1.1"; + sha256 = "0xbaaynw0bi18lbdxa0n0ypd8qkn6x4y7i7vsan2zawwbkn264sg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -56788,8 +56911,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.5.0.0"; - sha256 = "09wvp9vkqasns4flw9z46nhcy96r4qxjv6h47d5f90drz77pmm8a"; + version = "3001.5.0.1"; + sha256 = "044gfqfdw5xdr6mzp5i3956a5fcj15j32zwzzd6ym15nxgrvjqh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57693,8 +57816,8 @@ self: { ({ mkDerivation, base, explicit-exception, utility-ht }: mkDerivation { pname = "checksum"; - version = "0.0"; - sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik"; + version = "0.0.0.1"; + sha256 = "1p1ys40jjndbq4p5hr64ps464yd5brv1nf821crr6ncfcw8h3742"; libraryHaskellDepends = [ base explicit-exception utility-ht ]; description = "Compute and verify checksums of ISBN, IBAN, etc"; license = lib.licenses.bsd3; @@ -57778,8 +57901,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.0"; - sha256 = "0hmj9dvsvwrp7ab4zrzmbvmzy0q6fr2ifzmdp4ajbxlmca0yh3py"; + version = "0.9.3.1"; + sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59017,8 +59140,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.8.0.2"; - sha256 = "1rja6vdggmh7d40gsg2xfs9md6m1zbfddpsd27a15qyqb3530jzw"; + version = "0.8.1"; + sha256 = "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60231,19 +60354,24 @@ self: { "clerk" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, lens - , mtl, text, time, transformers, xlsx + , lima, mtl, text, time, transformers, typed-process, xlsx }: mkDerivation { pname = "clerk"; - version = "0.1.0.2"; - sha256 = "0nbli8pj7v4wblbji2hqlkwbh98iiclg7vpbg6qsa91bw8p4nwmd"; + version = "0.1.0.3"; + sha256 = "01bxj0znkk8gizn0ilslzn07x4rm716ghpckwfqf7ilh78q5jfnd"; libraryHaskellDepends = [ base bytestring containers data-default lens mtl text time transformers xlsx ]; - description = "Declaratively describe spreadsheets and generate xlsx"; + testHaskellDepends = [ + base bytestring containers data-default lens mtl text time + transformers typed-process xlsx + ]; + testToolDepends = [ lima ]; + description = "Declaratively describe spreadsheets"; license = lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) lima;}; "cless" = callPackage ({ mkDerivation, base, highlighting-kate, optparse-applicative @@ -61901,24 +62029,25 @@ self: { "cobot-io" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring, cobot - , containers, data-msgpack, deepseq, directory, hspec, http-conduit - , hyraxAbif, lens, linear, megaparsec, mtl, neat-interpolation - , parser-combinators, QuickCheck, split, text, vector + , containers, data-msgpack, deepseq, directory, filepath, hspec + , http-conduit, hyraxAbif, lens, linear, megaparsec, mtl + , neat-interpolation, parser-combinators, QuickCheck, split, text + , vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.4.4"; - sha256 = "04dizmriis6zs7jfwbagnzrszlmky8xkvrsmxb8wra90fnww8l66"; + version = "0.1.5.1"; + sha256 = "0k26qzrd1j744dg5is26gmh99xawf25wzlj72wmlc56nx5rc6cfx"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers - data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec - mtl parser-combinators split text vector + data-msgpack deepseq filepath http-conduit hyraxAbif lens linear + megaparsec mtl parser-combinators split text vector ]; testHaskellDepends = [ array attoparsec base binary bytestring cobot containers - data-msgpack deepseq directory hspec http-conduit hyraxAbif lens - linear megaparsec mtl neat-interpolation parser-combinators - QuickCheck split text vector + data-msgpack deepseq directory filepath hspec http-conduit + hyraxAbif lens linear megaparsec mtl neat-interpolation + parser-combinators QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = lib.licenses.bsd3; @@ -63489,8 +63618,8 @@ self: { }: mkDerivation { pname = "commander-cli"; - version = "0.10.2.0"; - sha256 = "1cp7g04ag1pkcqlckpzxfq3x4vw7yd6v9vzhhp228pjc1f36iqgx"; + version = "0.11.0.0"; + sha256 = "01c968r4qzvqbjwqwhp1xk7s59wsbaas9jvdfi2sgk2jk6vg0ss3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63636,8 +63765,8 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.1.2"; - sha256 = "1dpi8zvjshab96w56qfqcys9h09f46lld8sc9q4xzb0y1p6lwmap"; + version = "0.2.1.3"; + sha256 = "08bzi6q3jma7xy1ygbpj8li06zwsykmmgl01i4qmp6i9fj8czbbp"; libraryHaskellDepends = [ base commonmark commonmark-extensions pandoc-types text ]; @@ -65431,24 +65560,6 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.10.16"; - sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"; - revision = "1"; - editedCabalFile = "0ak0nnfznsvq3vs8czsnlrw586hw4hj3299y75p7rhqi5jyvi932"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_17" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -65462,7 +65573,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "concurrent-resource-map" = callPackage @@ -68877,6 +68987,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_9_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.9.0"; + sha256 = "126z21i4f7z7pf415jjqjd4ik6sb9kid1dgrlc2yzq2vd4wdi9gg"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -68916,6 +69044,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_6_2_1" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, hashable, hourglass, mtl + , prettyprinter, safe-exceptions, stm, template-haskell + , terminal-size, text, text-short, transformers, typed-process + , unix, unliftio-core + }: + mkDerivation { + pname = "core-program"; + version = "0.6.2.1"; + sha256 = "13dxd290479aam366g5dcwhqpp3mxxzdcmn86c85197m2darrkhv"; + libraryHaskellDepends = [ + base bytestring core-data core-text directory exceptions filepath + fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm + template-haskell terminal-size text text-short transformers + typed-process unix unliftio-core + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl @@ -71706,6 +71856,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "cryptostore_0_3_0_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, basement + , bytestring, cryptonite, hourglass, memory, pem, tasty + , tasty-hunit, tasty-quickcheck, x509, x509-validation + }: + mkDerivation { + pname = "cryptostore"; + version = "0.3.0.0"; + sha256 = "0s6r7pjdp2jqqxq0b1f1ks23h1dh8hh4vqzbqm8irgvmsz445pwh"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base basement bytestring cryptonite + hourglass memory pem x509 x509-validation + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass memory pem tasty + tasty-hunit tasty-quickcheck x509 + ]; + description = "Serialization of cryptographic data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -73090,6 +73262,8 @@ self: { pname = "cutter"; version = "0.0"; sha256 = "1hka1k012d2nwnkbhbiga6307v1p5s88s2nxkrnymvr0db1ijwqi"; + revision = "1"; + editedCabalFile = "00fh0bhdlsrik1mq1hm3w6dg4m9c03bk22c3ans309dk5swr9hcy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73897,8 +74071,8 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "data-accessor"; - version = "0.2.3"; - sha256 = "0f1yvvzr24qgrx6k2g101s7vp012802iw6kli903n28nig93yn0x"; + version = "0.2.3.1"; + sha256 = "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6"; libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; license = lib.licenses.bsd3; @@ -73951,8 +74125,8 @@ self: { ({ mkDerivation, base, data-accessor, mtl }: mkDerivation { pname = "data-accessor-mtl"; - version = "0.2.0.4"; - sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh"; + version = "0.2.0.5"; + sha256 = "0xnd5l961530yzpzrkv13jz8lv42szs8ra75nnw8rzkwaijsvi4r"; libraryHaskellDepends = [ base data-accessor mtl ]; description = "Use Accessor to access state in mtl State monad class"; license = lib.licenses.bsd3; @@ -73980,8 +74154,8 @@ self: { ({ mkDerivation, base, data-accessor, transformers }: mkDerivation { pname = "data-accessor-transformers"; - version = "0.2.1.7"; - sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10"; + version = "0.2.1.8"; + sha256 = "1m18bdhddi4l7ijd1mighjbjdw5qkznsgrqb8532cv9al55r9y83"; libraryHaskellDepends = [ base data-accessor transformers ]; description = "Use Accessor to access state in transformers State monad"; license = lib.licenses.bsd3; @@ -73995,6 +74169,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; + revision = "1"; + editedCabalFile = "1nma7gz7lhain6jvwb3w3s53716ss8ypkk93gxpsaaz824svvw9f"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -77355,8 +77531,8 @@ self: { pname = "decimal-literals"; version = "0.1.0.1"; sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; - revision = "1"; - editedCabalFile = "0giz73yb179xvww1s92dbl4mhvcxlv25f0zrjwc9lsvx9h2aivg0"; + revision = "2"; + editedCabalFile = "0wrjxapnv7i20krg601jzqik3pns6s7kr3c2x99n4lqi43b1a2v9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -78154,8 +78330,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.6.0"; - sha256 = "1r3pd00jlbqc8z61a1s5iwzp9y1lbqvs55sc9f495fg8m35zxcqz"; + version = "0.6.8.0"; + sha256 = "1r0v6mvl1z5zxiwgrbx8bij6i2yv8cwwlh5x4cs5im174la6irfv"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -78776,20 +78952,6 @@ self: { }) {}; "deriving-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring }: - mkDerivation { - pname = "deriving-aeson"; - version = "0.2.8"; - sha256 = "0f59ar4cax7g0h6wrk8ckni7i4gw5wls5ybzbrji2a0qpd7q5lrd"; - revision = "1"; - editedCabalFile = "0pwx7lmdhpipg9ksqkz6xpjzh1aw2hip8y3jsk20ndl4wdzvxak5"; - libraryHaskellDepends = [ aeson base ]; - testHaskellDepends = [ aeson base bytestring ]; - description = "Type driven generic aeson instance customisation"; - license = lib.licenses.bsd3; - }) {}; - - "deriving-aeson_0_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; @@ -78799,7 +78961,6 @@ self: { testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "deriving-compat" = callPackage @@ -78855,16 +79016,16 @@ self: { "deriving-trans" = callPackage ({ mkDerivation, base, exceptions, monad-control - , monad-control-identity, mtl, transformers, transformers-base - , unliftio-core + , monad-control-identity, mtl, primitive, random, resourcet + , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.5.1.0"; - sha256 = "1k6j66v2wcqhcbf7rrj4qsm7fdf68g0i6yslcjdrricdh8b7r9w2"; + version = "0.6.1.0"; + sha256 = "0zkl41kyq7s6gm37y4cwjim7b65fa2vmxqxfsmm9p5r6pkrn46d7"; libraryHaskellDepends = [ - base exceptions monad-control monad-control-identity mtl - transformers transformers-base unliftio-core + base exceptions monad-control monad-control-identity mtl primitive + random resourcet transformers transformers-base unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; @@ -80941,6 +81102,8 @@ self: { pname = "dice"; version = "0.1.1"; sha256 = "1y4184xicjwp29cyriq3qcr066167nwfy0720dmxjbgw795jxpsb"; + revision = "1"; + editedCabalFile = "1006bnawdn3fp76q2arz62q5dkkxgix18m7bcrb63xjzhssm09xy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec random random-fu ]; @@ -81115,6 +81278,8 @@ self: { pname = "diff-loc"; version = "0.1.0.0"; sha256 = "08sbxkf804bq3lwr9s1k1vigq7yrdjgicrj114zi14cdi4168k3x"; + revision = "1"; + editedCabalFile = "1macpybgwxyak0cgpimkjqzzn0xf4mkyj9n0papjzxjaw3iv4vmd"; libraryHaskellDepends = [ base fingertree show-combinators ]; description = "Map file locations across diffs"; license = lib.licenses.mit; @@ -81314,6 +81479,19 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; + "digest_0_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, zlib }: + mkDerivation { + pname = "digest"; + version = "0.0.1.5"; + sha256 = "1lpj16hazg8yh2rxspc1y7da9vgmz6jw9fx9qrvwv1hzmv8mvnvv"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ zlib ]; + description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "digest-pure" = callPackage ({ mkDerivation, array, base, bytestring, digest, QuickCheck }: mkDerivation { @@ -86596,10 +86774,8 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.2.1.0"; - sha256 = "1fxamg2npi1arhsjyxgbzcn50m3y9kn9ganc79gbn8xcx252rp63"; - revision = "1"; - editedCabalFile = "0fxsf82kqnfy6nn8805x6dksj6j5z0dyajb4nh47r3sq067jb1n0"; + version = "0.2.1.1"; + sha256 = "0rqh1sy500gbgqr69z220yb8g7gp117z0iw1kly9zxqhrzn3sv9f"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -87786,6 +87962,26 @@ self: { broken = true; }) {}; + "ebml" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, split, tasty + , tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "ebml"; + version = "0.1.0.0"; + sha256 = "0v0mf7l3fmdyr5981r3n7k4g1mh3nanl9qnsm87zdwpwkfhik7hq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base binary bytestring containers text ]; + executableHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base binary bytestring split tasty tasty-golden tasty-hunit text + ]; + description = "A pure EBML parser"; + license = lib.licenses.bsd3; + mainProgram = "haskell-ebml"; + }) {}; + "ebnf-bff" = callPackage ({ mkDerivation, aeson, base, bytestring, cond, directory, parsec , text @@ -88459,30 +88655,6 @@ self: { }) {}; "effectful" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , effectful-core, exceptions, lifted-base, primitive, process, stm - , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio - }: - mkDerivation { - pname = "effectful"; - version = "2.2.1.0"; - sha256 = "0p2kr9vcyhcpvyrqbvwmjjh4k2lsrrhhq6rdi087iyvd7vj33al2"; - libraryHaskellDepends = [ - async base bytestring directory effectful-core process stm time - unliftio - ]; - testHaskellDepends = [ - base containers effectful-core exceptions lifted-base primitive - tasty tasty-hunit unliftio - ]; - benchmarkHaskellDepends = [ - async base tasty-bench text unix unliftio - ]; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - }) {}; - - "effectful_2_2_2_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , effectful-core, exceptions, lifted-base, primitive, process, stm , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio @@ -88504,27 +88676,9 @@ self: { ]; description = "An easy to use, performant extensible effects library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "effectful-core" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control - , primitive, transformers-base, unliftio-core - }: - mkDerivation { - pname = "effectful-core"; - version = "2.2.1.0"; - sha256 = "0439fk1gr2jq663zl6p0ra9hkzmjm9ad24wnbrbz1nnl5v01ay2s"; - libraryHaskellDepends = [ - base containers exceptions monad-control primitive - transformers-base unliftio-core - ]; - doHaddock = false; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - }) {}; - - "effectful-core_2_2_2_1" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core }: @@ -88538,7 +88692,6 @@ self: { ]; description = "An easy to use, performant extensible effects library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "effectful-plugin" = callPackage @@ -88559,6 +88712,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_0" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc + , ghc-tcplugins-extra + }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.0"; + sha256 = "13m63lidazn8cp2f0y801nwri48h5mny3azsz5gpz1c7jj072xaa"; + libraryHaskellDepends = [ + base containers effectful-core ghc ghc-tcplugins-extra + ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -88573,20 +88743,18 @@ self: { }) {}; "effectful-th" = callPackage - ({ mkDerivation, base, containers, effectful, exceptions + ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.0"; - sha256 = "0qvsxw1ajmr63r1bkgkchj5ra8g1ypx135ld62bip2mvqaxha9ih"; - revision = "3"; - editedCabalFile = "1nqwvgdvqgh4dvkidyaga7jd95p3hn54hy5gwadsvyf9lll4vjck"; + version = "1.0.0.1"; + sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; libraryHaskellDepends = [ - base containers effectful exceptions template-haskell + base containers effectful-core exceptions template-haskell th-abstraction ]; - testHaskellDepends = [ base effectful ]; + testHaskellDepends = [ base effectful-core ]; description = "Template Haskell utilities for the effectful library"; license = lib.licenses.bsd3; }) {}; @@ -89015,8 +89183,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.6"; - sha256 = "1zmd728dxxifvpj7zwzb87rfmgs3wiz75d2g2lcm2sr0yafvzan4"; + version = "0.0.4.7"; + sha256 = "12j8jbbh5p9bmb1gwza4j38rynpp9x9vs30bbiaqf44jijzmkb53"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -90100,8 +90268,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.7.0.1"; - sha256 = "1r2d3v2y4xmqf45d7649d54f1dsrywil2km40qx951adrawp8g0q"; + version = "0.7.1.0"; + sha256 = "1k6hxsxcqlrfrcww1n31kidn5y7kafz9fm2qflj7zrcxpfpi9skj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90120,8 +90288,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.7.0.1"; - sha256 = "0dci3fpvyxjffn2lapdddj8flyk2id2b9z0shfidcknaghgig1gr"; + version = "0.7.1.0"; + sha256 = "1m4nrpm3g9zwk1gf0v93nlr8vb5pd8sgn1mnzj6b968vq3zb2ab3"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random random statistics vector @@ -90139,8 +90307,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.7.0.1"; - sha256 = "0rf1ydwhglcnvp3cdqhij859c3gn7l54nazw4501b6wj59ky7p75"; + version = "0.7.1.0"; + sha256 = "0yl3wkk5nz5hn11h1rmpmp7vzjf94n6bmylq16cik44kj1723y59"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -90155,8 +90323,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.7.0.1"; - sha256 = "1zjg9kayk97xqxpd6pryypmk9p69ylcyycfdzccj9pssqx99i5bi"; + version = "0.7.1.0"; + sha256 = "08wcikxgzl0j60xzffih5fd3mjbjisf17gr5aa1njjhs0vh6y8mg"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices parallel primitive random vector vector-th-unbox word8 @@ -90177,8 +90345,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.7.0.1"; - sha256 = "1lqsmpdwxg9b6v7hm8aizgwzcwp4kspvc6wphk6nlj34dxsjy673"; + version = "0.7.1.0"; + sha256 = "14dhq49ri7wndzkpiwv28r5w85wiwq3x2c00yz1x5ax3347jcdgh"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 directory hmatrix optparse-applicative random @@ -90192,18 +90360,17 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, data-default, data-default-class, deepseq - , double-conversion, elynx-nexus, elynx-tools, hspec - , math-functions, microlens, parallel, QuickCheck - , quickcheck-classes, random, statistics + , elynx-nexus, elynx-tools, hspec, math-functions, microlens + , parallel, QuickCheck, quickcheck-classes, random, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.7.0.1"; - sha256 = "0f9fmwv0580027qhlcffkzvx55nccx43klgkdbjnrhdqvd7h5a1s"; + version = "0.7.1.0"; + sha256 = "0jcqz49ml20cg0mwkpqjci44fkbcjhxf6dhhl8y68yczlz0778zs"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers - data-default-class deepseq double-conversion elynx-nexus - math-functions parallel random statistics + data-default-class deepseq elynx-nexus math-functions parallel + random statistics ]; testHaskellDepends = [ attoparsec base bytestring containers data-default elynx-tools @@ -91731,8 +91898,8 @@ self: { }: mkDerivation { pname = "equal-files"; - version = "0.0.5.3"; - sha256 = "1akj045b5554bmlbg94vaji1ly10n89xj1vip9ywamy5hv18bdz5"; + version = "0.0.5.4"; + sha256 = "13gf8f8ik1wdr8n8sa1jlzzfh1bi2892fb5bhmixlxk0d81dm76i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93749,14 +93916,15 @@ self: { "eventuo11y" = callPackage ({ mkDerivation, base, exceptions, general-allocate, monad-control - , mtl, primitive, transformers, transformers-base, unliftio-core + , mtl, primitive, time, transformers, transformers-base + , unliftio-core }: mkDerivation { pname = "eventuo11y"; - version = "0.6.0.0"; - sha256 = "1zk49cfg2cab5h5xy2bghk643aq6p0zi937linnxgl53c21br1li"; + version = "0.9.0.0"; + sha256 = "0ayzk79z2xvkhlmr6yg9q52kdjh68ahsi9hhc0bi58zg46dnq18i"; libraryHaskellDepends = [ - base exceptions general-allocate monad-control mtl primitive + base exceptions general-allocate monad-control mtl primitive time transformers transformers-base unliftio-core ]; description = "An event-oriented observability library"; @@ -93774,8 +93942,8 @@ self: { }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.3.0.0"; - sha256 = "12agwfk89jxsa2hdy5ghvkjddp2xs58973r4zi5zsf3zzx7nlx56"; + version = "0.4.0.0"; + sha256 = "04b1rigdxv5v2j8r7lfbl15a1hr9ifra9lnkxxc1j1symbpq620m"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y eventuo11y-json general-allocate http-media http-types @@ -93805,8 +93973,8 @@ self: { }: mkDerivation { pname = "eventuo11y-json"; - version = "0.2.0.0"; - sha256 = "132dkvsp1p5lj103amsfkn9grc4rx7qgs2nh5506mybykhhhzzg5"; + version = "0.3.0.2"; + sha256 = "1q60hb7zaa3gifbsf1d7zl1bclz21ysmb3g1ww5xz4hr5fy03ksi"; libraryHaskellDepends = [ aeson base bytestring eventuo11y eventuo11y-dsl template-haskell text time uuid @@ -93816,6 +93984,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "eventuo11y-otel" = callPackage + ({ mkDerivation, base, eventuo11y, hs-opentelemetry-api, text }: + mkDerivation { + pname = "eventuo11y-otel"; + version = "0.1.0.2"; + sha256 = "0mv97s3vnw7ppry3vinis6dv0j93pj5dywp0xzxrcsw9nbwiy3gj"; + libraryHaskellDepends = [ + base eventuo11y hs-opentelemetry-api text + ]; + description = "OpenTelemetry-based rendering for eventuo11y"; + license = lib.licenses.asl20; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -93869,8 +94050,8 @@ self: { }: mkDerivation { pname = "evoke"; - version = "0.2022.8.26"; - sha256 = "05jyak1dmb4cw4gp5p71pv8imkfachylq8bak81jmg6ni2shp28j"; + version = "0.2023.1.26"; + sha256 = "0c03ggjx7amcjqylcadshknqwqm9x6mlsa9d6np1vff6asf8s8b4"; libraryHaskellDepends = [ base ghc text ]; testHaskellDepends = [ aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 @@ -94161,6 +94342,8 @@ self: { pname = "exceptions"; version = "0.10.7"; sha256 = "0jb0ah5k2mb4clhb34c59f615vzl54lhx3hf6njqsgdmr3jashls"; + revision = "1"; + editedCabalFile = "05hqkph2rd7vkgbggbpa13i3r8wvb2fgsan40cd8macggwkw5k30"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -94993,8 +95176,8 @@ self: { ({ mkDerivation, base, deepseq, semigroups, transformers }: mkDerivation { pname = "explicit-exception"; - version = "0.1.10"; - sha256 = "1g7q01zqxv9aj4pqfbv4r8b2zndkilispigvmlvxnlapyzb6gm00"; + version = "0.1.10.1"; + sha256 = "1pv57m0ynwfljnr0g3snpc716q497l4h9x0d66vj46jgp909iw79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; @@ -95002,6 +95185,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "explicit-exception_0_2" = callPackage + ({ mkDerivation, base, deepseq, semigroups, transformers }: + mkDerivation { + pname = "explicit-exception"; + version = "0.2"; + sha256 = "0n2cgliy0ls9740crzpk19wl3cbk5zq90x7qmhhw8idbip7xidni"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq semigroups transformers ]; + description = "Exceptions which are explicit in the type signature"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "explicit-iomodes" = callPackage ({ mkDerivation, base, base-unicode-symbols, tagged }: mkDerivation { @@ -95520,6 +95717,32 @@ self: { broken = true; }) {}; + "extism" = callPackage + ({ mkDerivation, base, bytestring, extism, extism-manifest, HUnit + , json + }: + mkDerivation { + pname = "extism"; + version = "0.1.0"; + sha256 = "1gg359qwvqk8qqwd9s6hlrka0x3ajf1v3g750iyw1vyy74dakx8x"; + libraryHaskellDepends = [ base bytestring extism-manifest json ]; + librarySystemDepends = [ extism ]; + testHaskellDepends = [ base bytestring HUnit ]; + description = "Extism bindings"; + license = lib.licenses.bsd3; + }) {extism = null;}; + + "extism-manifest" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, json }: + mkDerivation { + pname = "extism-manifest"; + version = "0.1.0"; + sha256 = "0dr3pxkf11cija6k75rv5mzmracw1yyis82sj7x2blkjg190hk6s"; + libraryHaskellDepends = [ base base64-bytestring bytestring json ]; + description = "Extism manifest bindings"; + license = lib.licenses.bsd3; + }) {}; + "extra" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix @@ -97023,6 +97246,18 @@ self: { mainProgram = "fcd"; }) {}; + "fcf-base" = callPackage + ({ mkDerivation, base, fcf-family }: + mkDerivation { + pname = "fcf-base"; + version = "0.1.0.0"; + sha256 = "19jrcpj496bpchv8fw30vd5b5w3sj1qkzmh5jlahyvz5wsppzwsq"; + libraryHaskellDepends = [ base fcf-family ]; + testHaskellDepends = [ base fcf-family ]; + description = "Family-of-families instances for base"; + license = lib.licenses.mit; + }) {}; + "fcf-composite" = callPackage ({ mkDerivation, base, composite-base, fcf-containers , first-class-families, tasty, tasty-hunit, vinyl @@ -97051,8 +97286,8 @@ self: { }: mkDerivation { pname = "fcf-containers"; - version = "0.7.1"; - sha256 = "1234vz8ha4wzzbxnw3za5kdhisd37n8v3sd01rdcmnmnhb7fv3qs"; + version = "0.7.2"; + sha256 = "0lw7zm5k4mkvzxxmhp2lbanlkgb3n6gp583g34r53rz576bhhhj9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; @@ -97064,6 +97299,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "fcf-family" = callPackage + ({ mkDerivation, base, containers, first-class-families + , template-haskell + }: + mkDerivation { + pname = "fcf-family"; + version = "0.2.0.0"; + sha256 = "17v811dfdvgdvhwri34df3sf3n82crd41pi28j8gbdqs4zg0lgln"; + libraryHaskellDepends = [ + base containers first-class-families template-haskell + ]; + testHaskellDepends = [ base first-class-families ]; + description = "Family of families: featherweight defunctionalization"; + license = lib.licenses.mit; + }) {}; + "fcf-graphs" = callPackage ({ mkDerivation, base, doctest, fcf-containers , first-class-families, Glob @@ -98202,14 +98453,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fgl_5_8_0_0" = callPackage + "fgl_5_8_1_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; - version = "5.8.0.0"; - sha256 = "02cdigf5m3520vh30lld0j5d4al7nmsa4m9v9bjw1fprfaac03nn"; + version = "5.8.1.0"; + sha256 = "0s53kxz6a79jclvxlzpmzs2x98qx48xvgwswh6cal2f4rg2wp8av"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -98475,6 +98726,8 @@ self: { pname = "file-io"; version = "0.1.0.1"; sha256 = "1kxr2cdv3zmml7v3gmk2zrd2kwvph46fzv3r2ia5brq5qvm2s544"; + revision = "1"; + editedCabalFile = "0kfisk0vrjviw194rg2ildzr0qlg45wk4cwa4s3qpl3hp4zag1lj"; libraryHaskellDepends = [ base bytestring filepath unix ]; description = "Basic file IO operations via 'OsPath'"; license = lib.licenses.bsd3; @@ -101467,10 +101720,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.13"; - sha256 = "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw"; - revision = "1"; - editedCabalFile = "0wkjdxjyjyq9kv9hwa5k8k8fp6i0b77xf9b2prrzyq0cwlps016i"; + version = "1.4.14"; + sha256 = "0ihfari2d8czfxfxv5svczpq1cvi3qi55mxphjjqlnabxa76y1cc"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -102766,6 +103017,8 @@ self: { pname = "fpe"; version = "0.1.1"; sha256 = "1rzd1g6zk98l5bz5d7pr66i10gd2kx6vrv9py06wcnz3b5svkx2l"; + revision = "1"; + editedCabalFile = "0qf0qsh3ig76s8inimcwr5yksyzpz3szn80qi599zhv66nflqilf"; libraryHaskellDepends = [ base bytestring integer-logarithms vector ]; @@ -107121,8 +107374,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.0.1"; - sha256 = "0n6szggdafnn8s3s4n737q8s8d1jfnz9cb4v25rsz508q56mghzl"; + version = "0.2.1.1"; + sha256 = "0jcqknrlpcyl825y9r612mh8d7dcs68sxjm1j600nbdl4ksw8qmb"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -108050,8 +108303,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.8"; - sha256 = "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb"; + version = "0.7.9"; + sha256 = "0dkzma11nd7hc1xsriiq50nxr8h50sh1y562yjsqaganxh2sprsx"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; @@ -109018,8 +109271,8 @@ self: { }: mkDerivation { pname = "geomancy"; - version = "0.2.4.1"; - sha256 = "0rnp4ma5gxxd2lf9n36ifbw2jr0nl6jfxqzvvp86mlvs3a7jpsxd"; + version = "0.2.4.2"; + sha256 = "0ms2gfhcrxcfg10s3xpaawz4kqs4dy00p5mgc7s6pjiq5qgj4mn4"; libraryHaskellDepends = [ base containers deepseq mono-traversable simple-affine-space ]; @@ -109128,6 +109381,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "getopt-generics_0_13_1_0" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, filepath + , generics-sop, hspec, QuickCheck, safe, silently, tagged + }: + mkDerivation { + pname = "getopt-generics"; + version = "0.13.1.0"; + sha256 = "00xswyi9y49qab2fpkdx7isx40kfa93p3gfransivzgg9m3si37d"; + libraryHaskellDepends = [ + base base-compat base-orphans generics-sop tagged + ]; + testHaskellDepends = [ + base base-compat base-orphans filepath generics-sop hspec + QuickCheck safe silently tagged + ]; + description = "Create command line interfaces with ease"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -110818,8 +111091,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.8.3.0"; - sha256 = "0qrb8zz93rb25p8f4dhh2bxx3vb0yc92rx59xbh23ixijiszhas8"; + version = "0.9.0.0"; + sha256 = "1z14z12lhdc1bfa3qnq2srx0cm14cbkg7af94cdfqpqmbxjgw5h3"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -111665,24 +111938,24 @@ self: { "ghcup" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base - , base16-bytestring, binary, bytestring, bz2, Cabal, cabal-plan - , case-insensitive, casing, containers, cryptohash-sha256, deepseq - , directory, disk-free-space, exceptions, filepath - , generic-arbitrary, haskus-utils-types, haskus-utils-variant - , hspec, hspec-discover, hspec-golden-aeson, libarchive - , lzma-static, megaparsec, mtl, optics, optparse-applicative - , os-release, pretty, pretty-terminal, process, QuickCheck - , quickcheck-arbitrary-adt, regex-posix, resourcet, retry, safe - , safe-exceptions, split, streamly, strict-base, tagsoup - , template-haskell, temporary, terminal-size, text, time - , transformers, unix, unix-bytestring, unliftio-core + , base16-bytestring, binary, bytestring, bz2, Cabal + , cabal-install-parsers, cabal-plan, case-insensitive, casing + , containers, cryptohash-sha256, deepseq, directory + , disk-free-space, exceptions, filepath, generic-arbitrary + , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover + , hspec-golden-aeson, libarchive, lzma-static, megaparsec, mtl + , optics, optparse-applicative, os-release, pretty, pretty-terminal + , process, QuickCheck, quickcheck-arbitrary-adt, regex-posix + , resourcet, retry, safe, safe-exceptions, split, streamly + , strict-base, tagsoup, template-haskell, temporary, terminal-size + , text, time, transformers, unix, unix-bytestring, unliftio-core , unordered-containers, uri-bytestring, utf8-string, vector , versions, word8, yaml-streamly, zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.18.0"; - sha256 = "09mg0pg520vn4mcc0s59wzssnnj5ps5z50kri8z53bjvn4yfdwvv"; + version = "0.1.19.0"; + sha256 = "00g91zavfd58y17q723izch9j0x3fhx7a14ng061am5h41i76mlq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111697,17 +111970,17 @@ self: { word8 yaml-streamly zlib ]; executableHaskellDepends = [ - aeson aeson-pretty async base bytestring cabal-plan containers - deepseq directory filepath haskus-utils-types haskus-utils-variant - libarchive megaparsec mtl optparse-applicative pretty - pretty-terminal process resourcet safe safe-exceptions tagsoup - template-haskell temporary text unix unordered-containers + aeson aeson-pretty async base bytestring cabal-install-parsers + cabal-plan containers deepseq directory filepath haskus-utils-types + haskus-utils-variant libarchive megaparsec mtl optparse-applicative + pretty pretty-terminal process resourcet safe safe-exceptions + tagsoup template-haskell temporary text unix unordered-containers uri-bytestring utf8-string vector versions yaml-streamly ]; testHaskellDepends = [ base bytestring containers directory filepath generic-arbitrary hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt - streamly text uri-bytestring versions + streamly text unix uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; description = "ghc toolchain installer"; @@ -113415,8 +113688,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20221212"; - sha256 = "0afnl2w29w4j0229rsla93dzkmhcjlp8dv76sr861n186ywv8rzg"; + version = "10.20230126"; + sha256 = "06b5gnj0dxiz7lkc75xmmzi50svwbqhs5az01lfmw27r3ibcicpm"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -120739,6 +121012,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "grisette" = callPackage + ({ mkDerivation, array, base, bytestring, call-stack, deepseq + , doctest, generic-deriving, Glob, hashable, hashtables, intern + , loch-th, mtl, once, sbv, tasty, tasty-hunit, tasty-quickcheck + , tasty-test-reporter, template-haskell, th-compat, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "grisette"; + version = "0.1.0.0"; + sha256 = "1dl972402pyk6i636w1547hdpyhhaikfzfpvqp19jrwgm5fdnifi"; + libraryHaskellDepends = [ + array base bytestring call-stack deepseq generic-deriving hashable + hashtables intern loch-th mtl once sbv template-haskell th-compat + transformers unordered-containers vector + ]; + testHaskellDepends = [ + array base bytestring call-stack deepseq doctest generic-deriving + Glob hashable hashtables intern loch-th mtl once sbv tasty + tasty-hunit tasty-quickcheck tasty-test-reporter template-haskell + th-compat transformers unordered-containers vector + ]; + description = "Symbolic evaluation as a library"; + license = lib.licenses.bsd3; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -120990,8 +121289,8 @@ self: { }: mkDerivation { pname = "group-by-date"; - version = "0.1.0.4"; - sha256 = "1k5bnk1kz25zgky5rqb214gq5adkz6qi6p16gk0hvy54iyjdj9sa"; + version = "0.1.0.5"; + sha256 = "1c19x8qqrq8fiaxdz917nim8z8dcsi4bcyf88ci39d3xq1iq9iis"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122206,8 +122505,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.10"; - sha256 = "0qpr04gv0zjnpigmxzls5jsx3d98cl9127z8ljy743m5j0ff5z6f"; + version = "4.5.0.12"; + sha256 = "1mm9g3vadp0fspfd7n3y7c7n1ryhwklqv31hrjm637h92a2zzn6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -123333,6 +123632,39 @@ self: { mainProgram = "hackage-cli"; }) {}; + "hackage-cli_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, filepath, http-io-streams, io-streams + , microlens, microlens-mtl, microlens-th, mtl, netrc + , optparse-applicative, pretty, process-extras, semigroups + , stringsearch, tagsoup, tar, tasty, tasty-golden, text, time + , unordered-containers, zlib + }: + mkDerivation { + pname = "hackage-cli"; + version = "0.1.0.0"; + sha256 = "0wl2gpbcpdfmmmi99dkxy68gi3mn1aj8f2xrm5c8w1bs4sdxdzdq"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers mtl pretty + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers deepseq directory filepath + http-io-streams io-streams microlens microlens-mtl microlens-th mtl + netrc optparse-applicative process-extras semigroups stringsearch + tagsoup tar text time unordered-containers zlib + ]; + testHaskellDepends = [ + base bytestring Cabal filepath tasty tasty-golden + ]; + doHaddock = false; + description = "CLI tool for Hackage"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "hackage-cli"; + }) {}; + "hackage-db" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string @@ -126330,6 +126662,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "happstack-hsp_7_3_7_7" = callPackage + ({ mkDerivation, base, bytestring, happstack-server, harp, hsp + , hsx2hs, mtl, syb, text, utf8-string + }: + mkDerivation { + pname = "happstack-hsp"; + version = "7.3.7.7"; + sha256 = "1bgjy77sbrb7nmbvb98hw5w7lb6ffvbb0nb62ylg2pf9nl862khv"; + libraryHaskellDepends = [ + base bytestring happstack-server harp hsp hsx2hs mtl syb text + utf8-string + ]; + description = "Support for using HSP templates in Happstack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "happstack-hstringtemplate" = callPackage ({ mkDerivation, base, bytestring, happstack-server, hslogger , HStringTemplate, mtl @@ -126383,6 +126732,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "happstack-jmacro_7_0_12_5" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cereal + , digest, happstack-server, jmacro, text, utf8-string + , wl-pprint-text + }: + mkDerivation { + pname = "happstack-jmacro"; + version = "7.0.12.5"; + sha256 = "1vk0674qalyhzwndpd7az4byshhxy38dh53pgma7awj2bx1n170c"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cereal digest happstack-server + jmacro text utf8-string wl-pprint-text + ]; + description = "Support for using JMacro with Happstack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "happstack-lite" = callPackage ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { @@ -126457,7 +126824,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "happstack-server_7_8_0_1" = callPackage + "happstack-server_7_8_0_2" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network @@ -126468,8 +126835,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.8.0.1"; - sha256 = "0bxgnsd0qawbd0yllrshdxm89g1vm4znrn5jwhbs86pmh205w3xy"; + version = "7.8.0.2"; + sha256 = "15cp6w5xh5rv2fg9rv1fd0y938280gbcpziv7kmq78zywar56mis"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -126862,8 +127229,8 @@ self: { }: mkDerivation { pname = "harfbuzz-pure"; - version = "1.0.0.1"; - sha256 = "1icdk19js4kqpw7krk0jl5yqilc52w7wchkylqr5p2zlrm92wp6k"; + version = "1.0.1.0"; + sha256 = "0zmdv6d8sbd3s8wgljyml65pmvb5iz29zh27g7888k0cz9cza82w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126992,6 +127359,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "harp_0_4_3_6" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "harp"; + version = "0.4.3.6"; + sha256 = "1949mz3sm8sw3wfxcakx3anriwrkng2n5ixwqdabbw9jhib8gm0f"; + libraryHaskellDepends = [ base ]; + description = "HaRP allows pattern-matching with regular expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -127085,6 +127464,8 @@ self: { pname = "hasbolt"; version = "0.1.6.2"; sha256 = "1y7vjng3qjy5jaj3c90b5a08xrn49c4bb2wa9s612ny5qc98dl9g"; + revision = "1"; + editedCabalFile = "029sw5fqcqpzsx2ahkngfimyd9kyjn7abg0cvz4pb8y96ypl3cs7"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default deepseq deepseq-generics mtl network text @@ -127110,8 +127491,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.9"; - sha256 = "0v3vl1q25g2qac2f3l4bk9bnzqx39d11wvbqclxrif26hv24pkdy"; + version = "0.0.2.0"; + sha256 = "0cxkps6zqnp97r118ffhnvh871dl4mklqcpgxhbfwfgsjar4w2y2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127333,6 +127714,44 @@ self: { broken = true; }) {}; + "hash-addressed" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , cryptohash-sha256, directory, filepath, quaalude, resourcet + , temporary, transformers + }: + mkDerivation { + pname = "hash-addressed"; + version = "0.0.1.0"; + sha256 = "1a77k38blvlzb5q5qg2wclfm0g4m7rd1fbpyqb5y64p7fjcc3gy6"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptohash-sha256 directory + filepath quaalude resourcet temporary transformers + ]; + description = "Hash-addressed file storage"; + license = lib.licenses.asl20; + }) {}; + + "hash-addressed-cli" = callPackage + ({ mkDerivation, base, bytestring, cryptohash-sha256, directory + , filepath, hash-addressed, ini, optparse-applicative, quaalude + , resourcet, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hash-addressed-cli"; + version = "1.0.0.0"; + sha256 = "0b4is6bdqvq07ws5f0g55ql8jjaa1if3kxvlrxmibb73a0ak0r42"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cryptohash-sha256 directory filepath hash-addressed + ini optparse-applicative quaalude resourcet text transformers + unordered-containers + ]; + description = "Hash-addressed file storage"; + license = lib.licenses.asl20; + mainProgram = "hash-addressed"; + }) {}; + "hash-store" = callPackage ({ mkDerivation, base, base16-bytestring, blake2, bytestring , directory, filepath @@ -132258,6 +132677,21 @@ self: { broken = true; }) {}; + "hasql-listen-notify" = callPackage + ({ mkDerivation, base, bytestring, hasql, mtl, postgresql-libpq + , text + }: + mkDerivation { + pname = "hasql-listen-notify"; + version = "0.1.0"; + sha256 = "0bq4s4x76spjziqgda0shdzfwdhgz1fhsbdg63r3l0m01ixg1a50"; + libraryHaskellDepends = [ + base bytestring hasql mtl postgresql-libpq text + ]; + description = "LISTEN/NOTIFY with hasql"; + license = lib.licenses.bsd3; + }) {}; + "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite , directory, hasql, hasql-transaction, hspec, memory, text, time @@ -138288,6 +138722,8 @@ self: { pname = "hie-compat"; version = "0.3.1.0"; sha256 = "0ixk1xf8958ajxb11gxx64sf0w6glb9n171jmdqhzdfffd1abs71"; + revision = "1"; + editedCabalFile = "1dr9cqqmxq6dwsdbmm7q4a26ghsnq66yl49wy54dpyln5xzz4234"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -140467,10 +140903,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.6.4"; - sha256 = "1719sa7zxaa5amrqhkckn9ip5wzc2qbi8gn4f3l98a7sh77f9fym"; - revision = "1"; - editedCabalFile = "050x8yfvk3vqlipirfwn9h0ckghmsp6f8l6skg70d330i868zahm"; + version = "1.6.5"; + sha256 = "0znrypimfcr4immy3x5651cfkny1n8yi8isfh72mv2px70994pm1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142341,8 +142775,8 @@ self: { }: mkDerivation { pname = "hmm-lapack"; - version = "0.5"; - sha256 = "1f66q9xq6da4xyl564jxixn60hs4qh4ksgdfigj4xsi44zij9gyx"; + version = "0.5.0.1"; + sha256 = "0im754fgqzi28snwf9bxkj4i1g69c0q8knzjvpmbrs79d5rncpxk"; libraryHaskellDepends = [ base comfort-array comfort-array-shape containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi @@ -144090,10 +144524,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { pname = "hopenssl"; - version = "2.2.4"; - sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x"; - revision = "1"; - editedCabalFile = "14bs0wjrqnnn1v8c4yznfzggvmgypm2lssgl0cr498kmp54if0lf"; + version = "2.2.5"; + sha256 = "1gq3q4fl8vbdg1ha69q18qj1zx13nhkrapz0chs4s0jb29hrh3vm"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit ]; @@ -144331,8 +144763,8 @@ self: { }: mkDerivation { pname = "horizon-gen-nix"; - version = "0.4.0"; - sha256 = "0s0macrn45wh1y7nflw9y73wxsynvym7n12f9n0yhxi8w3j7wzn2"; + version = "0.5"; + sha256 = "058m8mbrlq7jlgx1vxl1mdwb0ly7n9wwkb1jijgf5l4xil1vjmsv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144352,8 +144784,8 @@ self: { }: mkDerivation { pname = "horizon-spec"; - version = "0.4.1"; - sha256 = "1xr9x626fzw8bhrkzgv3r00cjsawav76jb68yznj1jlv91cvmxac"; + version = "0.5"; + sha256 = "0ming3s98g75j20bg3dy444711k1xc9c6246wlbq4y19zx5r8lxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144847,6 +145279,46 @@ self: { mainProgram = "hpack"; }) {}; + "hpack_0_35_2" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.35.2"; + sha256 = "1v4h5dkbfwx8wlmbaq76av22ald9iyk80k8k7pz808nw30yh3dq3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -145445,7 +145917,7 @@ self: { broken = true; }) {inherit (pkgs) postgresql;}; - "hpqtypes_1_10_0_2" = callPackage + "hpqtypes_1_11_0_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, HUnit, libpq, lifted-base, monad-control, mtl , QuickCheck, random, resource-pool, scientific, semigroups @@ -145455,8 +145927,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.10.0.2"; - sha256 = "0rrsd16cxh8p0ssayxla99svapkbbl2sn5n9hi8vcf9hazfh8nlw"; + version = "1.11.0.0"; + sha256 = "14d01gi2bqqf5hcgaysc5m8c2s9h8bfsbg76vdvzksjz08nj5klr"; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base monad-control mtl resource-pool semigroups text text-show time @@ -145465,7 +145937,7 @@ self: { libraryPkgconfigDepends = [ libpq ]; testHaskellDepends = [ aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework + mtl QuickCheck random resource-pool scientific test-framework test-framework-hunit text text-show time transformers-base unordered-containers uuid-types vector ]; @@ -145501,8 +145973,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.16.2.0"; - sha256 = "0vb96dm8w089j8zc0i5k8abr7dx5nbrmlpjwhpi2vshhmmihkja3"; + version = "1.16.3.0"; + sha256 = "157971qzbxbnwg81879x9rm76slac07s72gx4l1czs6ll53pkl3d"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra hpqtypes log-base mtl text text-show @@ -145586,8 +146058,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.1.1"; - sha256 = "0r8sbi4g49r95pxmm81q291nlixj4wi4m6qrq5wkjp8yrrm2s9gb"; + version = "0.1.2"; + sha256 = "1ggi44lmfs8nny93i60b4s26ygi8qk5dk2ip5sm9mm6ysz907f73"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149290,8 +149762,8 @@ self: { ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; - version = "1.1.0"; - sha256 = "1437ff2vqhaymiabp31qhr5ixb99h93cp6qz6z82c4d9c5wvl0q6"; + version = "1.1.0.1"; + sha256 = "1gjccs0fwbxavzkm7j8nm2sw2h8rs7d5zyv1nxwkavyd73wqsqlh"; libraryHaskellDepends = [ base bytestring hslua-core ]; testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; @@ -149868,14 +150340,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_8" = callPackage + "hspec_2_10_9" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.8"; - sha256 = "13g46fk7hcnk3058pb2wwq257pi8628qaa9md9sfw5rlw878z25r"; + version = "2.10.9"; + sha256 = "0vbi07wpf7nvg2bxlp91gi7c7hkq29q8va83wawzlb0mzaxbsccl"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -149998,7 +150470,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_8" = callPackage + "hspec-core_2_10_9" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -150007,8 +150479,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.8"; - sha256 = "0bka7r8b2qh82sxnz5mcfw2swl4k2v3q97yb0n1rhs1g444lfcqn"; + version = "2.10.9"; + sha256 = "1aby2axr9pqbb75va2n1szkl6jw402kin39xv2m8i6f14fy2hzpz"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -150089,14 +150561,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_8" = callPackage + "hspec-discover_2_10_9" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.8"; - sha256 = "032s5mfr9sw2bgdi2l6fy8jdwm79nr896dw1ha16m94m8596vmph"; + version = "2.10.9"; + sha256 = "16ahgiwgj1nkp0bhyvpvz5avaimigja0gz78576066rsgf6kcygj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -151761,6 +152233,30 @@ self: { mainProgram = "hsx2hs"; }) {}; + "hsx2hs_0_14_1_11" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.1.11"; + sha256 = "1jpf3m7hcpl38p0a9wqpbaqffdxbqszyqisipgjwn0qmbh56jvas"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + executableHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsx2hs"; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -153325,18 +153821,19 @@ self: { "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception - , HTTP, lazyio, network, network-uri, parsec, semigroups - , transformers, utility-ht + , HTTP, lazyio, network, network-uri, network-uri-flag, parsec + , semigroups, transformers, utility-ht }: mkDerivation { pname = "http-monad"; - version = "0.1.1.3"; - sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1"; + version = "0.1.1.4"; + sha256 = "00bzm1s896wdngz8clmjlfbdp4pw3xjk4sg1d2zznf4npssckm0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers explicit-exception HTTP lazyio network - network-uri parsec semigroups transformers utility-ht + network-uri network-uri-flag parsec semigroups transformers + utility-ht ]; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = lib.licenses.bsd3; @@ -156997,6 +157494,8 @@ self: { pname = "hyper"; version = "0.2.1.1"; sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; + revision = "2"; + editedCabalFile = "13r3dafkn9bn8jw1cvw18cc6v6drgj91bmfkgdpfnr5sk3ad6k6n"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; @@ -157304,14 +157803,13 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.27"; - sha256 = "1ww4lgf280sjj9bhj8s6pxadqwk91jkx6lngb2cqcf81gr38drhm"; - revision = "2"; - editedCabalFile = "168gf9ib669ji8lyd1a57xqkqmxyzi3m4r9pnmdxyfnqpnfqdv6r"; + version = "0.2.4.2"; + sha256 = "0k0pwvcsdmjr8vynz61hja35k1bpny6d3j2wppqf9jwgl031nh13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text + base binary bytestring directory filepath hscolour pretty-show + protolude text ]; executableHaskellDepends = [ base bytestring hscolour pretty-show protolude text @@ -158219,8 +158717,8 @@ self: { ({ mkDerivation, base, ghc, ghc-tcplugin-api }: mkDerivation { pname = "if-instance"; - version = "0.3.0.0"; - sha256 = "0d64h9ai0zmyzb9nnxfmr66chxbgdyy6vw2xhqybh4x7ga3ys4r9"; + version = "0.3.1.0"; + sha256 = "112f1nz684wdsmbg5srizb4j9lizrfwgdzm1fpyb5vsbj3ib0fh9"; libraryHaskellDepends = [ base ghc ghc-tcplugin-api ]; testHaskellDepends = [ base ghc ]; doHaddock = false; @@ -160987,14 +161485,14 @@ self: { license = lib.licenses.mit; }) {}; - "inspection-testing_0_5" = callPackage + "inspection-testing_0_5_0_1" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: mkDerivation { pname = "inspection-testing"; - version = "0.5"; - sha256 = "1iawvnk99c7w44qlw3sl98rrwa1krwjbzy0zsyi80ybg00abfwdh"; + version = "0.5.0.1"; + sha256 = "0zq7ickp6633y262nafi507zp0pmw8v6854sr1cncd3qqmrhnx99"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -161220,22 +161718,23 @@ self: { }) {}; "instrument" = callPackage - ({ mkDerivation, array, async, base, bytestring, cereal - , cereal-text, conduit, containers, csv-conduit, data-default - , errors, exceptions, hedis, hostname, HUnit, mtl, network, path - , path-io, QuickCheck, quickcheck-instances, retry, safe-exceptions - , safecopy, safecopy-hunit, statistics, stm, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unix, vector, zlib + ({ mkDerivation, array, async, atomic-primops, base, bytestring + , cereal, cereal-text, conduit, containers, csv-conduit + , data-default, errors, exceptions, hedis, hostname, HUnit, mtl + , network, path, path-io, QuickCheck, quickcheck-instances, retry + , safe-exceptions, safecopy, safecopy-hunit, statistics, stm, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers, unix + , vector, zlib }: mkDerivation { pname = "instrument"; - version = "0.6.0.0"; - sha256 = "12wjxd8yi4dg8ca3q96rc2pvdx83hwx5a9zx1i7picl4bm5gq7a4"; + version = "0.6.1.0"; + sha256 = "0lp759kgssp1mgz5b3na9306987fxrifahissql7w2dajg9ma0nr"; libraryHaskellDepends = [ - array base bytestring cereal cereal-text conduit containers - csv-conduit data-default errors exceptions hedis hostname mtl - network retry safe-exceptions safecopy statistics text time - transformers unix vector zlib + array atomic-primops base bytestring cereal cereal-text conduit + containers csv-conduit data-default errors exceptions hedis + hostname mtl network retry safe-exceptions safecopy statistics text + time transformers unix vector zlib ]; testHaskellDepends = [ async base bytestring cereal containers data-default hedis HUnit @@ -161260,6 +161759,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "instrument-cloudwatch" = callPackage + ({ mkDerivation, amazonka, amazonka-cloudwatch, async, base + , containers, instrument, lens, QuickCheck, retry, safe-exceptions + , semigroups, stm, stm-chans, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers + }: + mkDerivation { + pname = "instrument-cloudwatch"; + version = "0.2.1.0"; + sha256 = "1iigjf9c1n7by13q13hzxn8ciwvadxszbvsj782pf2arm3mhhvyw"; + libraryHaskellDepends = [ + amazonka amazonka-cloudwatch async base containers instrument lens + retry safe-exceptions semigroups stm stm-chans text time + transformers + ]; + testHaskellDepends = [ + base QuickCheck semigroups stm stm-chans tasty tasty-hunit + tasty-quickcheck + ]; + description = "Adds a worker for the instrument package that exports to Amazon CloudWatch"; + license = lib.licenses.bsd3; + }) {}; + "int-cast" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -161377,8 +161899,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3.1"; sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; - revision = "3"; - editedCabalFile = "0z81yksgx20d0rva41blsjcp3jsp1qy9sy385fpig0l074fzv6ym"; + revision = "4"; + editedCabalFile = "1jml3fygxcbh9f6nl006mc2gmixlwkzpnnsfxgdmk6pi786b8vrk"; libraryHaskellDepends = [ array base ghc-bignum ghc-prim ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -161431,16 +161953,17 @@ self: { }) {}; "integer-types" = callPackage - ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec }: + ({ mkDerivation, base, deepseq, exceptions, hedgehog, hspec + , hspec-hedgehog, quaalude + }: mkDerivation { pname = "integer-types"; - version = "0.0.0.0"; - sha256 = "1hny749vzc9bp0dqhypfanxnjjp6s87nmwm17xzh75742ajcf86z"; - revision = "1"; - editedCabalFile = "0c5xfvy8cspzbakng4rnnhc45n24hjrldf14i8ipp2l94n8mvn8y"; - libraryHaskellDepends = [ base deepseq exceptions hedgehog ]; - testHaskellDepends = [ base deepseq exceptions hedgehog hspec ]; - doHaddock = false; + version = "0.0.0.1"; + sha256 = "0s12gsa8k9b2pgd0705ji6qj4whl1vv0wpxjn129ppdb9dmji6gg"; + libraryHaskellDepends = [ base deepseq quaalude ]; + testHaskellDepends = [ + base deepseq exceptions hedgehog hspec hspec-hedgehog quaalude + ]; description = "Integer, Natural, and Positive"; license = lib.licenses.asl20; }) {}; @@ -161670,8 +162193,8 @@ self: { }: mkDerivation { pname = "internetmarke"; - version = "0.0.3"; - sha256 = "1gn6vvrnhck9f9hzs8igdg20gvrvjnba00bj191paw02kpzbgx7z"; + version = "0.0.4"; + sha256 = "19wf0mx67kz2ghkw47b0xjxq5p81hhkc6i8mi5qm565r5nq5ff5n"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -164702,8 +165225,10 @@ self: { }: mkDerivation { pname = "jack"; - version = "0.7.2.1"; - sha256 = "03cf6yb3nbcwy0429b0r2dxj6dvk295y4w73lyc6fpjh001yp7c9"; + version = "0.7.2.2"; + sha256 = "0f47cyhsjw57k4cgbmwvawn02v9dvx4x1pn7k2z612srf5l1igb5"; + revision = "1"; + editedCabalFile = "08y9jiyqxxpv6kjivlk2qaiidj3hayyfi7baqzsfn28bskxr7d9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167364,8 +167889,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit, hspec, jsonl }: mkDerivation { pname = "jsonl-conduit"; - version = "0.1.2"; - sha256 = "03ab1ysyqg0vnlx1pxw5gj1d2gq16zsz9pdrscdjp9491fiwxg2b"; + version = "0.1.3"; + sha256 = "04xrkkyazj5ss8857ckngxd366a2lbyck1y6wfwisw2xnj3yxdqj"; libraryHaskellDepends = [ aeson base bytestring conduit jsonl ]; testHaskellDepends = [ aeson base bytestring conduit hspec ]; description = "Conduit interface to JSONL-encoded data"; @@ -170133,6 +170658,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ki_1_0_0_2" = callPackage + ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: + mkDerivation { + pname = "ki"; + version = "1.0.0.2"; + sha256 = "1sxzgh8g9fahqwx7ky4f1g03fhy791hilfansx8kf39gfk646dcw"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base stm tasty tasty-hunit ]; + description = "A lightweight structured concurrency library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ki-effectful" = callPackage ({ mkDerivation, base, effectful-core, ki, stm, tasty, tasty-hunit }: @@ -170260,6 +170798,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-apply_0_4_0_0" = callPackage + ({ mkDerivation, base, first-class-families }: + mkDerivation { + pname = "kind-apply"; + version = "0.4.0.0"; + sha256 = "0bw41crzif6rdsfpskb8yanhzkcwn7hqwjawzifgi6jz3mvqqaha"; + libraryHaskellDepends = [ base first-class-families ]; + description = "Utilities to work with lists of types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kind-generics" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { @@ -170271,6 +170821,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics_0_5_0_0" = callPackage + ({ mkDerivation, base, first-class-families, kind-apply }: + mkDerivation { + pname = "kind-generics"; + version = "0.5.0.0"; + sha256 = "0l26fx2gyh8lav28zdwx882zmg4qqrj51d8ra9zs5jidirwhi415"; + libraryHaskellDepends = [ base first-class-families kind-apply ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "kind-generics-deriving" = callPackage + ({ mkDerivation, aeson, base, first-class-families, kind-apply + , kind-generics + }: + mkDerivation { + pname = "kind-generics-deriving"; + version = "0.3.0.0"; + sha256 = "03702p4kviy301vagzwybjak3kvfcxrsc22vq89ixlws7qpqakp1"; + libraryHaskellDepends = [ + aeson base first-class-families kind-apply kind-generics + ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = lib.licenses.bsd3; + }) {}; + "kind-generics-th" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction @@ -170289,6 +170866,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_3_0" = callPackage + ({ mkDerivation, base, fcf-family, ghc-prim, kind-generics + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.3.0"; + sha256 = "12rqqsvfwllq0k5dmgvab61j5n92xx6z6xlcmi4sm5zfxk2pi3b5"; + libraryHaskellDepends = [ + base fcf-family ghc-prim kind-generics template-haskell + th-abstraction + ]; + testHaskellDepends = [ base kind-generics template-haskell ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -172574,25 +173169,6 @@ self: { }) {}; "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, deepseq - , directory, filepath, happy, mtl, pretty, process - }: - mkDerivation { - pname = "language-c"; - version = "0.9.1"; - sha256 = "0g5djsnzzmi1d1ndcmmrmwz4xnv1m3w009d6kx9jz9jxxdk9adcl"; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath mtl - pretty process - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - description = "Analysis and generation of C code"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; - }) {}; - - "language-c_0_9_2" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq , directory, filepath, happy, mtl, pretty, process }: @@ -172608,7 +173184,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; @@ -173888,8 +174463,8 @@ self: { }: mkDerivation { pname = "lapack"; - version = "0.5"; - sha256 = "0g4nwbkb5nxfmh7aan7r94gchr3wmr45g18mzxzcxqxqpllj3vs1"; + version = "0.5.0.2"; + sha256 = "18gb8p2mx9hwhcqnqghvjhrdbxr7sziyr936vn2bnh33w9srnghi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173962,10 +174537,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.3"; - sha256 = "0qk5a43w8xn8pp9bhmjmjyvriiin2dyf4nvk13w858hsxyx6xqkx"; - revision = "1"; - editedCabalFile = "15w2ml6iqwk7776dl9m7lg0jp7akw9f8s95flrsjfxr479qig48i"; + version = "0.1.3.1"; + sha256 = "1mf41wcbxkgiv71c3jjwhsdg9d7qpa88qsifpa5vgplpx2v1p6ya"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -173984,8 +174557,8 @@ self: { }: mkDerivation { pname = "lapack-hmatrix"; - version = "0.0.0.1"; - sha256 = "0jd3sy03cxdfxakxaj1kxpc3jn0z8sd74lpxxg9s9jdvaxxxyflj"; + version = "0.0.0.2"; + sha256 = "16w7rwf1d7m3ml0zmdk2gf2ri0p9dljp67d8l6afwblzwqvlrkbd"; libraryHaskellDepends = [ base comfort-array hmatrix lapack netlib-ffi transformers utility-ht vector @@ -174395,8 +174968,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.4"; - sha256 = "0ah3sxghmbv3gzzqs9xak5xi5fpzkvhgf0v637sq2w1k06776k56"; + version = "3.1.0"; + sha256 = "17jq8fccppdivd2a662aax1hf12rgldjhk2d89m285k6pdcfyyrh"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -175039,8 +175612,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "ldtk-types"; - version = "0.2.0.0"; - sha256 = "0dyjzcrd5p3hg54j0qnszxdpfb7wn6gykaq8nc6il284nf9rqbai"; + version = "1.2.3"; + sha256 = "1xva58a0dsplw03sx2ip4ad88icp9mn5n5wpi81hgy9kj6szh22x"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Datatypes and Aeson instances for parsing LDtk"; @@ -179849,24 +180422,6 @@ self: { }) {}; "list-t" = callPackage - ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph - , monad-control, mtl, mtl-prelude, semigroups, transformers - , transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "1.0.5.3"; - sha256 = "0j3fgfa84f2cw87j80v5sq82s42505v82pwxgjyhbiflaxjd7wxd"; - libraryHaskellDepends = [ - base foldl logict mmorph monad-control mtl semigroups transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - description = "ListT done right"; - license = lib.licenses.mit; - }) {}; - - "list-t_1_0_5_6" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, transformers, transformers-base }: @@ -179881,7 +180436,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "list-t-attoparsec" = callPackage @@ -180785,6 +181339,8 @@ self: { pname = "llvm-pkg-config"; version = "0.0.2"; sha256 = "1p4ww8ylhr4ag1dfz4sffkg2qsyjj4zxccda3nr50k3c26pmmdz1"; + revision = "1"; + editedCabalFile = "0wd3vvcas446skkmp2w3jp7f3d1cbl7b58kikwgrmlqa6ddzyzlk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -181125,23 +181681,6 @@ self: { }) {}; "loc" = callPackage - ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog - }: - mkDerivation { - pname = "loc"; - version = "0.1.4.0"; - sha256 = "1sv3nka1dxvxrvcl9jz8qa06194wvk2vcs894rzb4g052ikxgmnb"; - revision = "1"; - editedCabalFile = "015wiw9q95aqka731nyrc99m4c4h6fal92ka46rd6kcili8k7ysh"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ - base containers hedgehog hspec hspec-hedgehog - ]; - description = "Types representing line and column positions and ranges in text files"; - license = lib.licenses.asl20; - }) {}; - - "loc_0_1_4_1" = callPackage ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog }: mkDerivation { @@ -181154,7 +181693,6 @@ self: { ]; description = "Line and column positions and ranges in text files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "loc-test" = callPackage @@ -181942,8 +182480,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "logical-constraints"; - version = "0.1.2.0"; - sha256 = "1sj47ampdyh117wl2czbkqks6vbii2n24p374r49zqnpcw9y4862"; + version = "0.1.3.0"; + sha256 = "1jw64bajnz1fizgkw9b01fpk7iyf5w7b8rd1zmhkqxg85npx3kql"; libraryHaskellDepends = [ base ]; description = "Simple logical constraints 'syntax-sugar' writing library"; license = lib.licenses.mit; @@ -184110,8 +184648,8 @@ self: { }: mkDerivation { pname = "lzo"; - version = "0.1.1.4"; - sha256 = "1n6b2y2bmq3kl6h5mjl301r31rmvrcsc3l66jmnj3ilrj4506m1y"; + version = "0.1.1.5"; + sha256 = "1giv7ksmcgilmysdz26nmr37anvgyyddyzazx7cfwhrj6nv949w0"; libraryHaskellDepends = [ base binary bytestring digest digest-sig ]; @@ -186703,19 +187241,17 @@ self: { }) {}; "math-programming" = callPackage - ({ mkDerivation, base, containers, mtl, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , QuickCheck, text, transformers }: mkDerivation { pname = "math-programming"; - version = "0.4.0"; - sha256 = "0c154gvx0h1xincmmx2jcrvaivni36ahglbrwx08v8z3wdp51k0m"; - libraryHaskellDepends = [ base containers mtl text ]; - testHaskellDepends = [ - base containers mtl tasty tasty-discover tasty-hunit - tasty-quickcheck text + version = "0.5.0"; + sha256 = "00wivda5bi4aw3n9xqbxmdasq57l1fw1c2wi6ng99v6fjsidvlw0"; + libraryHaskellDepends = [ + base containers exceptions mtl text transformers ]; - testToolDepends = [ tasty-discover ]; + testHaskellDepends = [ base hspec mtl QuickCheck text ]; description = "A library for formulating and solving math programs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -186723,38 +187259,38 @@ self: { }) {}; "math-programming-glpk" = callPackage - ({ mkDerivation, base, containers, glpk, glpk-headers - , math-programming, math-programming-tests, mtl, tasty - , tasty-discover, tasty-hunit, text + ({ mkDerivation, base, glpk-headers, hspec, hspec-core + , math-programming, math-programming-tests, mtl, text, transformers + , unliftio }: mkDerivation { pname = "math-programming-glpk"; - version = "0.4.1"; - sha256 = "1ikg8a3pspcrk46rr87lnwkhziihzfpjd543bisqs0pl2db1ll5b"; + version = "0.5.0"; + sha256 = "0bkk83l29hra4z3n6k6176ccqjlp9m9cawgwdnyd0c23drdm1bq9"; libraryHaskellDepends = [ - base containers glpk-headers math-programming mtl text + base glpk-headers math-programming mtl text transformers unliftio ]; testHaskellDepends = [ - base containers glpk-headers math-programming - math-programming-tests mtl tasty tasty-discover tasty-hunit text + base hspec hspec-core math-programming math-programming-tests + unliftio ]; - testSystemDepends = [ glpk ]; - testToolDepends = [ tasty-discover ]; description = "A GLPK backend to the math-programming library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) glpk;}; + }) {}; "math-programming-tests" = callPackage - ({ mkDerivation, base, math-programming, tasty, tasty-hunit - , tasty-quickcheck, text + ({ mkDerivation, base, containers, hspec, math-programming + , microlens, microlens-mtl, microlens-th, mtl, QuickCheck, random + , text }: mkDerivation { pname = "math-programming-tests"; - version = "0.4.0"; - sha256 = "01d6yb4zm2jky8jm8jzd1365nhjsa4c50b5a5yx3r7g078lk91pi"; + version = "0.5.0"; + sha256 = "0fa0sh5qdm8qgydrwww7i7dx12ddj816k3x1jd7byprf5gq73m5b"; libraryHaskellDepends = [ - base math-programming tasty tasty-hunit tasty-quickcheck text + base containers hspec math-programming microlens microlens-mtl + microlens-th mtl QuickCheck random text ]; description = "Utility functions for testing implementations of the math-programming library"; license = lib.licenses.bsd3; @@ -187575,8 +188111,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.0.1"; - sha256 = "02wkdjll77biimblsjkyh97c3adfm7g64bbvyz3m5v37fg75231d"; + version = "0.8.1.0"; + sha256 = "15sdqfq9sfjwkbzwi3qsjg8d59nj44qx3sh3sd9zk3hmc11k8wp4"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -189963,29 +190499,6 @@ self: { }) {}; "microstache" = callPackage - ({ mkDerivation, aeson, base, base-orphans, bytestring, containers - , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "microstache"; - version = "1.0.2.2"; - sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh"; - revision = "1"; - editedCabalFile = "0j9nvvyfk4grxhfg7c0nv6fp635kxnrg95zqmi2dgcw0fkw0apgr"; - libraryHaskellDepends = [ - aeson base containers deepseq directory filepath parsec text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base-orphans bytestring containers parsec tasty - tasty-hunit text - ]; - description = "Mustache templates for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "microstache_1_0_2_3" = callPackage ({ mkDerivation, aeson, base, base-orphans, bytestring, containers , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text , transformers, unordered-containers, vector @@ -190004,7 +190517,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microtimer" = callPackage @@ -190070,8 +190582,8 @@ self: { }: mkDerivation { pname = "midi"; - version = "0.2.2.3"; - sha256 = "12vj9h7vdklzn5dglypjsw1bs9rdacdg9fmxhnbd89jv89dyn4km"; + version = "0.2.2.4"; + sha256 = "14dv5ihlk5jqmvd3b0wfk4nzk4phan5gx6fmvq616mrp6dsflx58"; libraryHaskellDepends = [ base binary bytestring event-list explicit-exception monoid-transformer non-negative QuickCheck random semigroups @@ -191752,8 +192264,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn2-array"; - version = "0.3.0.0"; - sha256 = "0fmdql0jrzbr7yl0axk41l5xl476is5xp38p13179nppll44a5d4"; + version = "0.3.1.0"; + sha256 = "0r61cckjl79vinp1vh18gin3vjia8j44m529bzvpn4zd3l4qbx3x"; libraryHaskellDepends = [ base ]; description = "A library that can be used for multiple Ord a => a -> b transformations"; license = lib.licenses.mit; @@ -192495,20 +193007,21 @@ self: { "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , directory, explicit-exception, fail, filepath, html, HTTP - , network, network-uri, old-locale, old-time, parsec, process - , transformers, unix, utility-ht + , network, network-bsd, network-uri, network-uri-flag, old-locale + , old-time, parsec, process, transformers, unix, utility-ht }: mkDerivation { pname = "mohws"; - version = "0.2.1.8"; - sha256 = "039abcwkqijsw8qp2iid6ilnyg79lvc1m6zik0jc4gadl5g704wh"; + version = "0.2.1.9"; + sha256 = "0a2hajnnngmarxpypbk1jvmwb8y93y2hhcnp86bj5rf3j5far5pf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor directory - explicit-exception fail filepath html HTTP network network-uri - old-locale old-time parsec process transformers unix utility-ht + explicit-exception fail filepath html HTTP network network-bsd + network-uri network-uri-flag old-locale old-time parsec process + transformers unix utility-ht ]; executableHaskellDepends = [ base bytestring ]; description = "Modular Haskell Web Server"; @@ -193125,6 +193638,28 @@ self: { license = lib.licenses.mit; }) {}; + "monad-logger_0_3_39" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.39"; + sha256 = "19992zh63axs0q86fgznk04dan8h3hbs72cjp1s3yynsgl23pwnk"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-logger-aeson" = callPackage ({ mkDerivation, aeson, aeson-diff, base, bytestring, context , directory, exceptions, fast-logger, hspec, hspec-discover @@ -194231,6 +194766,8 @@ self: { pname = "monadplus"; version = "1.4.3"; sha256 = "1gwy7kkcp696plfsbry22nvvqnainyv1n1van8yzskilz26k2yc5"; + revision = "1"; + editedCabalFile = "177z7d8hzl53cwxzsj0hqc1icm89d8k2faz99j790ag2vjmsai5g"; libraryHaskellDepends = [ base ]; description = "Haskell98 partial maps and filters over MonadPlus"; license = lib.licenses.bsd3; @@ -198786,8 +199323,8 @@ self: { ({ mkDerivation, base, safe-exceptions }: mkDerivation { pname = "mvar-lock"; - version = "0.1.0.3"; - sha256 = "04cznws3qq9km75ssigz3cfnjkh5lldgmyy29p8vrdf4s2g8i4z1"; + version = "0.1.0.4"; + sha256 = "04hh9yydm6xkv526k5kivyimwbjic591527rl6r2c5bykmkdns38"; libraryHaskellDepends = [ base safe-exceptions ]; description = "A trivial lock based on MVar"; license = lib.licenses.asl20; @@ -199857,8 +200394,8 @@ self: { }: mkDerivation { pname = "named-text"; - version = "1.1.1.0"; - sha256 = "1g3xb3pr6sxn3sk9h2jbqlj30vh4nxcc14d06dawmqfva8b1gfp5"; + version = "1.1.2.0"; + sha256 = "0yzz8vb4pjb177p3z3qr4rvn8nz5bdha0w7jmq1791g0g022jvqj"; libraryHaskellDepends = [ aeson base deepseq hashable prettyprinter sayable text ]; @@ -202698,6 +203235,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-udp" = callPackage + ({ mkDerivation, base, bytestring, containers, iproute, network }: + mkDerivation { + pname = "network-udp"; + version = "0.0.0"; + sha256 = "1fj7pa9ymbbf8kvklxk44ric1kc37lwx4n3x0jcb8mm39ww6x629"; + libraryHaskellDepends = [ + base bytestring containers iproute network + ]; + description = "UDP library"; + license = lib.licenses.bsd3; + }) {}; + "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -203774,6 +204324,8 @@ self: { pname = "nix-diff"; version = "1.0.19"; sha256 = "0iscad4ydgg1365k64bzxn15pl4jnsv17jbzda4s0fs9ff4c5ias"; + revision = "1"; + editedCabalFile = "0yf5x1wx33bgpr1gj24jsgp5gx2741xjchyhvjb3acvw7w5lzr0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207319,8 +207871,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.0.6"; - sha256 = "1ldjswdyxckxrmypmx027aw90b93r41izqw4qj1szp6p1mjbx3pn"; + version = "1.0.7"; + sha256 = "1xg4xjc7xw22vsra0iqslclhmz37nfvqhi6qj26f3xb30ivw43j3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -207334,19 +207886,19 @@ self: { }) {}; "ogma-core" = callPackage - ({ mkDerivation, aeson, base, filepath, HUnit, IfElse, ogma-extra - , ogma-language-c, ogma-language-cocospec, ogma-language-copilot - , ogma-language-fret-cs, ogma-language-fret-reqs, ogma-language-smv - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, aeson, base, filepath, HUnit, IfElse, mtl + , ogma-extra, ogma-language-c, ogma-language-cocospec + , ogma-language-copilot, ogma-language-fret-cs + , ogma-language-fret-reqs, ogma-language-smv, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "ogma-core"; - version = "1.0.6"; - sha256 = "09svwdsn16hfa7rxf4lbpj4i08ay5rrxk6dlmic0gk7yc24mx47c"; + version = "1.0.7"; + sha256 = "04axn5mjpfgiv91c6k3753m3349cgd3s8mknvmn5lh11gpwxhjx3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base filepath IfElse ogma-extra ogma-language-c + aeson base filepath IfElse mtl ogma-extra ogma-language-c ogma-language-cocospec ogma-language-copilot ogma-language-fret-cs ogma-language-fret-reqs ogma-language-smv ]; @@ -207365,8 +207917,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.0.6"; - sha256 = "1wk4374k09wwxhb9ki5pcl6igw6d83bxffrdv7qf8xgm051vna2y"; + version = "1.0.7"; + sha256 = "0870ifglgb2r7c5rm6m5276bh6m5av6jxci89fdj2xba6rm9x9ag"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -207383,8 +207935,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.0.6"; - sha256 = "1c30gcnrhqd4jg1rsv4s8vi0lvpslc3rn8zwkffrwxhll0qv7dma"; + version = "1.0.7"; + sha256 = "1pqmgmhw4d736k8vnk02ggrcqh88k8kn2766pml5m2d4svzjddb6"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -207402,8 +207954,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.0.6"; - sha256 = "0lnqg0mls8j7k1w735ygl1gaqzy9hz0q71sabirdgqf4p446rm21"; + version = "1.0.7"; + sha256 = "1i3w465prdaw734pnbydjs1k8k4lwivhdkvzxassam961n0gdnw6"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -207419,8 +207971,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.0.6"; - sha256 = "0ffbnxbsxl3mcmnys8zhagqwlsxk7da6w2szf9p0sx7032j8j20d"; + version = "1.0.7"; + sha256 = "0fac170jnyv1yz1w4w53y13p79qb69rnvz6qkkxh7603lcajjzn8"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -207433,8 +207985,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-cs"; - version = "1.0.6"; - sha256 = "1jb2xqxnr2wp2fwijlzv3lr8a1vwarbk9sy63881v6ygk7jlyz8f"; + version = "1.0.7"; + sha256 = "1dyqnm3yqih636dzkjh2hdw6ahmrczw8bagcgxch5v4w3pnpbhsc"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv ]; @@ -207454,8 +208006,8 @@ self: { }: mkDerivation { pname = "ogma-language-fret-reqs"; - version = "1.0.6"; - sha256 = "0dlscsf9i877qjijb5ygw32igyi42s02wj7ggav4h1dy36dm0bf7"; + version = "1.0.7"; + sha256 = "0q49la3kyh02pk7xccf9msmlw90wjd0chm3pbi5mng2rw865hkq3"; libraryHaskellDepends = [ aeson base ogma-language-cocospec ogma-language-smv text ]; @@ -207474,8 +208026,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.0.6"; - sha256 = "1cyjymfil3zyji8lj607r900icj8789nq1zx0civm29mz6ryrj8a"; + version = "1.0.7"; + sha256 = "1wnyjdi7s9l0aym9a06ldjk1zkpmk1yjxikdmgm79ww5zn42rmvq"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -208301,19 +208853,21 @@ self: { }) {}; "oops" = callPackage - ({ mkDerivation, base, base-compat, doctest, doctest-discover, Glob - , hedgehog, hedgehog-quickcheck, hspec, hspec-discover - , hw-hspec-hedgehog, lens, mtl, QuickCheck, template-haskell - , transformers + ({ mkDerivation, base, base-compat, doctest, doctest-discover + , exceptions, Glob, hedgehog, hedgehog-quickcheck, hspec + , hspec-discover, hw-hspec-hedgehog, lens, mtl, QuickCheck + , template-haskell, transformers }: mkDerivation { pname = "oops"; - version = "0.1.5.0"; - sha256 = "0yb10jv01mx2czz8sb9qxr0b34wfhvvrai52c26s6q4gwybi77jb"; - libraryHaskellDepends = [ base mtl QuickCheck transformers ]; + version = "0.2.0.0"; + sha256 = "0kqgilshjd0lrabfb4yllgqk93kyyy62h7igpyz48wvz0x9mvy3d"; + libraryHaskellDepends = [ + base exceptions mtl QuickCheck transformers + ]; testHaskellDepends = [ base base-compat doctest doctest-discover Glob hedgehog - hedgehog-quickcheck hspec hw-hspec-hedgehog lens QuickCheck + hedgehog-quickcheck hspec hw-hspec-hedgehog lens mtl QuickCheck template-haskell ]; testToolDepends = [ doctest-discover hspec-discover ]; @@ -210328,26 +210882,6 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, Only, optparse-applicative - , system-filepath, text, time, transformers, transformers-compat - , void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.4.8"; - sha256 = "108sjvjqmq2rps5x7yry0j17qyq4m0gpgxnnzc1i9cjrbhnqcida"; - revision = "1"; - editedCabalFile = "0rgh8sy2w7rh5n1sz0jxcq892myplbli15snggi77dflv00ic7zd"; - libraryHaskellDepends = [ - base bytestring Only optparse-applicative system-filepath text time - transformers transformers-compat void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriel439 ]; - }) {}; - - "optparse-generic_1_4_9" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , system-filepath, text, time, transformers, transformers-compat , void @@ -210365,7 +210899,6 @@ self: { executableHaskellDepends = [ base ]; description = "Auto-generate a command-line parser for your datatype"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; @@ -211042,17 +211575,17 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_5_2_0" = callPackage + "ormolu_0_5_3_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, containers, Diff, directory, dlist, file-embed - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, QuickCheck, syb, temporary, text + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env }: mkDerivation { pname = "ormolu"; - version = "0.5.2.0"; - sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96"; + version = "0.5.3.0"; + sha256 = "13x0iasi2mrwv6mnhg2clkaa0znm6i058vssyxri9mdi147sb3pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211061,12 +211594,12 @@ self: { MemoTrie mtl syb text ]; executableHaskellDepends = [ - base containers filepath ghc-lib-parser gitrev optparse-applicative - text + base containers directory filepath ghc-lib-parser + optparse-applicative text th-env ]; testHaskellDepends = [ - base containers directory filepath ghc-lib-parser hspec - hspec-megaparsec path path-io QuickCheck temporary text + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec path path-io QuickCheck temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -212325,6 +212858,62 @@ self: { ]; }) {}; + "pandoc_3_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64, 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, gridtables, haddock-library + , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup + , JuicyPixels, mime-types, mtl, network, network-uri, pandoc-types + , parsec, pretty, pretty-show, process, random, safe, scientific + , SHA, skylighting, skylighting-core, split, syb, tagsoup, tasty + , tasty-bench, tasty-golden, tasty-hunit, tasty-quickcheck + , temporary, texmath, text, text-conversions, time + , unicode-collation, unicode-transforms, unix, xml, xml-conduit + , xml-types, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "3.0.1"; + sha256 = "0yxrcr589z1wbk1ng7qg6ni7zy1vm2v5fg5df639xgk1na4sn0jc"; + configureFlags = [ "-f-trypandoc" ]; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64 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 gridtables haddock-library + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mime-types mtl network network-uri pandoc-types parsec + pretty pretty-show process random safe scientific SHA skylighting + skylighting-core split syb tagsoup temporary texmath text + text-conversions time unicode-collation unicode-transforms unix xml + xml-conduit xml-types yaml zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates filepath + Glob mtl pandoc-types process tasty tasty-golden tasty-hunit + tasty-quickcheck text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq mtl tasty-bench text + ]; + doHaddock = false; + 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 = [ + lib.maintainers.maralorn lib.maintainers.sternenseemann + ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -212381,16 +212970,36 @@ self: { mainProgram = "pandoc-citeproc-preamble"; }) {}; + "pandoc-cli" = callPackage + ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine + , pandoc-server, safe, text, wai-extra, warp + }: + mkDerivation { + pname = "pandoc-cli"; + version = "0.1"; + sha256 = "01fb51nbx6ljv7jkmny3bxlgkg307radr5n6d4m0rg7wxigsrmn5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hslua-cli pandoc pandoc-lua-engine pandoc-server safe text + wai-extra warp + ]; + description = "Conversion between documentation formats"; + license = lib.licenses.gpl2Plus; + mainProgram = "pandoc"; + }) {}; + "pandoc-crossref" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl , microlens-th, mtl, open-browser, optparse-applicative, pandoc - , pandoc-types, syb, template-haskell, temporary, text, utility-ht + , pandoc-cli, pandoc-types, syb, template-haskell, temporary, text + , utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.14.0"; - sha256 = "1f55xz5r7h6vjjj0dsq5glavn0zjh02imi4mja8qbwn3rvi67l86"; + version = "0.3.15.0"; + sha256 = "0kzxdpqkhm09vizsyb7ck0mnic32kci8plqlbsawdjkg4knvdn5r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -212407,6 +213016,7 @@ self: { base containers data-default directory filepath hspec microlens mtl pandoc pandoc-types text ]; + testToolDepends = [ pandoc-cli ]; benchmarkHaskellDepends = [ base criterion pandoc pandoc-types text ]; @@ -212637,6 +213247,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-lua-engine" = callPackage + ({ mkDerivation, base, bytestring, citeproc, containers + , data-default, directory, doclayout, doctemplates, exceptions + , filepath, hslua, hslua-aeson, hslua-core, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, lpeg, mtl, pandoc + , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , tasty-golden, tasty-hunit, tasty-lua, text + }: + mkDerivation { + pname = "pandoc-lua-engine"; + version = "0.1"; + sha256 = "08r7zfv8jpxscypdd814rirghmpxgh5a2wwv6bwl3ifhrxlrn4dq"; + libraryHaskellDepends = [ + base bytestring citeproc containers data-default doclayout + doctemplates exceptions hslua hslua-aeson hslua-core + hslua-module-doclayout hslua-module-path hslua-module-system + hslua-module-text hslua-module-version hslua-module-zip lpeg mtl + pandoc pandoc-lua-marshal pandoc-types parsec SHA text + ]; + testHaskellDepends = [ + base bytestring data-default directory exceptions filepath hslua + pandoc pandoc-types tasty tasty-golden tasty-hunit tasty-lua text + ]; + description = "Lua engine to power custom pandoc conversions"; + license = lib.licenses.gpl2Plus; + }) {}; + "pandoc-lua-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hslua , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty @@ -212659,6 +213297,29 @@ self: { license = lib.licenses.mit; }) {}; + "pandoc-lua-marshal_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hslua + , hslua-list, hslua-marshalling, lua, pandoc-types, QuickCheck + , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.2.0"; + sha256 = "1sha2yxvwy31s4i1qhkk1jig37pbw5j5bxkfkwvvq0y52pl14j0g"; + libraryHaskellDepends = [ + base bytestring containers exceptions hslua hslua-list + hslua-marshalling lua pandoc-types safe text + ]; + testHaskellDepends = [ + base bytestring containers exceptions hslua hslua-list + hslua-marshalling lua pandoc-types QuickCheck safe tasty + tasty-hunit tasty-lua tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -212772,6 +213433,42 @@ self: { mainProgram = "pandoc-plot"; }) {}; + "pandoc-plot_1_6_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , data-default, directory, filepath, gitrev, hashable + , hspec-expectations, lifted-async, lifted-base, mtl + , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup + , tasty, tasty-hspec, tasty-hunit, template-haskell, text + , typed-process, unix, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "1.6.1"; + sha256 = "02ryb5bcdwli8fliwm7kngka4010a21wzz9ak8lgszgqm9d58li3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable lifted-async lifted-base mtl pandoc pandoc-types + shakespeare tagsoup template-haskell text typed-process unix yaml + ]; + executableHaskellDepends = [ + base containers directory filepath gitrev optparse-applicative + pandoc pandoc-types template-haskell text typed-process + ]; + testHaskellDepends = [ + base containers directory filepath hspec-expectations pandoc-types + tasty tasty-hspec tasty-hunit text + ]; + benchmarkHaskellDepends = [ + base criterion pandoc-types template-haskell text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-plot"; + }) {}; + "pandoc-pyplot" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl @@ -212805,6 +213502,24 @@ self: { broken = true; }) {}; + "pandoc-server" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, containers + , data-default, doctemplates, pandoc, pandoc-types, servant-server + , skylighting, text, unicode-collation, wai, wai-cors + }: + mkDerivation { + pname = "pandoc-server"; + version = "0.1"; + sha256 = "1l0nvzq4p06lsn3q5krkddgl9qf5lv7s8siqhpvnz8gjzdnxi12q"; + libraryHaskellDepends = [ + aeson base base64 bytestring containers data-default doctemplates + pandoc pandoc-types servant-server skylighting text + unicode-collation wai wai-cors + ]; + description = "Pandoc document conversion as an HTTP servant-server"; + license = lib.licenses.gpl2Plus; + }) {}; + "pandoc-sidenote" = callPackage ({ mkDerivation, base, mtl, pandoc-types, text }: mkDerivation { @@ -212826,8 +213541,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.2.4.0"; - sha256 = "0j25frcafcr0jvk3dfrmxan2q95920wy6jm0fahwf20f4jbanzfc"; + version = "0.3.0.0"; + sha256 = "1r7i22d4jkhd11srzxbchl9bx337800pliyvwa59i9n6hhqkycvg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -212838,6 +213553,33 @@ self: { mainProgram = "styleFromMeta"; }) {}; + "pandoc-symreg" = callPackage + ({ mkDerivation, attoparsec, attoparsec-expr, base, bytestring, mtl + , optparse-applicative, srtree + }: + mkDerivation { + pname = "pandoc-symreg"; + version = "0.1.0.1"; + sha256 = "0lw82q4mygcnwfasiz3gps1y1i5cn80q7ch2g6xshjyxrbqq3qnf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + executableHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + testHaskellDepends = [ + attoparsec attoparsec-expr base bytestring mtl optparse-applicative + srtree + ]; + description = "A tool to convert symbolic regression expressions into different formats"; + license = lib.licenses.gpl3Only; + mainProgram = "pandoc-symreg"; + }) {}; + "pandoc-throw" = callPackage ({ mkDerivation, base, exceptions, pandoc }: mkDerivation { @@ -212872,6 +213614,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pandoc-types_1_23" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.23"; + sha256 = "0b8na6516rkwx3b7la58zwpmjia7hvljswzw0nds7h0r090j2rsy"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -214916,20 +215682,6 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; - version = "0.6.0.0"; - sha256 = "1fn8b8q99m6xdgiqi2smffk4s1h3sil2v5c1na8fl3gv04kc0v13"; - revision = "1"; - editedCabalFile = "0glacw02msrhc6yjbn6aaa06ixkby0fdcb1gk8lr47pdnhb4g8w0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog ]; - description = "A partial binary associative operator"; - license = lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_6_0_1" = callPackage ({ mkDerivation, base, hedgehog }: mkDerivation { pname = "partial-semigroup"; @@ -214939,7 +215691,6 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "A partial binary associative operator"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -215551,21 +216302,6 @@ self: { }) {}; "path-text-utf8" = callPackage - ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: - mkDerivation { - pname = "path-text-utf8"; - version = "0.0.1.10"; - sha256 = "1nbmsydpg8m09q5i907bnh57x5lcd3rw3rnxa31b93xzaynxwhsn"; - revision = "1"; - editedCabalFile = "1f1y2m1qqdxnqi1n4bvgbqilsjk3sqkvi4nk2pz5l9bl97k0l42z"; - libraryHaskellDepends = [ - base bytestring path safe-exceptions text - ]; - description = "Read and write UTF-8 text files"; - license = lib.licenses.asl20; - }) {}; - - "path-text-utf8_0_0_1_11" = callPackage ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; @@ -215576,7 +216312,6 @@ self: { ]; description = "Read and write UTF-8 text files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "path-tree" = callPackage @@ -215711,8 +216446,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "0.1.0.1"; - sha256 = "1mdl9r8kga6n7v7yvds46j0y8mg59h1irw8fbwqzzj142va9q8xc"; + version = "1.0.0.0"; + sha256 = "1zlnfj8a4ijxjzqvp07fsnm40wdgpcjnqb1cn8nczhl7r1d0kil6"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers exceptions http-client http-types network-uri text time uuid @@ -217749,6 +218484,48 @@ self: { broken = true; }) {}; + "persistent-event-source" = callPackage + ({ mkDerivation, base, esqueleto, monad-logger, persistent + , persistent-mtl, tasty, tasty-hunit, tasty-quickcheck, text, time + , unliftio-core + }: + mkDerivation { + pname = "persistent-event-source"; + version = "0.1.0"; + sha256 = "1pk0655hv6rvkk9rfdnc03fy90q16yn53yfv83rc1vrxghs17mnr"; + libraryHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl text time + unliftio-core + ]; + testHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl tasty + tasty-hunit tasty-quickcheck text time unliftio-core + ]; + description = "Persistent based event sourcing"; + license = lib.licenses.mit; + }) {}; + + "persistent-eventsource" = callPackage + ({ mkDerivation, base, esqueleto, monad-logger, persistent + , persistent-mtl, tasty, tasty-hunit, tasty-quickcheck, text, time + , unliftio-core + }: + mkDerivation { + pname = "persistent-eventsource"; + version = "0.2.0"; + sha256 = "0fp23hxg217zbm3ak85rixd06dipscgsl2ldiyhp09f2jxkskslv"; + libraryHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl text time + unliftio-core + ]; + testHaskellDepends = [ + base esqueleto monad-logger persistent persistent-mtl tasty + tasty-hunit tasty-quickcheck text time unliftio-core + ]; + description = "Persistent based event sourcing"; + license = lib.licenses.mit; + }) {}; + "persistent-generic" = callPackage ({ mkDerivation, base, persistent, text }: mkDerivation { @@ -217898,6 +218675,8 @@ self: { pname = "persistent-mtl"; version = "0.5.0.1"; sha256 = "17sxwa8p95nrkacjr1wnpihwfq121z1pkyh1nvlfjy76b4aalqhi"; + revision = "1"; + editedCabalFile = "1qhazc2jqrhz6bkhn55nsikgf8kdvajb2ai6826nwrq657glzqa4"; testHaskellDepends = [ base bytestring conduit containers esqueleto explainable-predicates monad-logger persistent persistent-postgresql persistent-sqlite @@ -217936,6 +218715,33 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-mysql_2_13_1_4" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.13.1.4"; + sha256 = "10i8x5byqjqgqmjwfjj56dgjhnkv7wf4bg1pad9dd1ld3crlaf8d"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers fast-logger hspec + http-api-data HUnit monad-logger mysql path-pieces persistent + persistent-qq 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -218058,6 +218864,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_5_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , 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, vault, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.5.1"; + sha256 = "1snvzm01qgyiz3y12pzyy4phxwqpr7c47fi395w3cnl915y9i8rp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core vault + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-postgresql-streaming" = callPackage ({ mkDerivation, base, conduit, monad-logger, mtl, persistent , persistent-postgresql, postgresql-simple, resourcet, text @@ -218261,6 +219101,39 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_13_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, 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.13.1.1"; + sha256 = "0a7s0znm4580spgadiqy14dhvm2kzbh6v3kc4px41yyk8br6vnpj"; + 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-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; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-stm" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , extra, filelock, filepath, focus, hspec, stm, stm-containers @@ -218567,8 +219440,8 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.4.1"; - sha256 = "0fr0lzr7l31ai134c87jgqabw619ggj478ynq9mp1fq37hd11rbp"; + version = "0.0.4.2"; + sha256 = "0rdmdrch9q4sz23svsr52ymkllvfxi6kgc7mrfr0zdarah2sc8ip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223533,8 +224406,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; - revision = "5"; - editedCabalFile = "05qrn5pfdy45x1nkx7dvhnxs9j6d6cssws4kwn2sl3n9qmagr8mc"; + revision = "6"; + editedCabalFile = "0xrmzz7p2akgdyr7gm54yvq83lm9qixcrk72ia2w9xcs2r4b76vz"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -226969,14 +227842,12 @@ self: { }: mkDerivation { pname = "prairie"; - version = "0.0.1.0"; - sha256 = "1n27ylk5yzvvl6isykw0hjarnzwx652fc0xy6qzfdj0swy0bgiw7"; - revision = "2"; - editedCabalFile = "1yp173nnsk875wvqqnr9ifkvj8k7zcjbgvzpkyc0sxkq3nlrjs9q"; + version = "0.0.2.0"; + sha256 = "1z9l8a45shvv1z8zsp4d1c0nrp7zblma8g0alhp2flp7wxfv7qf3"; libraryHaskellDepends = [ aeson base constraints containers lens template-haskell text ]; - testHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base lens ]; description = "A first class record field library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -227990,6 +228861,8 @@ self: { pname = "prettyprinter-combinators"; version = "0.1.1"; sha256 = "1m6338w6cd7fsib00zs8dk16b4mxfa1vswg5bmkzafas1db6qbcg"; + revision = "3"; + editedCabalFile = "0kvfw63g2a6mn4sk3lf8i7g469gz5xazlniivbxxan91gcg7rfb2"; libraryHaskellDepends = [ base bimap bytestring containers dlist pretty-show prettyprinter syb template-haskell text unordered-containers vector @@ -227998,6 +228871,24 @@ self: { license = lib.licenses.asl20; }) {}; + "prettyprinter-combinators_0_1_1_1" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers, dlist + , pretty-show, prettyprinter, syb, template-haskell, text + , unordered-containers, vector + }: + mkDerivation { + pname = "prettyprinter-combinators"; + version = "0.1.1.1"; + sha256 = "1553qii74af7a5xxj3n6ch9vv84kr5ayd1z69x0d78lqqraibx4y"; + libraryHaskellDepends = [ + base bimap bytestring containers dlist pretty-show prettyprinter + syb template-haskell text unordered-containers vector + ]; + description = "Some useful combinators for the prettyprinter package"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -228355,6 +229246,8 @@ self: { pname = "primitive"; version = "0.7.4.0"; sha256 = "1mddh42i6xg02z315c4lg3zsxlr3wziwnpzh2nhzdcifh716sbav"; + revision = "1"; + editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -230008,8 +230901,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.29"; - sha256 = "16nj96rhkfl5h9prqsfr8n1i20vcqlpfz8plbp2vsfha8kzsi2wl"; + version = "0.0.0.30"; + sha256 = "1jcfr6mw5rkcr0vfs53szymwkkdr5jxy8ph9n8cfrn56yqhcdvqj"; libraryHaskellDepends = [ aeson base bytestring cassava containers esqueleto generic-random lens mongoDB network-uri persistent persistent-mongoDB QuickCheck @@ -230467,8 +231360,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.3"; - sha256 = "12572f2pwn3akzwqi83p734jabrfinr7bb89yhinl8pari7lya7k"; + version = "0.9.4"; + sha256 = "1vgrwx36liqkshrfqkrb38nsbq84a6fbnmn0p2v0y76iccd2shid"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -233407,6 +234300,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.qt5) qtbase;}; + "quaalude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "quaalude"; + version = "0.0.0.1"; + sha256 = "0wwsrpm2s7gs2c4fwh4qvhnjywxfyf94dw715bz34q7bzyyk3lc6"; + libraryHaskellDepends = [ base ]; + description = "Extremely minimal prelude"; + license = lib.licenses.asl20; + }) {}; + "quack" = callPackage ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }: mkDerivation { @@ -233537,8 +234441,8 @@ self: { ({ mkDerivation, base, subG, uniqueness-periods-vector-stats }: mkDerivation { pname = "quantizer"; - version = "0.1.0.0"; - sha256 = "0pall4g5fd8flv7b380y7qqnh630jbnf5kbzxhpx13qr287casrh"; + version = "0.2.1.1"; + sha256 = "073sz728am6sj9zj2n2pnzvn5asvnj8lqcb8hbi09qp36w4mgvy4"; libraryHaskellDepends = [ base subG uniqueness-periods-vector-stats ]; @@ -237399,6 +238303,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "reactive-banana_1_3_2_0" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, pqueue + , QuickCheck, random, semigroups, stm, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, these, transformers + , unordered-containers, vault + }: + mkDerivation { + pname = "reactive-banana"; + version = "1.3.2.0"; + sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k"; + libraryHaskellDepends = [ + base containers deepseq hashable pqueue semigroups stm these + transformers unordered-containers vault + ]; + testHaskellDepends = [ + base containers deepseq hashable pqueue QuickCheck semigroups tasty + tasty-hunit tasty-quickcheck these transformers + unordered-containers vault + ]; + benchmarkHaskellDepends = [ + base containers QuickCheck random tasty tasty-bench + tasty-quickcheck + ]; + description = "Library for functional reactive programming (FRP)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reactive-banana-automation" = callPackage ({ mkDerivation, base, doctest, reactive-banana, stm, time , transformers @@ -237580,8 +238512,8 @@ self: { }: mkDerivation { pname = "reactive-jack"; - version = "0.4.1.1"; - sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr"; + version = "0.4.1.2"; + sha256 = "1ckm95dr3y14bh73nxapm9rl39bz1lpxmclgcnd9n2mkn0b1q54w"; libraryHaskellDepends = [ base containers data-accessor event-list explicit-exception extensible-exceptions jack midi non-negative random @@ -239977,8 +240909,8 @@ self: { }: mkDerivation { pname = "reflex-test-host"; - version = "0.1.2.1"; - sha256 = "0hpvpf0628rc43cnh7k0b0adjb13cw9d8ykhhk0x4n2p7i9cp2zi"; + version = "0.1.2.2"; + sha256 = "1km340p317yscwjmx20pazraczsilb6mna5ka9mx7al7864jcyk1"; libraryHaskellDepends = [ base dependent-sum lens mtl primitive ref-tf reflex these transformers @@ -240090,6 +241022,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "reform-happstack_0_2_5_6" = callPackage + ({ mkDerivation, base, bytestring, happstack-server, mtl, random + , reform, text, utf8-string + }: + mkDerivation { + pname = "reform-happstack"; + version = "0.2.5.6"; + sha256 = "1v76z620b0iw3j2cr7mjs13jcf2lk800ilnl2k46jixc4zk75biy"; + libraryHaskellDepends = [ + base bytestring happstack-server mtl random reform text utf8-string + ]; + description = "Happstack support for reform"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "reform-hsp" = callPackage ({ mkDerivation, base, hsp, hsx2hs, reform, text }: mkDerivation { @@ -241341,12 +242289,17 @@ self: { }) {}; "regression-simple" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, ad, base, deepseq, math-functions, splitmix + , statistics, tasty, tasty-hunit + }: mkDerivation { pname = "regression-simple"; - version = "0.1.1"; - sha256 = "18gq05xrkkxg2zrnkx9z7n91g8lagz6j3cfw7mqik7dyc2m1w675"; - libraryHaskellDepends = [ base vector ]; + version = "0.2"; + sha256 = "15axsj9zfllyc98dpvxm7mr1vq2jxj5g7a8lkpbr24fxn3avd708"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + ad base math-functions splitmix statistics tasty tasty-hunit + ]; description = "Simple linear and quadratic regression"; license = lib.licenses.bsd3; }) {}; @@ -241535,6 +242488,34 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "rel8_1_4_1_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , case-insensitive, comonad, containers, contravariant, hasql + , hasql-transaction, hedgehog, mmorph, opaleye, pretty + , product-profunctors, profunctors, scientific, semialign + , semigroupoids, tasty, tasty-hedgehog, text, these, time + , tmp-postgres, transformers, uuid + }: + mkDerivation { + pname = "rel8"; + version = "1.4.1.0"; + sha256 = "0590pjiphpknxnc3g4y3f3rf134q9z5nbwrrbq81r1gx4nxb8d6n"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring case-insensitive comonad + contravariant hasql opaleye pretty product-profunctors profunctors + scientific semialign semigroupoids text these time uuid + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hasql hasql-transaction + hedgehog mmorph scientific tasty tasty-hedgehog text time + tmp-postgres transformers uuid + ]; + description = "Hey! Hey! Can u rel8?"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "relacion" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -242879,8 +243860,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.2.2"; - sha256 = "12p2mb215n7f0smczr5cfxkd89blchyyp5dsl6yzfij1ykf0yr9x"; + version = "0.2.2.3"; + sha256 = "1nwdvjvhd2msv6lzapdg1nkasp7wvc75mdg82ixqhwh8h7sgqs5p"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -243254,13 +244235,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "resource-pool_0_3_1_0" = callPackage - ({ mkDerivation, base, primitive, time }: + "resource-pool_0_4_0_0" = callPackage + ({ mkDerivation, base, hashable, primitive, time }: mkDerivation { pname = "resource-pool"; - version = "0.3.1.0"; - sha256 = "0klcyl0x15a0h73sn6176ma87cgb4n8g2szz54b5xzr60pws057y"; - libraryHaskellDepends = [ base primitive time ]; + version = "0.4.0.0"; + sha256 = "1cg99a88zlaxxb1aqjv8f2xip7wr6a8k0mwiyxjqsy3m7qz7h3cc"; + libraryHaskellDepends = [ base hashable primitive time ]; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -243754,8 +244735,8 @@ self: { }: mkDerivation { pname = "ret"; - version = "0.1.5.2"; - sha256 = "1lsqjqib4nvxacsjlr4207vwwxdd86wxxjvxw4vqra6a5clj6g08"; + version = "0.2.0.0"; + sha256 = "16cymbh678qh0r237kffqmxjwgja8aryf4j8xj9z2nz40flklbca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -246911,6 +247892,24 @@ self: { broken = true; }) {}; + "rpmostree-update" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cmd + , xdg-basedir + }: + mkDerivation { + pname = "rpmostree-update"; + version = "0.1.0"; + sha256 = "073mn1yzczz73vyivwsvbdbxb2q15i2li5v22d5y8jimsc59b232"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath simple-cmd xdg-basedir + ]; + description = "rpm-ostree update wrapper that caches change info"; + license = lib.licenses.bsd3; + mainProgram = "rpmostree-update"; + }) {}; + "rrb-vector" = callPackage ({ mkDerivation, base, deepseq, indexed-traversable, primitive , tasty, tasty-bench, tasty-quickcheck @@ -249411,8 +250410,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.0.2.0"; - sha256 = "041qjk1giqrsfis410r491c3b2s36ngsk64ihzpjb788xbr86adx"; + version = "1.1.0.0"; + sha256 = "0xaw4x4v1ir88by5dsffdxb8rdy06czq6amlxkj2wix871hyvm5j"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; @@ -249447,7 +250446,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_10_0" = callPackage + "sbp_4_11_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -249456,8 +250455,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.10.0"; - sha256 = "1mhnqiqi6yv3mn0rcwiq5k79a2zxcpqp4284ziqrcjwnhjxd2cnf"; + version = "4.11.0"; + sha256 = "0flwy85dvdmaqpl8b652as8zhdypq0a513v1pvp0hrnp1z0ylg1p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249556,7 +250555,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_9_1" = callPackage + "sbv_9_2" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -249565,8 +250564,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "9.1"; - sha256 = "0wkpx73blwg629l4y9vjjlhbk4qa1zzddc4z8qvida62qwcdxw6w"; + version = "9.2"; + sha256 = "0qmjdklrjcvyfkqbwafs79arjg46icnsbq018j0c6aqzhl94zknf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -249587,6 +250586,21 @@ self: { broken = true; }) {inherit (pkgs) z3;}; + "sbv-program" = callPackage + ({ mkDerivation, base, bifunctors, containers, pretty-simple, sbv + }: + mkDerivation { + pname = "sbv-program"; + version = "1.1.0.0"; + sha256 = "0bdddln73f27zy4a8j51n82wqpcsziagzviv3vfsq7s990dmkb2g"; + libraryHaskellDepends = [ + base bifunctors containers pretty-simple sbv + ]; + testHaskellDepends = [ base sbv ]; + description = "Component-based program synthesis using SBV"; + license = lib.licenses.bsd3; + }) {}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -249594,8 +250608,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.2.2"; - sha256 = "0cv2f6n32m8xaii5dpk3kz6wclxgmri1zfh09dq23s91l5asrp1v"; + version = "9.4.4"; + sha256 = "0ibz3drbr6x4mx5253gwg2gmfvf6933x8nazlg3hf8f6zwmhcm4f"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -254668,23 +255682,24 @@ self: { }) {}; "servant-hmac-auth" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring + ({ mkDerivation, base, base64-bytestring, bytestring , case-insensitive, containers, cryptonite, filepath, hspec , hspec-discover, hspec-golden, http-client, http-types, memory , mtl, servant, servant-client, servant-client-core, servant-server - , text, transformers, wai + , text, transformers, wai, warp }: mkDerivation { pname = "servant-hmac-auth"; - version = "0.1.4"; - sha256 = "0nnmwqqdc7yzbd96bfmgcidz41knzrbh082dcwg2n3w0vvp0m98i"; + version = "0.1.5"; + sha256 = "1vpa699lrx20309z0brqlbiqn1mwjjqgb5k5nwxgqm67p8k3y0sx"; libraryHaskellDepends = [ - base base64-bytestring binary bytestring case-insensitive - containers cryptonite http-client http-types memory mtl servant - servant-client servant-client-core servant-server transformers wai + base base64-bytestring bytestring case-insensitive containers + cryptonite http-client http-types memory mtl servant servant-client + servant-client-core servant-server transformers wai ]; testHaskellDepends = [ - base case-insensitive filepath hspec hspec-golden http-types text + base case-insensitive filepath hspec hspec-golden http-client + http-types servant-client servant-server text warp ]; testToolDepends = [ hspec-discover ]; description = "Servant authentication with HMAC"; @@ -254919,6 +255934,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-lucid_0_9_0_6" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , text, wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.9.0.6"; + sha256 = "1z894w9hfcnsdwivy2qvwa254l9d9bsbdjvzlvksxy92aw1p6fd0"; + libraryHaskellDepends = [ base http-media lucid servant text ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + description = "Servant support for lucid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-machines" = callPackage ({ mkDerivation, base, base-compat, bytestring, http-client , http-media, machines, mtl, servant, servant-client @@ -255679,15 +256709,17 @@ self: { }) {}; "servant-serf" = callPackage - ({ mkDerivation, base, Cabal, directory, exceptions, filepath }: + ({ mkDerivation, base, Cabal-syntax, directory, exceptions + , filepath + }: mkDerivation { pname = "servant-serf"; - version = "0.3.1.2"; - sha256 = "12qyg3bj4f8y4f3z0p3dxh4ms8xdv6226120xsdd6jkbxynmap01"; + version = "0.3.1.3"; + sha256 = "0zlfy0xc4ssy7s68i6hddlkz41fa95490yhg19m1lvkqvc6mac2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal directory exceptions filepath + base Cabal-syntax directory exceptions filepath ]; executableHaskellDepends = [ base ]; description = "Automatically generate Servant API modules"; @@ -255709,6 +256741,8 @@ self: { pname = "servant-server"; version = "0.19.2"; sha256 = "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy"; + revision = "1"; + editedCabalFile = "0qlc6bg31abfhdgwalmb89bkrdsxv21rcb2gdli85xy1jvcs4z7v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257595,6 +258629,8 @@ self: { pname = "shake"; version = "0.19.7"; sha256 = "1lcr6q53qwm308bny6gfawcjhxsmalqi3dnwckam02zp2apmcaim"; + revision = "1"; + editedCabalFile = "1hz57kw5pp5cpbicbi7x8sz8c6qy58dzyiljz9b9f2r1rr683d9w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -258657,6 +259693,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "shelly_1_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.11.0"; + sha256 = "0vmi8qbp1w9ir25k2p05p4jx9r7v67kkyygygl660ji6l6a89h50"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-contrib HUnit + lifted-async mtl text transformers unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -259544,8 +260606,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "signed-multiset"; - version = "0.4"; - sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747"; + version = "0.5"; + sha256 = "0ajpy07n57x8gbnxym1fdmwhwzyk2a5cxvhc3hjjn3lpn50hiicl"; libraryHaskellDepends = [ base containers ]; description = "Multisets with negative membership"; license = lib.licenses.bsd3; @@ -261859,8 +262921,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.6"; - sha256 = "1hxz51vx1a1p0v8sajv2ch6y261lm4s9z5fvp5w86qygsd1zy2px"; + version = "1.0.7"; + sha256 = "02yyiplcdjad3dzcv7x4npj5h93q756ck892kdhzdrm9qbr96z66"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -262667,8 +263729,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.7.0.1"; - sha256 = "1l46xpilja815zsj96lhginl4x8jg9skxb0pvny3h12972s1k89d"; + version = "0.7.1.0"; + sha256 = "1g69ybqfhsl74n516dzby2dswp5z4qr9xhc1fcxh9j6ynan1vcmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266182,14 +267244,14 @@ self: { }: mkDerivation { pname = "sox"; - version = "0.2.3.1"; - sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh"; + version = "0.2.3.2"; + sha256 = "1ys6xm08gr3pvyrial2z1b3gvyd44b9510dpp4ifxqf882igkjgb"; libraryHaskellDepends = [ base containers explicit-exception extensible-exceptions process sample-frame semigroups transformers unix utility-ht ]; description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; + license = lib.licenses.gpl3Only; }) {}; "soxlib" = callPackage @@ -266199,8 +267261,8 @@ self: { }: mkDerivation { pname = "soxlib"; - version = "0.0.3.1"; - sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd"; + version = "0.0.3.2"; + sha256 = "12pkalrwqcgz77wv948mkjldc57pj090rkrjw6k3xzqvsgvnrrpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267458,8 +268520,8 @@ self: { pname = "splitmix"; version = "0.1.0.4"; sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; - revision = "1"; - editedCabalFile = "1iqlg2d4mybqwzwp67c5a1yxzd47cbp4f7mrpa6d0ckypis2akl0"; + revision = "2"; + editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -267619,8 +268681,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.8"; - sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4"; + version = "0.1.3.9"; + sha256 = "10sdywp24c0prvgkdndimc6jnkalzbsbdb1dxw6cv86xxphk65in"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268028,15 +269090,15 @@ self: { }) {}; "sqlite-simple-interpolate" = callPackage - ({ mkDerivation, base, haskell-src-meta, mtl, parsec, sqlite-simple + ({ mkDerivation, base, custom-interpolation, sqlite-simple , template-haskell }: mkDerivation { pname = "sqlite-simple-interpolate"; - version = "0.1.1"; - sha256 = "1vi43mm6lwdpsq0r2gs7nsrn4g88r3q4d8g5gmm7al8ziz9c39vq"; + version = "0.2.0.0"; + sha256 = "1wf68a6jia64grxl590zzpq5xj33k4n20jly0dpqj17brbqwv8fa"; libraryHaskellDepends = [ - base haskell-src-meta mtl parsec sqlite-simple template-haskell + base custom-interpolation sqlite-simple template-haskell ]; testHaskellDepends = [ base sqlite-simple ]; description = "Interpolated SQLite queries via quasiquotation"; @@ -268238,6 +269300,8 @@ self: { pname = "sr-extra"; version = "1.88"; sha256 = "1cpigfdpgcy3bpp51snza0wwd88ky04hwqlzbmvmwkwznd7wqxrb"; + revision = "1"; + editedCabalFile = "0lak0dd0p2c8qf870q4ahz9qjnjak7nfaswf69lrnc3yls1s7618"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -268360,6 +269424,18 @@ self: { license = lib.licenses.mit; }) {}; + "srtree" = callPackage + ({ mkDerivation, base, containers, mtl, random, vector }: + mkDerivation { + pname = "srtree"; + version = "0.1.2.1"; + sha256 = "1laybjb57vq50bkk2mqllxwygxg7i04ng2czm8vwy18577psbz11"; + libraryHaskellDepends = [ base containers mtl random vector ]; + testHaskellDepends = [ base containers mtl random vector ]; + description = "A general framework to work with Symbolic Regression expression trees"; + license = lib.licenses.bsd3; + }) {}; + "srv" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , raw-strings-qq, wai, wai-app-static, warp, warp-tls, yaml @@ -269736,8 +270812,8 @@ self: { }: mkDerivation { pname = "stackctl"; - version = "1.3.0.0"; - sha256 = "1a97xkbvcvr7r85b4xrzdijap3zw02j0rqxix3ld9ns907mkdq2n"; + version = "1.3.0.1"; + sha256 = "09328aw0bxps541nkb5h9r2v7lsqnsv2wv27r693r8a9fw9lsqxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269745,8 +270821,8 @@ self: { amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo bytestring cfn-flip conduit containers envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl - optparse-applicative resourcet rio semigroups text time unliftio - unliftio-core unordered-containers uuid yaml + optparse-applicative QuickCheck resourcet rio semigroups text time + unliftio unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -270954,8 +272030,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.2.3.2"; - sha256 = "0h81amww5caa8950nn124sn5804vdsvxz2nahwvx88hbgsgldpkg"; + version = "0.3.0.0"; + sha256 = "03cwrb4fd62mi16g11lf06hjkwk529nh016z5vlvq9jbaxalv873"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -271193,8 +272269,8 @@ self: { }: mkDerivation { pname = "stm-queue"; - version = "0.1.2.2"; - sha256 = "03mchkc1bvafh4674zyv5zxbrdwb20xvzn85wq8xkbs3z2gw9mi3"; + version = "0.2.0.0"; + sha256 = "0g4w5wv1wmhg2sj6pyq5bd0fi1b7zf99f1z0sjl3l8q0jwks16cy"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ async base hspec stm ]; benchmarkHaskellDepends = [ @@ -271484,6 +272560,8 @@ self: { pname = "storable-record"; version = "0.0.6"; sha256 = "1d4c1ccbrpq8rnacsjib9nmxhgxk9yb1zxx1nvfavhqhv8nwq2fd"; + revision = "1"; + editedCabalFile = "0gmyc50r9nzfwr5iyiixascgkv2lvk7xccvimqv2ix4zyi2fwdad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273440,8 +274518,8 @@ self: { }: mkDerivation { pname = "string-variants"; - version = "0.2.0.0"; - sha256 = "0rzxvqv6waggspqbph4n0q249v0h615965rqlbbhv8a3p87kmdcd"; + version = "0.2.1.0"; + sha256 = "06dgb0f9l05jb2m51n285rnhw9s3r61m7z7mmzbd1a078cs30ndf"; libraryHaskellDepends = [ aeson base bytestring mono-traversable QuickCheck refined refinery string-conversions template-haskell text @@ -273978,6 +275056,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structs_0_1_7" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "structs"; + version = "0.1.7"; + sha256 = "072gbzxh0cnrdmbwmksqfrdvv7xhsamjrmgd6vya17md76mqndab"; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell th-abstraction + ]; + testHaskellDepends = [ + base primitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -274461,8 +275559,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "subG"; - version = "0.5.3.0"; - sha256 = "0bq49g3ippsjiqm1qvd3y9a4fyngzw8f3my8n1amgyzxb6fk5q7w"; + version = "0.6.1.0"; + sha256 = "0y2hxb6rvzmyb8863wv7v4x3pai2fw8w968rzlgfrjh8vk1cw23r"; libraryHaskellDepends = [ base ]; description = "Some extension to the Foldable and Monoid classes"; license = lib.licenses.mit; @@ -275376,6 +276474,8 @@ self: { pname = "supply-chain"; version = "0.0.0.1"; sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; + revision = "1"; + editedCabalFile = "1nnc5k8fp5bd5na9sd9qk5cbra2zjjmddxcn4qs1ahw4lxfy9gxx"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; @@ -275393,6 +276493,25 @@ self: { license = lib.licenses.asl20; }) {}; + "supply-next" = callPackage + ({ mkDerivation, base, containers, gambler, hspec, integer-types + , quaalude, supply-chain, transformers + }: + mkDerivation { + pname = "supply-next"; + version = "0.0.1.1"; + sha256 = "0xvihbw7732w6n8qrfhdb78d8n206v5yd3ap26dcvwja58s7w7y1"; + libraryHaskellDepends = [ + base gambler integer-types quaalude supply-chain transformers + ]; + testHaskellDepends = [ + base containers gambler hspec integer-types quaalude supply-chain + transformers + ]; + description = "Supply-chain interface for basic streaming"; + license = lib.licenses.asl20; + }) {}; + "surjective" = callPackage ({ mkDerivation, base, lens, mtl, template-haskell }: mkDerivation { @@ -276248,25 +277367,24 @@ self: { "sydtest" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base - , bytestring, containers, Diff, dlist, envparse, filepath - , MonadRandom, mtl, optparse-applicative, path, path-io - , pretty-show, QuickCheck, quickcheck-io, random, random-shuffle - , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm - , sydtest-discover, text + , bytestring, containers, dlist, envparse, filepath, MonadRandom + , mtl, optparse-applicative, path, path-io, pretty-show, QuickCheck + , quickcheck-io, random, random-shuffle, safe, safe-coloured-text + , safe-coloured-text-terminfo, stm, sydtest-discover, text, vector }: mkDerivation { pname = "sydtest"; - version = "0.13.0.0"; - sha256 = "0msa5y6fl00qjrj08c6bccbav179f05jk9hb9lmfbffq6bc86rc5"; + version = "0.13.0.1"; + sha256 = "0am1bgg2figd3zwd80ia8jayp3ikvvb50wvjaivy4y66gz7x4qb3"; libraryHaskellDepends = [ - async autodocodec autodocodec-yaml base bytestring containers Diff - dlist envparse filepath MonadRandom mtl optparse-applicative path - path-io pretty-show QuickCheck quickcheck-io random random-shuffle - safe safe-coloured-text safe-coloured-text-terminfo split stm text + async autodocodec autodocodec-yaml base bytestring containers dlist + envparse filepath MonadRandom mtl optparse-applicative path path-io + pretty-show QuickCheck quickcheck-io random random-shuffle safe + safe-coloured-text safe-coloured-text-terminfo stm text vector ]; testHaskellDepends = [ base bytestring path path-io QuickCheck random safe-coloured-text - stm text + stm text vector ]; testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; @@ -276801,8 +277919,8 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.4.0.20211106"; - sha256 = "0fbw0fg78b8wh3fcbvcm9v3qrsvpyymhwd7f9a70yqj90mggl7sc"; + version = "0.5.0.20221211"; + sha256 = "00wkvvwyfy8g2ya86m8jy21656qrfapbf27k4hg6x2r0h87i5ddd"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers @@ -277596,6 +278714,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; + revision = "1"; + editedCabalFile = "0ig8ysmw2hnbxgdv1p4h4vpyq782anw1g8wsqjrj6b0n4kazk5i8"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -277626,6 +278746,8 @@ self: { pname = "synthesizer-dimensional"; version = "0.8.1.1"; sha256 = "0giaa6v2yvb0amvdzdv5bq7dsns9pgbzv7sgjdi4a4zy0x4gmhc4"; + revision = "1"; + editedCabalFile = "15wb7v43ijbjqnnjdjf7c547wjbk4047in84q26b0vzi5nvrb3ij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277686,8 +278808,8 @@ self: { pname = "synthesizer-llvm"; version = "0.9"; sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; - revision = "1"; - editedCabalFile = "04z0s3hkpdcmri4w34s2ssz9wwf60z1ccc0bc3bphs1caz8i61j2"; + revision = "2"; + editedCabalFile = "1p9wr4i1q8mv3ghnw46k4dzfagid1f7sx45zbam3ja68ksq1da99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278534,8 +279656,8 @@ self: { }: mkDerivation { pname = "tagchup"; - version = "0.4.1.1"; - sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75"; + version = "0.4.1.2"; + sha256 = "0zlrdlb0f6dhhx163i62ljh1spr0d5gcf0c96m5z7nzq529qq792"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -280075,10 +281197,8 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.2.0.1"; - sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; - revision = "2"; - editedCabalFile = "0qyp20khzr6ingdjmmwlhlklc26257wds56cn2pwss3yf1j5blv1"; + version = "1.2.0.2"; + sha256 = "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -280178,6 +281298,8 @@ self: { pname = "tasty-inspection-testing"; version = "0.2"; sha256 = "1gdwbg545gwfx2a26s7hkgz9l9mfb13i6v20j09hqrlbh1xsi3qz"; + revision = "1"; + editedCabalFile = "1539r8zxbpwf1ia48syslq2j5v6l8czigp4fjwfwdcsf8x5k9j6g"; libraryHaskellDepends = [ base ghc inspection-testing tasty template-haskell ]; @@ -280368,6 +281490,19 @@ self: { broken = true; }) {}; + "tasty-papi" = callPackage + ({ mkDerivation, base, containers, deepseq, papi, stm, tasty }: + mkDerivation { + pname = "tasty-papi"; + version = "0.1.0.1"; + sha256 = "0qlxdcjr8fv05vaspr4bna5wn28c0l0hn9a4znxcrrqlr1wqb3g8"; + libraryHaskellDepends = [ base containers deepseq stm tasty ]; + librarySystemDepends = [ papi ]; + testHaskellDepends = [ base tasty ]; + description = "Bencmarking using instruction counting"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) papi;}; + "tasty-prelude" = callPackage ({ mkDerivation, base, tasty, tasty-expected-failure, tasty-focus }: @@ -283337,8 +284472,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.5.4"; - sha256 = "1dn88s352y641c1vlj5j5mqwhnz6r1algkd7mx83y3fr0wp3nhlq"; + version = "0.12.5.5"; + sha256 = "0hm88495sql6dz10hkrhfdnzfpgaa8zcy00v3irkzibq886nbcva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283352,6 +284487,29 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_6" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty + , tasty-golden, text, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.6"; + sha256 = "167y2flpsq3f3npjhrb3bxdbxys2aamgfrs1dr3f6l36hyg8mhvg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath pretty-show tagged tasty + tasty-golden text xml + ]; + description = "Conversion between math formats"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -284681,12 +285839,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "th-data-compat_0_1_1_1" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.1.1.1"; + sha256 = "1ry22k1fr50az4gjy6vs3b11a4gp22hkagbbq4r3irqaz059z6dp"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-data-compat" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.1.1.0"; - sha256 = "0579yxlcl3cfirjim31capk7q2raf9bmmfnvcxxnicjmvx22790q"; + version = "0.1.2.0"; + sha256 = "1x8znbzzkrmp1vfq6blwnwb5cxyr9gkiwj6c5ab4nds4diy3j3cq"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = lib.licenses.bsd3; @@ -287427,19 +288597,20 @@ self: { "tinkoff-invest-sdk" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, concurrent-extra , errors, http2-client, http2-client-grpc, http2-grpc-proto-lens - , lens, mtl, proto-lens, proto-lens-runtime, proto-lens-setup, text - , unordered-containers + , lens, mtl, proto-lens, proto-lens-protoc, proto-lens-runtime + , proto-lens-setup, text, unordered-containers }: mkDerivation { pname = "tinkoff-invest-sdk"; - version = "0.1.0.0"; - sha256 = "1b66gb1cdlckhiaxbps31dklx0sz9wxs27cpy4zwfn0rxzi96wpv"; + version = "0.1.1.1"; + sha256 = "04l94l77243ik727lbqiy1brcvbgbyns0yl50xq9p87y0spbkrsi"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ async base bytestring concurrent-extra errors http2-client http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens proto-lens-runtime text unordered-containers ]; + libraryToolDepends = [ proto-lens-protoc ]; description = "gRPC based SDK for Tinkoff Invest API V2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -288053,8 +289224,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.7.0.1"; - sha256 = "117kwfqyww9qwsja4vx03vja7g6lgin3iy0ss2ckmdmnddimm9qs"; + version = "0.7.1.0"; + sha256 = "1hf4zfm6gapqd2yi0pylrmrjsgx98c21diixiv7bc7z6xs7g4pbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288473,8 +289644,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "6"; - editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v"; + revision = "7"; + editedCabalFile = "1nf6ciwh4llnmxsdff0shr8vh3j9x7cpi9hgn1dlas8glz4c6vn1"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; @@ -288778,16 +289949,16 @@ self: { }) {}; "toml-reader-parse" = callPackage - ({ mkDerivation, base, comonad, containers, deepseq, dlist, mtl + ({ mkDerivation, base, comonad, containers, deepseq, dlist , optparse-applicative, prettyprinter, prettyprinter-combinators , tasty, tasty-hunit, text, time, toml-reader, vector }: mkDerivation { pname = "toml-reader-parse"; - version = "0.1.1.0"; - sha256 = "1ah47icy8lnpnmhpsmyp9pvp8f134pzzi6cvv5vpnw2r5szr9vly"; + version = "0.1.1.1"; + sha256 = "0fijwv9zs5ivbxyss81rr5sav99dxn3x35adfrb6pli4qmr7mlzi"; libraryHaskellDepends = [ - base comonad containers deepseq dlist mtl prettyprinter + base comonad containers deepseq dlist prettyprinter prettyprinter-combinators text time toml-reader vector ]; testHaskellDepends = [ @@ -290150,12 +291321,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "transformers-either_0_1_3" = callPackage + ({ mkDerivation, base, exceptions, text, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.1.3"; + sha256 = "0vk4pyk26rpyn17r3imn0phl10lgdfw5cpabf77zpkdq8lr154yr"; + libraryHaskellDepends = [ base exceptions text transformers ]; + description = "An Either monad transformer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "transformers-except" = callPackage ({ mkDerivation, base, exceptions, text, transformers }: mkDerivation { pname = "transformers-except"; - version = "0.1.2"; - sha256 = "00zxpip9nhli7ic1zaks7c4hj851dhdgkkwq5qw9vamr6whgh9cr"; + version = "0.1.3"; + sha256 = "038c4gywkhq3qry4h7589z1afh2dw25d6nrhr1yfi0mx4kqanjs8"; libraryHaskellDepends = [ base exceptions text transformers ]; description = "An Except monad transformer with"; license = lib.licenses.bsd3; @@ -292312,8 +293495,8 @@ self: { pname = "turtle"; version = "1.6.1"; sha256 = "171viripwn8hg3afkkswr243bv7q0r0bz3mn0bflddm4jdf49597"; - revision = "1"; - editedCabalFile = "1x4hk9kk8ra855jkzs7dc9691pk14xydixswbx2srs3r9rc6dpjb"; + revision = "2"; + editedCabalFile = "0zkw1mn9z09gkc0yjx6pfqyvrda076qi7ya12vfd1j3b7yljhpdn"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -293471,6 +294654,19 @@ self: { license = lib.licenses.mit; }) {}; + "type-level-kv-list_2_0_1_2" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "2.0.1.2"; + sha256 = "0pm6zz37i57d6xnihybl2q0iqhb7cn1wrz8kxy7id4mpzhkysjis"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Type level Key-Value list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-level-kv-list-esqueleto" = callPackage ({ mkDerivation, base, esqueleto, text, type-level-kv-list }: mkDerivation { @@ -295636,8 +296832,8 @@ self: { pname = "unescaping-print"; version = "0.1"; sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5"; - revision = "3"; - editedCabalFile = "0r2ggyy2qla75jxdhd3izqqkqb3ar6538jczfwlbbxrj4w1xkd47"; + revision = "4"; + editedCabalFile = "1n09a1nsb6fm2abcg6zm4xhkgirhfwqbcxym84qaq82d8zmlyxqj"; libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; license = lib.licenses.bsd3; @@ -295933,6 +297129,8 @@ self: { pname = "unicode-data"; version = "0.4.0.1"; sha256 = "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"; + revision = "1"; + editedCabalFile = "1lvsn8r1xh8ip5gyrbwv7pk41yf2ynjimpd6g4am3n7j92djc7h8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -295951,6 +297149,8 @@ self: { pname = "unicode-data-names"; version = "0.2.0"; sha256 = "0i28rp5g6wmnga6i95a6cq3dhkjg3v477xwycbcl38dfwdj3iy2c"; + revision = "1"; + editedCabalFile = "1pxpg1mkv9yq26h9xcvxa6wza14y65g3j73gvs2nfmg4byksfdml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -295971,6 +297171,8 @@ self: { pname = "unicode-data-scripts"; version = "0.2.0.1"; sha256 = "0kpa2g59w9yiyl3adak7k0g9wnkwzv97c82x7bsrqvk23bdljxc0"; + revision = "1"; + editedCabalFile = "1f6kz6kwv9v087bzjss29qaid03vig6njnsa1w46p93dn2xscvsm"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec unicode-data ]; benchmarkHaskellDepends = [ @@ -295990,6 +297192,8 @@ self: { pname = "unicode-data-security"; version = "0.2.0"; sha256 = "10x58l62i7bj9kmnchp1rggln40sfbsyw4pxlzbk8dmhkh5zmdlx"; + revision = "1"; + editedCabalFile = "0mbsz5ynisjclzprvqvwd8q6l7kmv31qc2nkpbix05ipcrm0p4qg"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -296522,8 +297726,8 @@ self: { }: mkDerivation { pname = "unique-logic"; - version = "0.4"; - sha256 = "0lza0g7mvij6fj07nfyrgl7vy6hpqmmmzbnxylq71jb4a90sn28j"; + version = "0.4.0.1"; + sha256 = "05y401k00qminds1di27sxvhwjl5xn6yn1qq1vnbhs0ib4s8csvy"; libraryHaskellDepends = [ base explicit-exception transformers utility-ht ]; @@ -296542,6 +297746,8 @@ self: { pname = "unique-logic-tf"; version = "0.5.1"; sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; + revision = "1"; + editedCabalFile = "1bnd8jyrrawszaxz5w7jibys9qygp2gx39g5y312f0k5468x25qh"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; @@ -296718,8 +297924,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uniqueness-periods-vector-stats"; - version = "0.3.0.0"; - sha256 = "0vfkjmp730w9f0174fx0mpfrrbd2grwd838wnrrlxnv39y345i6h"; + version = "0.4.0.0"; + sha256 = "0ip401h6mgyz2qi391d1pjg37mrpf1qfa9pxdxga7r0bkmzs26hg"; libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; license = lib.licenses.mit; @@ -300748,8 +301954,8 @@ self: { pname = "vector"; version = "0.13.0.0"; sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "1"; - editedCabalFile = "12cwdaqsy9dv7j7cwq6r6kdyfxqiya8khm6ccaabjhhpa2aqwljl"; + revision = "2"; + editedCabalFile = "19d6c1gp5d6v5wlg386aphn7893axba0zicpi7n5s4a55bqazs51"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -301156,8 +302362,8 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-rotcev"; - version = "0.1.0.1"; - sha256 = "1zrw1r6xspjncavd307xbbnjdmmhjq9w3dbvm0khnkxjgh47is8v"; + version = "0.1.0.2"; + sha256 = "1ch8r6v07qvczp7cn7l4hxy7pakj37hkx5vp7vz5yk3bcnjb1mqc"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base tasty tasty-quickcheck vector ]; description = "Vectors with O(1) reverse"; @@ -301260,8 +302466,8 @@ self: { }: mkDerivation { pname = "vector-split"; - version = "1.0.0.2"; - sha256 = "05mxkgcg5v2w0vnqq8z5s6aj0aqi7b55mh6knaafalpc1yjyxbml"; + version = "1.0.0.3"; + sha256 = "1y2imndpyx15jmiajhabi34522jcayrz05zrxiv1srj4fssz56bd"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck split tasty tasty-quickcheck vector @@ -301300,8 +302506,8 @@ self: { pname = "vector-stream"; version = "0.1.0.0"; sha256 = "0v40vdpp35lhnnnx7q17fah0c14jrkjlnwsk0q4mbwb7ch7j3258"; - revision = "1"; - editedCabalFile = "18sm3vd1qim9r3m40wgvnmcrfz1zl051yy84dffnp4si9vfgic09"; + revision = "2"; + editedCabalFile = "1jldm2bh9d0y7vmyv3l85ilps4n8ypqr6da0cgqg5dfi3hlxbmpm"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -302819,6 +304025,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vty_5_38" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, blaze-builder + , bytestring, containers, deepseq, directory, filepath, microlens + , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text + , transformers, unix, utf8-string, vector + }: + mkDerivation { + pname = "vty"; + version = "5.38"; + sha256 = "18s84rrc1dhm5j8c24r8lgk8hjdrwsdjgf6hilqcdm90dx6jz0al"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base binary blaze-builder bytestring containers + deepseq directory filepath microlens microlens-mtl microlens-th mtl + parsec stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers directory filepath microlens microlens-mtl mtl + ]; + description = "A simple terminal UI library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -302900,8 +304131,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.24.3"; - sha256 = "00ral8nlksr37xqdmy0wb4r3f67g81fd8xx4glw4zj07jqlk4pm3"; + version = "3.24.4"; + sha256 = "0lpgnmdk05lc4za98i8p7l0g1c5c4cvigm423k1qh2k287wcdhan"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -305204,6 +306435,8 @@ self: { pname = "warp"; version = "3.3.23"; sha256 = "0y1r7czq5zrgklqrx1b9pmxn5lhmf7zpqdjz7hfmnzsmr3vndmms"; + revision = "1"; + editedCabalFile = "04akn70kmgmw7scapks11srfy44nqj9cy03qsp6rawlzwbxwk9id"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -305916,6 +307149,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "web-routes-happstack_0_23_12_3" = callPackage + ({ mkDerivation, base, bytestring, happstack-server, text + , web-routes + }: + mkDerivation { + pname = "web-routes-happstack"; + version = "0.23.12.3"; + sha256 = "1qkbaq5k9as5s0bdaiza02jfg17vwmsfwg6r3gg95sh4l5rvwyx6"; + libraryHaskellDepends = [ + base bytestring happstack-server text web-routes + ]; + description = "Adds support for using web-routes with Happstack"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "web-routes-hsp" = callPackage ({ mkDerivation, base, hsp, text, web-routes }: mkDerivation { @@ -306277,8 +307526,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.4.1.2"; - sha256 = "1xdqq80jcxzd0qvmsgrcpjkw4lpcsws2pin2v3v1gpf0qv0syi36"; + version = "0.5.0.0"; + sha256 = "1kyjwg5hf3v1hxpsk9w9mdz601dyahr0a50z83bwaqgys9fb7m8d"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -306939,8 +308188,8 @@ self: { pname = "websockets"; version = "0.12.7.3"; sha256 = "0g3z0n4irf3gvbdf9p97jq05ybdg0gwjy5bj4nfc7ivsvyhaic6k"; - revision = "1"; - editedCabalFile = "1yx97y6jl74vy200y43vjxfyzx338kh10dx8vxkjhr0mfh36wldq"; + revision = "2"; + editedCabalFile = "045dsjhhwv73wrs6f91az9hvxygznmx14g6f3fv69yhz9s6lbkry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307096,19 +308345,14 @@ self: { }) {}; "wedged" = callPackage - ({ mkDerivation, array, base, colour, containers, diagrams-lib - , diagrams-postscript, MonadRandom, strict - }: + ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "wedged"; - version = "3"; - sha256 = "1v7xc7bnyhlb2fs0j8zafbnvzyl0hsdyl59f0kibmn0w6sxq34xl"; + version = "4"; + sha256 = "19zkwzj9daz1zz0g20bgr6ardqkgizhfnajdq44g7lydykjnnij4"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - array base colour containers diagrams-lib diagrams-postscript - MonadRandom strict - ]; + executableHaskellDepends = [ array base containers random ]; description = "Wedged postcard generator"; license = "unknown"; hydraPlatforms = lib.platforms.none; @@ -307177,8 +308421,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.4.1"; - sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9"; + version = "2.5.0"; + sha256 = "17i8mmkmqf0fc1gad3r5zw3ypc31q2vwqryl5n1wbh402sycn7il"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307432,41 +308676,42 @@ self: { "what4" = callPackage ({ mkDerivation, async, attoparsec, base, bifunctors, bimap - , bv-sized, bytestring, concurrent-extra, config-value, containers - , contravariant, data-binary-ieee754, deepseq, deriving-compat - , directory, exceptions, filepath, fingertree, ghc-prim, hashable - , hashtables, hedgehog, io-streams, lens, libBF, lumberjack, mtl - , panic, parameterized-utils, prettyprinter, process, QuickCheck - , scientific, tasty, tasty-checklist, tasty-expected-failure - , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-sugar - , template-haskell, temporary, text, th-abstraction, th-lift - , th-lift-instances, transformers, unordered-containers - , utf8-string, vector, versions, zenc + , BoundedChan, bv-sized, bytestring, concurrent-extra, config-value + , containers, contravariant, deepseq, deriving-compat, directory + , exceptions, filepath, fingertree, ghc-prim, hashable, hashtables + , hedgehog, io-streams, lens, libBF, lumberjack, megaparsec, mtl + , ordered-containers, panic, parameterized-utils, parsec + , prettyprinter, process, QuickCheck, s-cargot, scientific, stm + , tasty, tasty-checklist, tasty-expected-failure, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, tasty-sugar, template-haskell + , temporary, text, th-abstraction, th-lift, th-lift-instances, time + , transformers, unliftio, unordered-containers, utf8-string, vector + , versions, zenc }: mkDerivation { pname = "what4"; - version = "1.3"; - sha256 = "03p4sk543vygmah0mf1nzlxv9l3qzaiy023if3cszcwys22gr7kq"; + version = "1.4"; + sha256 = "1cmvf1cn4x3g86idbhs27f2hpm0vri51hcrvlss2bx4z85vk649b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - async attoparsec base bifunctors bimap bv-sized bytestring - concurrent-extra config-value containers data-binary-ieee754 - deepseq deriving-compat directory exceptions filepath fingertree - ghc-prim hashable hashtables io-streams lens libBF mtl panic - parameterized-utils prettyprinter process scientific - template-haskell temporary text th-abstraction th-lift - th-lift-instances transformers unordered-containers utf8-string - vector versions zenc + async attoparsec base bifunctors bimap BoundedChan bv-sized + bytestring concurrent-extra config-value containers deepseq + deriving-compat directory exceptions filepath fingertree ghc-prim + hashable hashtables io-streams lens libBF megaparsec mtl + ordered-containers panic parameterized-utils parsec prettyprinter + process s-cargot scientific stm template-haskell temporary text + th-abstraction th-lift th-lift-instances time transformers unliftio + unordered-containers utf8-string vector versions zenc ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ - base bv-sized bytestring containers contravariant - data-binary-ieee754 exceptions hedgehog io-streams libBF lumberjack + async base bv-sized bytestring containers contravariant directory + exceptions hedgehog io-streams libBF lumberjack ordered-containers parameterized-utils prettyprinter process QuickCheck tasty tasty-checklist tasty-expected-failure tasty-hedgehog tasty-hunit - tasty-quickcheck tasty-sugar text transformers versions + tasty-quickcheck tasty-sugar temporary text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -308724,8 +309969,10 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.8"; - sha256 = "0ncs3g174db6508fic7x2xibvkccmz068g6hizp8fi20bwxb9js8"; + version = "0.1.2.9"; + sha256 = "0i0bdxm9pr7a1qzr73657xy62d05a54k3ksy229q07ydz04j5mmz"; + revision = "1"; + editedCabalFile = "0fmbhinfg1lcqym0b3wx5q0zv3r7pl9l0as3rv33gh2gjcvvf2nv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309176,8 +310423,8 @@ self: { }: mkDerivation { pname = "wraxml"; - version = "0.4.4.2"; - sha256 = "1cfbbr1fbp7wrm2w7rldvf3gvp8fzvnpa6c2mkxscarhmn5wl92z"; + version = "0.4.4.3"; + sha256 = "11b48rjpj2glm5bxg8mw9m73qfprb2a8gc57s06sh0n50295di2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -309905,14 +311152,15 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets + ({ mkDerivation, base, bytestring, connection, exceptions, network + , websockets }: mkDerivation { pname = "wuss"; - version = "2.0.0.2"; - sha256 = "04jqq3blzyxqyymhcjsm5z89whk5y7cvnd9dw6nlc40vq4w4v802"; + version = "2.0.1.0"; + sha256 = "0hl8s3fwmvxw0zamz72mzhs0pf84qvpyzhd6fjk03whrvg3f4qh7"; libraryHaskellDepends = [ - base bytestring connection network websockets + base bytestring connection exceptions network websockets ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; @@ -310956,8 +312204,8 @@ self: { }: mkDerivation { pname = "xml-basic"; - version = "0.1.3.1"; - sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d"; + version = "0.1.3.2"; + sha256 = "0kj26v20rakmmxk0gf6dccmxkcv39mnpcj9dfx45yr27a53b8170"; libraryHaskellDepends = [ base containers data-accessor explicit-exception semigroups utility-ht @@ -311286,8 +312534,8 @@ self: { pname = "xml-lens"; version = "0.3.1"; sha256 = "0i6c4xqacinhxnyszzna7s9x79rrcs1c7jq6zimcwh4302l5d6cm"; - revision = "1"; - editedCabalFile = "0ga90h55aw3f946xk1x2ailnwinw3v4icw9xirgncgf3lajwxl4f"; + revision = "2"; + editedCabalFile = "0n4clndkzg6cjw0slkbrn64byzdnlsxrf6va3xgvsry9d1i18ihf"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -317612,8 +318860,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.6"; - sha256 = "0lakan23rddv8rlrd5h7jzc3g59h22hpdbjgabn4v76aaxpk3rga"; + version = "1.0.7"; + sha256 = "1ss7p1wzcxiap8zm3i6hqllkd0hkrp6bgk4magbaxpy7ic9kifb9"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary From 4cf2e4c26ee3f9ede0421aaa6b2dd7660674b5f3 Mon Sep 17 00:00:00 2001 From: Ben Orchard Date: Fri, 27 Jan 2023 14:27:33 +0000 Subject: [PATCH 04/73] haskellPackages.bytepatch: unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e1ee3b669e66..3659468d9b49 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -511,7 +511,6 @@ broken-packages: - byline - by-other-names - bytearray-parsing - - bytepatch - bytestring-aeson-orphans - bytestring-arbitrary - bytestring-class From a6755064e6033d83d540232a20df8e1e6049b577 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 29 Jan 2023 15:21:26 +0900 Subject: [PATCH 05/73] all-cabal-hashes: 2023-01-28T02:06:09Z -> 2023-01-29T01:30:53Z 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 c62287f69cf7..97f82e4f7b95 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "5214fcc83cc588cb286c8cd5a08ff366143cbd51", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/5214fcc83cc588cb286c8cd5a08ff366143cbd51.tar.gz", - "sha256": "0fcrqf913qfz5p6hh44iz552mz3wy8b46nm7vgsmqfmrkf3jhcbs", - "msg": "Update from Hackage at 2023-01-28T02:06:09Z" + "commit": "307653b893cc53ffa71d6931c33101d352e3ead1", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/307653b893cc53ffa71d6931c33101d352e3ead1.tar.gz", + "sha256": "0mgmmzdlb9j4drkjjdrp2da8z4can7gg8zd007ya2jw17rz270hz", + "msg": "Update from Hackage at 2023-01-29T01:30:53Z" } From 00e91ba5318cf568302fcaaca0bfbf16d3f3887e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 29 Jan 2023 15:32:35 +0900 Subject: [PATCH 06/73] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 211 +++++++++++++++--- 1 file changed, 176 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b5fee8137685..b01b7a8aa5bd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -75080,6 +75080,8 @@ self: { pname = "data-interval"; version = "2.1.1"; sha256 = "1gxdf1pi54s9fvxgp112b0l9f4q4r29f03caz04wbhv1f6cbs912"; + revision = "1"; + editedCabalFile = "0b7wljz2xcj8j2aka343i19rzw2lva5bbd4wp9wmrzlafp8anxpd"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -88049,8 +88051,8 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.3"; - sha256 = "16jysii88v1wkm3g7vjx9vdhzcjqq1dlfrjkf2hccrcxz8wqv4d1"; + version = "0.2.3.1"; + sha256 = "1fqld8cqrknnd18v8c92awilfdrc07lja6347zqkr4kin4b5s7s4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cryptohash-sha512 integer-gmp @@ -96553,6 +96555,8 @@ self: { pname = "fast-logger"; version = "3.1.1"; sha256 = "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3"; + revision = "1"; + editedCabalFile = "012rrm13hnaz06ssy7m8z36l8aajayd9pbk19q042wrfwsvb7jjl"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -98877,6 +98881,8 @@ self: { pname = "filemanip"; version = "0.3.6.3"; sha256 = "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8"; + revision = "1"; + editedCabalFile = "1l53qqlh9w7572n5dxk8rq0p8vsvg6m1afbak6xzdx0kgg8j6y8a"; libraryHaskellDepends = [ base bytestring directory filepath mtl unix-compat ]; @@ -101693,8 +101699,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "foldable-ix"; - version = "0.2.1.0"; - sha256 = "0sbqlii75sjmha2kmiwi36r2wdkpxdargyrrv2g60vpryvndiqck"; + version = "0.3.0.0"; + sha256 = "0n5cfihda5mhww9kb81mdhswz01bzwsrmhyh4mknsws6im8rbrpz"; + revision = "1"; + editedCabalFile = "0wgdl703cr9m5p3azzgrv1ljvrpr1b9w3nx7w6v2g3sdgj1pqf90"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; @@ -115631,8 +115639,8 @@ self: { ({ mkDerivation, base, derive-storable, glpk, hspec }: mkDerivation { pname = "glpk-headers"; - version = "0.5.0"; - sha256 = "1v9wq6y4qa6m5l6z27rwgjk0s7q8gklq05djmqspm6c456f1z2q5"; + version = "0.5.1"; + sha256 = "05rkpfrcyvynqifd6fnvmj3kcp5dfgf96fjygazx6jjrw538wnd9"; libraryHaskellDepends = [ base derive-storable ]; librarySystemDepends = [ glpk ]; testHaskellDepends = [ base hspec ]; @@ -127732,22 +127740,28 @@ self: { }) {}; "hash-addressed-cli" = callPackage - ({ mkDerivation, base, bytestring, cryptohash-sha256, directory - , filepath, hash-addressed, ini, optparse-applicative, quaalude - , resourcet, text, transformers, unordered-containers + ({ mkDerivation, base, bytestring, containers, cryptohash-sha256 + , directory, filepath, hash-addressed, ini, optparse-applicative + , quaalude, resourcet, safe-exceptions, text, transformers + , unordered-containers }: mkDerivation { pname = "hash-addressed-cli"; - version = "1.0.0.0"; - sha256 = "0b4is6bdqvq07ws5f0g55ql8jjaa1if3kxvlrxmibb73a0ak0r42"; - isLibrary = false; + version = "2.0.0.0"; + sha256 = "15ddsrny16k0wqd3nx57rw05azdxq2lhbxxyklzl1gz93vcgb6i2"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - base bytestring cryptohash-sha256 directory filepath hash-addressed - ini optparse-applicative quaalude resourcet text transformers - unordered-containers + libraryHaskellDepends = [ + base bytestring containers cryptohash-sha256 directory filepath + hash-addressed ini optparse-applicative quaalude resourcet + safe-exceptions text transformers unordered-containers ]; - description = "Hash-addressed file storage"; + executableHaskellDepends = [ + base bytestring containers cryptohash-sha256 directory filepath + hash-addressed ini optparse-applicative quaalude resourcet + safe-exceptions text transformers unordered-containers + ]; + description = "Hash-addressed file storage app"; license = lib.licenses.asl20; mainProgram = "hash-addressed"; }) {}; @@ -149474,6 +149488,29 @@ self: { mainProgram = "hsinstall"; }) {}; + "hsinstall_2_8" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, Cabal, directory, exceptions + , filepath, heredoc, newtype-generics, optparse-applicative + , process, safe-exceptions, transformers + }: + mkDerivation { + pname = "hsinstall"; + version = "2.8"; + sha256 = "1nxkmdvg7fsrmsy1033l7ghmjc859mrvc6gg6pz2xknpg0rwxx3h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ + ansi-wl-pprint base Cabal directory exceptions filepath heredoc + newtype-generics optparse-applicative process safe-exceptions + transformers + ]; + description = "Install Haskell software"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsinstall"; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -170927,8 +170964,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "5"; - editedCabalFile = "0fqzr4bwiif9ifmdjxkcnky9hn5ygn8pj3gd004dc27nx6dhxzmc"; + revision = "6"; + editedCabalFile = "15fkqfhf4pjskbivsvjnrq79667cdxf3jv2yx576vl8fkgx5l1ba"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -174958,6 +174995,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "lattices_2_1" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , integer-logarithms, QuickCheck, quickcheck-instances + , semigroupoids, tagged, tasty, tasty-quickcheck, transformers + , universe-base, universe-reverse-instances, unordered-containers + }: + mkDerivation { + pname = "lattices"; + version = "2.1"; + sha256 = "1wxam7c00bcfl3g1aiayxzjscmmbm393gfj8zmx77ijhs7v1zp3v"; + libraryHaskellDepends = [ + base base-compat containers deepseq hashable integer-logarithms + QuickCheck semigroupoids tagged transformers universe-base + universe-reverse-instances unordered-containers + ]; + testHaskellDepends = [ + base base-compat containers QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers universe-base + universe-reverse-instances unordered-containers + ]; + description = "Fine-grained library for constructing and manipulating lattices"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "launchdarkly-server-sdk" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, clock, containers, cryptohash, exceptions, extra @@ -180694,8 +180756,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lists-flines"; - version = "0.1.2.0"; - sha256 = "0m33az0fkry1p0653g3kyxi0y7flmlpivi02a5iz7drslikz6xbd"; + version = "0.1.3.0"; + sha256 = "015ln008c1nb9ajykn1kr91z8ab393xd59m8sgw1ih62k9g4f3f0"; + revision = "1"; + editedCabalFile = "0mb010y2p83n7cwxq35ynv35id6y1n14hfsjfgmvg1d8kax0g39k"; libraryHaskellDepends = [ base ]; description = "Additional data and structures to some 'String'-related lists"; license = lib.licenses.mit; @@ -187246,8 +187310,8 @@ self: { }: mkDerivation { pname = "math-programming"; - version = "0.5.0"; - sha256 = "00wivda5bi4aw3n9xqbxmdasq57l1fw1c2wi6ng99v6fjsidvlw0"; + version = "0.5.1"; + sha256 = "0lp1mjl3c01xmypcix0q8pa4id1acx418mc1vlj5hrprs30smin1"; libraryHaskellDepends = [ base containers exceptions mtl text transformers ]; @@ -187259,20 +187323,18 @@ self: { }) {}; "math-programming-glpk" = callPackage - ({ mkDerivation, base, glpk-headers, hspec, hspec-core - , math-programming, math-programming-tests, mtl, text, transformers - , unliftio + ({ mkDerivation, base, glpk-headers, hspec, math-programming + , math-programming-tests, mtl, text, transformers, unliftio }: mkDerivation { pname = "math-programming-glpk"; - version = "0.5.0"; - sha256 = "0bkk83l29hra4z3n6k6176ccqjlp9m9cawgwdnyd0c23drdm1bq9"; + version = "0.5.1"; + sha256 = "0b7r81l1gc57kxbflp4189wx4mvyxf5lf86in6vw2n76qxz04fsq"; libraryHaskellDepends = [ base glpk-headers math-programming mtl text transformers unliftio ]; testHaskellDepends = [ - base hspec hspec-core math-programming math-programming-tests - unliftio + base hspec math-programming math-programming-tests unliftio ]; description = "A GLPK backend to the math-programming library"; license = lib.licenses.bsd3; @@ -187286,8 +187348,8 @@ self: { }: mkDerivation { pname = "math-programming-tests"; - version = "0.5.0"; - sha256 = "0fa0sh5qdm8qgydrwww7i7dx12ddj816k3x1jd7byprf5gq73m5b"; + version = "0.5.1"; + sha256 = "0mfx6vs6nniprgdcpgnc2z7mpampyiqada6rsa5gkd3k8vwy6aa2"; libraryHaskellDepends = [ base containers hspec math-programming microlens microlens-mtl microlens-th mtl QuickCheck random text @@ -192264,8 +192326,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn2-array"; - version = "0.3.1.0"; - sha256 = "0r61cckjl79vinp1vh18gin3vjia8j44m529bzvpn4zd3l4qbx3x"; + version = "0.3.1.1"; + sha256 = "0f0lksih0mgfk70h3ws4yh5fshmcx2s32vva2yj3x5cx4c6w94n6"; libraryHaskellDepends = [ base ]; description = "A library that can be used for multiple Ord a => a -> b transformations"; license = lib.licenses.mit; @@ -233116,6 +233178,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "purescript-bridge_0_15_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.15.0.0"; + sha256 = "09bjlmwq3vsprngsrvx3g1ah9n60bng91kfswv61lh1bhca0q9z0"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -256727,6 +256810,34 @@ self: { mainProgram = "servant-serf"; }) {}; + "servant-serialization" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal, doctest + , flat, http-api-data, http-client, http-media, persist, QuickCheck + , serialise, servant, servant-client, servant-server, text, warp + }: + mkDerivation { + pname = "servant-serialization"; + version = "0.2.0"; + sha256 = "159vbiifpjn86vid0r88sgrm639pqaqzyvxmv1yssx6pr7yw3xb6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal flat http-media persist serialise + servant text + ]; + executableHaskellDepends = [ + aeson base binary bytestring cereal flat http-api-data http-client + http-media persist QuickCheck serialise servant servant-client + servant-server text warp + ]; + testHaskellDepends = [ + base binary bytestring cereal doctest flat http-media persist + QuickCheck serialise servant text + ]; + license = lib.licenses.mit; + mainProgram = "example"; + }) {}; + "servant-server" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, constraints, containers, directory, exceptions @@ -283105,7 +283216,7 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) libtensorflow;}; + }) {libtensorflow = null;}; "tensorflow-core-ops" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath @@ -291855,6 +291966,36 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, data-array-byte, deepseq, Diff, hashable, parsec + , parsers, pretty, primitive, QuickCheck, scientific, semialign + , strict, tagged, tasty, tasty-golden, tasty-quickcheck, text + , these, time, trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.3"; + sha256 = "12qwq7jv5fd8qrpbx12ldwwz6r3jzil0d3w9wb11nlnzrqv5dh51"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers data-array-byte deepseq hashable + parsec parsers pretty primitive QuickCheck scientific semialign + strict tagged text these time unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { From c4d460810e6ff1c98c5643c5f9ee804ce18a1e17 Mon Sep 17 00:00:00 2001 From: Patrick Steele Date: Wed, 18 Jan 2023 22:31:53 -0500 Subject: [PATCH 07/73] haskellPackages: mark some broken packages as not broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 2 -- .../configuration-hackage2nix/transitive-broken.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 6 ------ 3 files changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e1ee3b669e66..e3bf12a72df5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1822,7 +1822,6 @@ broken-packages: - gloss-banana - gloss-export - gloss-game - - glpk-headers - gltf-codec - glue - g-npm @@ -3248,7 +3247,6 @@ broken-packages: - math-grads - math-interpolate - math-metric - - math-programming - matrix-as-xyz - matrix-lens - matrix-market diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 136fe881b2b5..53af5dfc937b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2724,8 +2724,6 @@ dont-distribute-packages: - marvin - masakazu-bot - matchers - - math-programming-glpk - - math-programming-tests - mathblog - mathlink - matsuri diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b01b7a8aa5bd..e9c544f4ce33 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -115646,8 +115646,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Low-level Haskell bindings to the GLPK library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) glpk;}; "glpk-hs" = callPackage @@ -187318,8 +187316,6 @@ self: { testHaskellDepends = [ base hspec mtl QuickCheck text ]; description = "A library for formulating and solving math programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "math-programming-glpk" = callPackage @@ -187338,7 +187334,6 @@ self: { ]; description = "A GLPK backend to the math-programming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "math-programming-tests" = callPackage @@ -187356,7 +187351,6 @@ self: { ]; description = "Utility functions for testing implementations of the math-programming library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mathblog" = callPackage From e92ea6d48dba7a0ff2c765d1eaefd31200f90ddb Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Jan 2023 12:10:44 +0100 Subject: [PATCH 08/73] haskellPackages: Fix eval by bumping pinned versions --- .../haskell-modules/configuration-common.nix | 16 ++++++++-------- .../haskell-modules/configuration-ghc-9.4.x.nix | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 548110cafc11..32cf98eca0d2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -747,9 +747,9 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_8; + hspec = self.hspec_2_10_9; hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_8; + hspec = self.hspec_2_10_9; }; }); @@ -1376,7 +1376,7 @@ self: super: { hls-hlint-plugin = super.hls-hlint-plugin.override { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" super.hlint; - apply-refact = self.apply-refact_0_11_0_0; + apply-refact = self.apply-refact_0_12_0_0; }; # For -f-auto see cabal.project in haskell-language-server. @@ -1436,14 +1436,14 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_8 = doDistribute (super.hspec_2_10_8.override { - hspec-discover = self.hspec-discover_2_10_8; - hspec-core = self.hspec-core_2_10_8; + hspec_2_10_9 = doDistribute (super.hspec_2_10_9.override { + hspec-discover = self.hspec-discover_2_10_9; + hspec-core = self.hspec-core_2_10_9; }); - hspec-discover_2_10_8 = super.hspec-discover_2_10_8.override { + hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override { hspec-meta = self.hspec-meta_2_10_5; }; - hspec-core_2_10_8 = super.hspec-core_2_10_8.override { + hspec-core_2_10_9 = super.hspec-core_2_10_9.override { hspec-meta = self.hspec-meta_2_10_5; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e927b040417c..cb86963d83a1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -111,10 +111,10 @@ in { # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_8; - hspec-core = self.hspec-core_2_10_8; + hspec = self.hspec_2_10_9; + hspec-core = self.hspec-core_2_10_9; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_8; + hspec-discover = self.hspec-discover_2_10_9; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 From 3ead6d03227e5ee55efc0b43d622204702b205bf Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 29 Jan 2023 16:10:08 +0900 Subject: [PATCH 09/73] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9c544f4ce33..e105bb568dc8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50756,10 +50756,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Patch byte-representable data in a bytestream"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "bytepatch"; maintainers = [ lib.maintainers.raehik ]; - broken = true; }) {}; "bytes" = callPackage From 3988efd73f74a4c30d0fac0a926e46ba1b2905ee Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Jan 2023 22:10:31 +0100 Subject: [PATCH 10/73] haskellPackages.ghcide: Drop maintainership Because I only care about it as a dependency of haskell-language-server --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d61ab5200ceb..4980c5205b77 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -296,7 +296,6 @@ package-maintainers: - emanote - generic-optics - ghcid - - ghcide - haskell-language-server - hedgehog - hledger diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e105bb568dc8..e075ad8effca 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111601,7 +111601,6 @@ self: { testToolDepends = [ implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "ghcide-bench" = callPackage From 3b23105b0bf9e42e26389ee17d843dedc4f9c6d8 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Jan 2023 22:12:44 +0100 Subject: [PATCH 11/73] haskellPackages.clay: Fix build and make maralorn maintainer --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 32cf98eca0d2..5d940140ecc2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -171,6 +171,9 @@ self: super: { # Fails no apparent reason. Upstream has been notified by e-mail. assertions = dontCheck super.assertions; + # 2023-01-29: Restrictive base bound already loosened on master but not released: https://github.com/sebastiaanvisser/clay/commit/4483bdf7a452903f177220958f1610030ab7f28a + clay = throwIfNot (super.clay.version == "0.14.0") "Remove clay jailbreak in configuration-common.nix when you see this eval error." (doJailbreak super.clay); + # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0347d89d53d7..f13d781d1b65 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -704,7 +704,6 @@ broken-packages: - classy-parallel - classyplate - ClassyPrelude - - clay - clckwrks-plugin-bugs - clckwrks-plugin-mailinglist - clckwrks-theme-clckwrks diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4980c5205b77..92878370cf09 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -292,6 +292,7 @@ package-maintainers: - sensei maralorn: - cabal-fmt + - clay - ema - emanote - generic-optics diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e075ad8effca..58df97832ba0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -59982,8 +59982,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "clckwrks" = callPackage From 8298122fcb0773eac4a73f0f1fdaef60bbc6680c Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Jan 2023 22:20:59 +0100 Subject: [PATCH 12/73] haskellPackages.graphql-client: Fix build and make maralorn maintainer --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 4 +--- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5d940140ecc2..d5e8b5cae94c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -203,6 +203,9 @@ self: super: { # base bound digit = doJailbreak super.digit; + # 2022-01-29: Tests require package to be in ghc-db. + aeson-schemas = dontCheck super.aeson-schemas; + # matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0 matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { brick = self.brick_0_70_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f13d781d1b65..8b444b897083 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -86,7 +86,6 @@ broken-packages: - aeson-parsec-picky - aeson-prefix - aeson-schema - - aeson-schemas - aeson-smart - aeson-streams - aeson-t diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 92878370cf09..e04809dbc813 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -297,6 +297,7 @@ package-maintainers: - emanote - generic-optics - ghcid + - graphql-client - haskell-language-server - hedgehog - hledger diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 53af5dfc937b..09ea2c9cc5d7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1858,7 +1858,6 @@ dont-distribute-packages: - graph-visit - graphicsFormats - graphicstools - - graphql-client - graphtype - greencard-lib - grenade diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 58df97832ba0..9f147be76a18 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26313,8 +26313,6 @@ self: { ]; description = "Easily consume JSON data on-demand with type-safety"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "aeson-serialize" = callPackage @@ -120349,8 +120347,8 @@ self: { ]; description = "A client for Haskell programs to query a GraphQL API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "graphql-codegen"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "graphql-spice" = callPackage From 0ff0d08f690a17a6b3ebdc58709989e3f31a4b8b Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Jan 2023 22:28:04 +0100 Subject: [PATCH 13/73] haskellPackages.streamly-bytestring: Fix build and make maralorn maintainer --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d5e8b5cae94c..2a31fd4d5063 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -200,6 +200,9 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; + # 2022-01-29: Tests fail: https://github.com/psibi/streamly-bytestring/issues/27 + streamly-bytestring = dontCheck super.streamly-bytestring; + # base bound digit = doJailbreak super.digit; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8b444b897083..c7ed9c13db0d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5047,7 +5047,6 @@ broken-packages: - streaming-sort - streamly-archive - streamly-binary - - streamly-bytestring - streamly-cassava - streamly-examples - streamly-lmdb diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e04809dbc813..9802708ee6c6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -323,6 +323,7 @@ package-maintainers: - snap - stm-containers - streamly + - streamly-bytestring - taskwarrior - tz - weeder diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9f147be76a18..1bd8b0bb95d4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -273738,8 +273738,7 @@ self: { ]; description = "Library for streamly and bytestring interoperation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "streamly-cassava" = callPackage From 6af08442d676440e6495b310871abe3067128809 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Jan 2023 22:32:59 +0100 Subject: [PATCH 14/73] haskellPackages.pandoc-{cli,crossref}: Make maralorn maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 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 9802708ee6c6..e7f1671af514 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -310,6 +310,8 @@ package-maintainers: - matrix-client - optics - pandoc + - pandoc-cli + - pandoc-crossref - paths - postgresql-simple - purebred-email diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1bd8b0bb95d4..df6f3890a734 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -213037,6 +213037,7 @@ self: { description = "Conversion between documentation formats"; license = lib.licenses.gpl2Plus; mainProgram = "pandoc"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "pandoc-crossref" = callPackage @@ -213074,6 +213075,7 @@ self: { description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "pandoc-csv2table" = callPackage From 4be2c3acd51fe2785be278b59195def0dbd8834e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 30 Jan 2023 08:27:03 +0900 Subject: [PATCH 15/73] haskellPackages: ignore maintainers without email The Haskell Hydra report generator (`maintainers/scripts/haskell/hydra-report.hs`) uses this `maintainer-handles.nix` script for generating a mapping of email addresses to GitHub handles. This `maintainer-handles.nix` script is necessary because the Haskell Hydra report generator gets Hydra job status info as input, but needs to ping users on GitHub. Hydra job status info only contains user emails (not GitHub handles). So the `maintainer-handles.nix` script is necessary for looking up GitHub handles from email addresses. This commit fixes the `maintainers-handles.nix` code to ignore maintainers that don't have email addresses. The code was originally assuming that all maintainers have email addresses, but there was recently a maintainer added without an email address. --- .../scripts/haskell/maintainer-handles.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/maintainer-handles.nix b/maintainers/scripts/haskell/maintainer-handles.nix index 08c6bc4c96af..d650e82f8b0c 100644 --- a/maintainers/scripts/haskell/maintainer-handles.nix +++ b/maintainers/scripts/haskell/maintainer-handles.nix @@ -1,7 +1,21 @@ # Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs. +# +# This script produces an attr set mapping of email addresses to GitHub handles: +# +# ```nix +# > import ./maintainer-handles.nix +# { "cdep.illabout@gmail.com" = "cdepillabout"; "john@smith.com" = "johnsmith"; ... } +# ``` +# +# This mapping contains all maintainers in ../../mainatainer-list.nix, but it +# ignores maintainers who don't have a GitHub account or an email address. let pkgs = import ../../.. {}; maintainers = import ../../maintainer-list.nix; inherit (pkgs) lib; - mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {}; + mkMailGithubPair = _: maintainer: + if (maintainer ? email) && (maintainer ? github) then + { "${maintainer.email}" = maintainer.github; } + else + {}; in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers) From 7a70efc3e57bc7d5cf6609b7aca127f2c4cf1b08 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 Jan 2023 10:59:07 +0100 Subject: [PATCH 16/73] haskellPackages.hopenssl: link against openssl 3.0 https://github.com/peti/hopenssl/issues/5#issuecomment-1383686682 --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2a31fd4d5063..7b6f44cd33ec 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2035,9 +2035,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # https://github.com/peti/hopenssl/issues/5 - hopenssl = super.hopenssl.override { openssl = pkgs.openssl_1_1; }; - # Fixes compilation with GHC 9.0 and above # https://hub.darcs.net/shelarcy/regex-compat-tdfa/issue/3 regex-compat-tdfa = appendPatches [ From 3ecdb69dd654f587b21154190ded65e507c0d197 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 Jan 2023 11:07:14 +0100 Subject: [PATCH 17/73] haskellPackages.FailT: remove broken flag https://github.com/lehins/FailT/issues/1#issuecomment-1380597329 --- .../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 c7ed9c13db0d..1ce98a73aa6a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1443,7 +1443,6 @@ broken-packages: - fadno-braids - fadno-xml - failable-list - - FailT - failure-detector - fake - fake-type diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index df6f3890a734..c5c45f200699 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6008,8 +6008,6 @@ self: { ]; description = "A 'FailT' monad transformer that plays well with 'MonadFail'"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "FailureT" = callPackage From a16864e2bfd4c89677e539ff17a325d5785f98cc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 Jan 2023 11:15:25 +0100 Subject: [PATCH 18/73] git-annex: update sha256 for 10.20230126 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b6f44cd33ec..8fd3d31c304b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -80,7 +80,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "052ld021yvjbnx1sbj1ryflsyn0v1y1ygx1zv0ql6fk3cysw5lxf"; + sha256 = "0f2nnszfiqwdgfky3190prkhcndp0mva3jk7a6cl461w8kp1jspa"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From a0b05699ae315a04de4db09f8087b5b083357300 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 2 Feb 2023 12:46:21 +0100 Subject: [PATCH 19/73] haskell.packages.ghc92.weeder: pin to supported 2.4.* versions weeder 2.5.* requires GHC 9.4 --- .../configuration-ghc-9.2.x.nix | 3 +++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 54994347dd93..8e3f63ec83d6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -61,6 +61,9 @@ self: super: { process = self.process_1_6_16_0; }); + # weeder == 2.5.* requires GHC 9.4 + weeder = doDistribute self.weeder_2_4_1; + # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e7f1671af514..6d308dd2e696 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -157,6 +157,7 @@ extra-packages: - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 + - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* - commonmark-extensions < 0.2.3.3 # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3) - ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3 - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c5c45f200699..f32c35b20255 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -308542,6 +308542,33 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "weeder_2_4_1" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.4.1"; + sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "weeder"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "weeder" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl From 77d65a56a9ad9ba9e4b22faa7f44ff1a86fd5e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 2 Feb 2023 13:45:03 +0100 Subject: [PATCH 20/73] haskell-language-server: fix --- .../haskell-modules/configuration-common.nix | 2 +- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 37 ++++++++++++++++++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8fd3d31c304b..ef462c56bffc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1385,7 +1385,7 @@ self: super: { hls-hlint-plugin = super.hls-hlint-plugin.override { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" super.hlint; - apply-refact = self.apply-refact_0_12_0_0; + apply-refact = self.apply-refact_0_11_0_0; }; # For -f-auto see cabal.project in haskell-language-server. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6d308dd2e696..8d2e1b71f5b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -96,6 +96,7 @@ extra-packages: - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 + - apply-refact == 0.11.* # 2023-02-02: needed for hls-hlint-plugin on GHC 9.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - base16-bytestring < 1 # required for cabal-install etc. - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f32c35b20255..0eb7dfc8900d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -33567,6 +33567,41 @@ self: { mainProgram = "refactor"; }) {}; + "apply-refact_0_11_0_0" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths + , optparse-applicative, process, refact, silently, syb, tasty + , tasty-expected-failure, tasty-golden, transformers, uniplate + , unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.11.0.0"; + sha256 = "1bmm9s8h5grqp1c8m1x9icbhznfc565za8w3sqfpiylid7c7fz72"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-boot-th + ghc-exactprint ghc-paths process refact syb transformers uniplate + unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact syb + transformers uniplate unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint ghc-paths optparse-applicative process refact + silently syb tasty tasty-expected-failure tasty-golden transformers + uniplate unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "refactor"; + }) {}; + "apply-refact_0_12_0_0" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths @@ -283203,7 +283238,7 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {libtensorflow = null;}; + }) {inherit (pkgs) libtensorflow;}; "tensorflow-core-ops" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath From b2c5d3449b47d654aaf3b93d34f53651445d77fc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Feb 2023 00:27:37 +0100 Subject: [PATCH 21/73] haskellPackages: propagate platform meta values where necessary --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8d2e1b71f5b7..52373f6b7c95 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -467,6 +467,7 @@ unsupported-platforms: bindings-directfb: [ platforms.darwin ] bindings-sane: [ platforms.darwin ] bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r + bytelog: [ platforms.darwin ] # due to posix-api camfort: [ aarch64-linux ] charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 cut-the-crap: [ platforms.darwin ] @@ -570,6 +571,7 @@ supported-platforms: bindings-parport: [ platforms.linux ] # parport is a linux kernel component blake3: [ platforms.x86 ] # uses x86 intrinsics btrfs: [ platforms.linux ] # depends on linux + bytepatch: [ platforms.x86 ] # due to blake3 cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32) crc32c: [ platforms.x86 ] # uses x86 intrinsics d3d11binding: [ platforms.windows ] @@ -613,6 +615,7 @@ supported-platforms: scat: [ platforms.x86 ] # uses scrypt, which requries x86 scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8 seqalign: [ platforms.x86 ] # x86 intrinsics + tasty-papi: [ platforms.linux ] # limited by pkgs.papi udev: [ platforms.linux ] Win32-console: [ platforms.windows ] Win32-dhcp-server: [ platforms.windows ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0eb7dfc8900d..1c4f805fd4d3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50741,6 +50741,7 @@ self: { ]; description = "Fast logging"; license = lib.licenses.bsd3; + badPlatforms = lib.platforms.darwin; }) {}; "byteorder" = callPackage @@ -50787,6 +50788,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Patch byte-representable data in a bytestream"; license = lib.licenses.mit; + platforms = lib.platforms.x86; mainProgram = "bytepatch"; maintainers = [ lib.maintainers.raehik ]; }) {}; @@ -281634,6 +281636,7 @@ self: { testHaskellDepends = [ base tasty ]; description = "Bencmarking using instruction counting"; license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }) {inherit (pkgs) papi;}; "tasty-prelude" = callPackage From 63862f4a66c19edc38280c51386513f5cee30afc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Feb 2023 01:44:36 +0100 Subject: [PATCH 22/73] haskell.packages.ghc94.X11-xft: automate workaround for cabal#8455 The current workaround for the regression is propagating the runtime dependency closure (technically only Requires.private in the pkg-config files). This can easily be done automatically by mimicking how e.g. pkgsStatic converts buildInputs to propagatedBuildInputs. This is extracted into a helper function, __CabalEagerPkgConfigWorkaround, which can be applied to any package easily. --- .../configuration-ghc-9.4.x.nix | 6 ++- .../haskell-modules/lib/compose.nix | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 025b983305e6..99369274debf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -203,7 +203,9 @@ in { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); - # The Haskell library has additional dependencies when compiled with ghc-9.4.x. - X11-xft = addExtraLibraries [pkgs.xorg.libXau pkgs.xorg.libXdmcp pkgs.expat] super.X11-xft; + # Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455 + # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so + # the GHC 9.6 configuration may need similar overrides eventually. + X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; } diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index ebaba1a22fa6..647e95211f1c 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -464,4 +464,44 @@ rec { allowInconsistentDependencies = overrideCabal (drv: { allowInconsistentDependencies = true; }); + + # Work around a Cabal bug requiring pkg-config --static --libs to work even + # when linking dynamically, affecting Cabal 3.8 and 3.9. + # https://github.com/haskell/cabal/issues/8455 + # + # For this, we treat the runtime system/pkg-config dependencies of a Haskell + # derivation as if they were propagated from their dependencies which allows + # pkg-config --static to work in most cases. + # + # Warning: This function may change or be removed at any time, e.g. if we find + # a different workaround, upstream fixes the bug or we patch Cabal. + __CabalEagerPkgConfigWorkaround = + let + # Take list of derivations and return list of the transitive dependency + # closure, only taking into account buildInputs. Loosely based on + # closePropagationFast. + propagatedPlainBuildInputs = drvs: + builtins.map (i: i.val) ( + builtins.genericClosure { + startSet = builtins.map (drv: + { key = drv.outPath; val = drv; } + ) drvs; + operator = { val, ... }: + if !lib.isDerivation val + then [ ] + else + builtins.concatMap (drv: + if !lib.isDerivation drv + then [ ] + else [ { key = drv.outPath; val = drv; } ] + ) val.buildInputs or [ ]; + } + ); + in + overrideCabal (old: { + benchmarkPkgconfigDepends = propagatedPlainBuildInputs old.benchmarkPkgconfigDepends or [ ]; + executablePkgconfigDepends = propagatedPlainBuildInputs old.executablePkgconfigDepends or [ ]; + libraryPkgconfigDepends = propagatedPlainBuildInputs old.libraryPkgconfigDepends or [ ]; + testPkgconfigDepends = propagatedPlainBuildInputs old.testPkgconfigDepends or [ ]; + }); } From 962633e4d16c3a268f1e48e509a156cc33ba99ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 09:41:56 +0100 Subject: [PATCH 23/73] haskell.packages.ghc94.gtk2hs-buildtools: gtk2hs setup hook broken for ghc-9.4.4 See https://github.com/gtk2hs/gtk2hs/issues/323 for details. --- .../haskell-modules/configuration-ghc-9.4.x.nix | 5 +++++ pkgs/development/haskell-modules/lib/compose.nix | 2 +- .../patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 99369274debf..1261719185e3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -208,4 +208,9 @@ in { # the GHC 9.6 configuration may need similar overrides eventually. X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; + # The gtk2hs setup hook provided by this package lacks the ppOrdering field that + # recent versions of Cabal require. This leads to builds like cairo and glib + # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323. + gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools; + } diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 647e95211f1c..fa6d2a20a9a2 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -494,7 +494,7 @@ rec { if !lib.isDerivation drv then [ ] else [ { key = drv.outPath; val = drv; } ] - ) val.buildInputs or [ ]; + ) (val.buildInputs or [ ] ++ val.propagatedBuildInputs or [ ]); } ); in diff --git a/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch new file mode 100644 index 000000000000..948a0366ca4e --- /dev/null +++ b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch @@ -0,0 +1,12 @@ +diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs +index 598048f..b652b76 100644 +--- a/src/Gtk2HsSetup.hs ++++ b/src/Gtk2HsSetup.hs +@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor + ourC2hs bi lbi = PreProcessor { + #endif + platformIndependent = False, ++ ppOrdering = (\ _ _ ms -> return ms), + runPreProcessor = runC2HS bi lbi + } + From ef3a8f19ac1ce48907ebee72da6550f6e3d6454a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Feb 2023 01:48:16 +0100 Subject: [PATCH 24/73] haskell.packages.ghc94.{glib,cairo,pango}: apply cabal#8455 fix The package also need an additional jailbreak due to a strict text bound. https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 1261719185e3..15c3901cfa04 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -207,6 +207,10 @@ in { # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so # the GHC 9.6 configuration may need similar overrides eventually. X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; + # Jailbreaks for https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309 + glib = __CabalEagerPkgConfigWorkaround (doJailbreak super.glib); + cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo); + pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango); # The gtk2hs setup hook provided by this package lacks the ppOrdering field that # recent versions of Cabal require. This leads to builds like cairo and glib From 83f8025e543f01616ffb49efb401c565e815b3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 4 Feb 2023 10:27:09 +0100 Subject: [PATCH 25/73] haskellPackages.hslua-list: unmark as broken --- .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 19 +++++++++---------- .../haskell-modules/hackage-packages.nix | 19 ++++++++----------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1ce98a73aa6a..6d10c626a9b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2480,7 +2480,6 @@ broken-packages: - hslogger-template - hs-logo - hslua-examples - - hslua-list - hsluv-haskell - hsmagick - hsmodetweaks diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 09ea2c9cc5d7..e3cc5ad4d9b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -247,6 +247,7 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 + - LPFP - LPPaver - LambdaHack - LambdaINet @@ -676,7 +677,7 @@ dont-distribute-packages: - ascii-superset_1_2_5_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_5_1_0 + - ascii_1_5_2_0 - asic - asil - assert4hs-hspec @@ -811,6 +812,7 @@ dont-distribute-packages: - bitcoin-types - bitcoind-regtest - bitcoind-rpc + - bitfield - bitly-cli - bitmaps - bittorrent @@ -1116,7 +1118,6 @@ dont-distribute-packages: - crf-chain1-constrained - crf-chain2-generic - crf-chain2-tiers - - criterion-compare - criu-rpc - crockford - cron-compat @@ -1394,6 +1395,7 @@ dont-distribute-packages: - eventuo11y - eventuo11y-batteries - eventuo11y-json + - eventuo11y-otel - every-bit-counts - ewe - exference @@ -1863,6 +1865,7 @@ dont-distribute-packages: - grenade - gridbounds - gridland + - grisette - groot - gross - groundhog-converters @@ -2200,8 +2203,6 @@ dont-distribute-packages: - hpaco-lib - hpage - hpaste - - hpath-directory - - hpath-io - hpc-tracer - hplayground - hpqtypes-effectful @@ -2251,7 +2252,6 @@ dont-distribute-packages: - hsfacter - hsinspect-lsp - hslogstash - - hslua-module-zip - hsndfile-storablevector - hspec-expectations-pretty - hspec-pg-transact @@ -2368,6 +2368,7 @@ dont-distribute-packages: - instant-deepseq - instant-hashable - instant-zipper + - instrument-cloudwatch - integreat - intel-aes - interpolatedstring-qq @@ -3047,6 +3048,8 @@ dont-distribute-packages: - persistable-record - persistable-types-HDBC-pg - persistent-audit + - persistent-event-source + - persistent-eventsource - persistent-hssqlppp - persistent-map - persistent-mtl @@ -3464,6 +3467,7 @@ dont-distribute-packages: - satchmo-funsat - satchmo-toysat - sauron + - sbv-program - sbvPlugin - sc2-lowlevel - sc2-support @@ -3547,7 +3551,6 @@ dont-distribute-packages: - servant-streaming-client - servant-streaming-docs - servant-streaming-server - - servant-streamly - servant-swagger-tags - servant-to-elm - servant-util @@ -3626,7 +3629,6 @@ dont-distribute-packages: - smtlib2-quickcheck - smtlib2-timing - smtp2mta - - snap-blaze-clay - snap-elm - snap-extras - snaplet-actionlog @@ -3738,7 +3740,6 @@ dont-distribute-packages: - streamed - streaming-fft - streaming-process - - streamly-posix - strelka - strelka-wai - strict-containers-lens @@ -3880,7 +3881,6 @@ dont-distribute-packages: - theoremquest-client - thimk - threaded - - threepenny-gui-flexbox - thumbnail-polish - tic-tac-toe - tickle @@ -4124,7 +4124,6 @@ dont-distribute-packages: - weatherhs - web-inv-route - web-mongrel2 - - web-page - web-rep - web-routes-regular - web-routing diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1c4f805fd4d3..1b786cb26072 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12651,6 +12651,7 @@ self: { ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "LPPaver" = callPackage @@ -45473,6 +45474,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Generic and easy to use haskell bitfields"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "bitly-cli" = callPackage @@ -70761,7 +70763,6 @@ self: { ]; description = "A simple tool for visualising differences in Criterion benchmark results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "criterion-compare"; }) {}; @@ -94027,6 +94028,7 @@ self: { ]; description = "OpenTelemetry-based rendering for eventuo11y"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "every" = callPackage @@ -121071,6 +121073,7 @@ self: { ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "grm" = callPackage @@ -145590,7 +145593,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Alternative to 'directory' package with ByteString based filepaths"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpath-filepath" = callPackage @@ -145619,7 +145621,6 @@ self: { ]; description = "High-level IO operations on files/directories"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpath-posix" = callPackage @@ -149832,8 +149833,6 @@ self: { testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hslua-marshalling" = callPackage @@ -149969,7 +149968,6 @@ self: { ]; description = "Lua module to work with file zips"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-objectorientation" = callPackage @@ -161844,6 +161842,7 @@ self: { ]; description = "Adds a worker for the instrument package that exports to Amazon CloudWatch"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "int-cast" = callPackage @@ -218590,6 +218589,7 @@ self: { ]; description = "Persistent based event sourcing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "persistent-eventsource" = callPackage @@ -218611,6 +218611,7 @@ self: { ]; description = "Persistent based event sourcing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "persistent-generic" = callPackage @@ -250707,6 +250708,7 @@ self: { testHaskellDepends = [ base sbv ]; description = "Component-based program synthesis using SBV"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sbvPlugin" = callPackage @@ -257145,7 +257147,6 @@ self: { ]; description = "Servant Stream support for streamly"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "servant-streamly-example"; }) {}; @@ -264950,7 +264951,6 @@ self: { libraryHaskellDepends = [ base blaze-html clay snap-core ]; description = "blaze-html-clay integration for Snap"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "snap-configuration-utilities" = callPackage @@ -273903,7 +273903,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Posix related streaming APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streamly-process" = callPackage @@ -287154,7 +287153,6 @@ self: { executableHaskellDepends = [ base threepenny-gui ]; description = "Flexbox layouts for Threepenny-gui"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "threepenny-flexbox-exe"; }) {}; @@ -307188,7 +307186,6 @@ self: { ]; description = "Monoidally construct web pages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "web-plugins" = callPackage From bfd3325932e0baef86758bb4252ca67b427c2492 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 09:40:40 +0100 Subject: [PATCH 26/73] haskell.packages.ghc94.libmpd: needs a jailbreak to succeed --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 15c3901cfa04..8e87f09f89f4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -105,7 +105,7 @@ in { singleton-bool = doJailbreak super.singleton-bool; rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; shake-cabal = doDistribute self.shake-cabal_0_2_2_3; - + libmpd = doJailbreak super.libmpd; base-orphans = dontCheck super.base-orphans; # Note: Any compilation fixes need to be done on the versioned attributes, From f0a4d9833312215b4721ce2be9ff7e17b9e54616 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 10:24:25 +0100 Subject: [PATCH 27/73] haskell.packages.ghc94.ormolu: use latest version for ghc-9.4.x --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 8e87f09f89f4..688df24c5342 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -196,9 +196,7 @@ in { }; # https://github.com/tweag/ormolu/issues/941 - ormolu = overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.ormolu); + ormolu = doDistribute self.ormolu_0_5_2_0; fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); From 20f68e74e8a24ebace34351ea693b7cb5fc4f4e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 10:35:38 +0100 Subject: [PATCH 28/73] haskell.packages.ghc94.haskell-language-server: update list of supported plugins --- .../haskell-modules/configuration-ghc-9.4.x.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 688df24c5342..30d117103c83 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -184,14 +184,13 @@ in { }) self.ghc-exactprint_1_6_1_1; - # 2022-10-06: plugins disabled for hls 1.8.0.0 based on + # 2023-02-01: plugins disabled for hls 1.9.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { - hls-refactor-plugin = null; hls-eval-plugin = null; - hls-floskell-plugin = null; - hls-ormolu-plugin = null; - hls-rename-plugin = null; + hls-ormolu-plugin = null; # This plugin is supposed to work, but fails to compile. + hls-floskell-plugin = null; # This plugin is supposed to work, but fails to compile. + hls-rename-plugin = null; # This plugin is supposed to work, but fails to compile. hls-stylish-haskell-plugin = null; }; From 18c0c48857f550e3b85bc51390593f1c0a4aa2bd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 20 Jan 2023 19:10:46 +0100 Subject: [PATCH 29/73] haskellPackages.mkDerivation: buildPkgDb: use haskellCompilerName --- pkgs/development/haskell-modules/generic-builder.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4b7201bb6ac9..5cb44f35a062 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -287,7 +287,7 @@ let nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; - buildPkgDb = ghcName: packageConfDir: '' + buildPkgDb = thisGhc: packageConfDir: '' # If this dependency has a package database, then copy the contents of it, # unless it is one of our GHCs. These can appear in our dependencies when # we are doing native builds, and they have package databases in them, but @@ -297,8 +297,8 @@ let # we compile with it, and doing so can result in having multiple copies of # e.g. Cabal in the database with the same name and version, which is # ambiguous. - if [ -d "$p/lib/${ghcName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then - cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf ${packageConfDir}/ + if [ -d "$p/lib/${thisGhc.haskellCompilerName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then + cp -f "$p/lib/${thisGhc.haskellCompilerName}/package.conf.d/"*.conf ${packageConfDir}/ continue fi ''; @@ -363,14 +363,14 @@ stdenv.mkDerivation ({ # pkgs* arrays defined in stdenv/setup.hs + '' for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do - ${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"} + ${buildPkgDb nativeGhc "$setupPackageConfDir"} done ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache '' # For normal components + '' for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do - ${buildPkgDb ghcNameWithPrefix "$packageConfDir"} + ${buildPkgDb ghc "$packageConfDir"} if [ -d "$p/include" ]; then configureFlags+=" --extra-include-dirs=$p/include" fi From a9b8a272ea8c9ce1a13dd49af679ebc2b31626bd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 02:12:17 +0100 Subject: [PATCH 30/73] haskellPackages.mkDerivation: refactor libdir calculation --- .../haskell-modules/generic-builder.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5cb44f35a062..fc3af476a3b4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -199,6 +199,7 @@ let defaultConfigureFlags = [ "--verbose" "--prefix=$out" + # Note: This must be kept in sync manually with mkGhcLibdir "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}") @@ -207,7 +208,7 @@ let "--with-gcc=$CC" # Clang won't work without that extra information. ] ++ [ "--package-db=$packageConfDir" - (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}") + (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/${ghcLibdir}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") @@ -284,6 +285,8 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}"; + mkGhcLibdir = ghc: "lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; + ghcLibdir = mkGhcLibdir ghc; nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; @@ -297,8 +300,8 @@ let # we compile with it, and doing so can result in having multiple copies of # e.g. Cabal in the database with the same name and version, which is # ambiguous. - if [ -d "$p/lib/${thisGhc.haskellCompilerName}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then - cp -f "$p/lib/${thisGhc.haskellCompilerName}/package.conf.d/"*.conf ${packageConfDir}/ + if [ -d "$p/${mkGhcLibdir thisGhc}/package.conf.d" ] && [ "$p" != "${ghc}" ] && [ "$p" != "${nativeGhc}" ]; then + cp -f "$p/${mkGhcLibdir thisGhc}/package.conf.d/"*.conf ${packageConfDir}/ continue fi ''; @@ -510,7 +513,7 @@ stdenv.mkDerivation ({ # just the target specified; "install" will error here, since not all targets have been built. else '' ${setupCommand} copy ${buildTarget} - local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d" + local packageConfDir="$out/${ghcLibdir}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" mkdir -p "$packageConfDir" ${setupCommand} register --gen-pkg-config=$packageConfFile @@ -539,7 +542,7 @@ stdenv.mkDerivation ({ ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && lib.versionOlder ghc.version "7.10") '' for exe in "${binDir}/"* ; do - install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" + install_name_tool -add_rpath "$out/${ghcLibdir}/${pname}-${version}" "$exe" done ''} @@ -675,7 +678,7 @@ stdenv.mkDerivation ({ "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html"; "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" - else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}"; + else "${ghcEnv}/${ghcLibdir}"; }); env = envFunc { }; From f45f7cb3e0f70279f6752ddef2ad4011c8e29cdc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 02:17:29 +0100 Subject: [PATCH 31/73] haskellPackages: support hadrian libdir layout --- pkgs/development/haskell-modules/generic-builder.nix | 5 +++-- pkgs/development/haskell-modules/with-packages-wrapper.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index fc3af476a3b4..73986361499a 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -200,7 +200,7 @@ let "--verbose" "--prefix=$out" # Note: This must be kept in sync manually with mkGhcLibdir - "--libdir=\\$prefix/lib/\\$compiler" + ("--libdir=\\$prefix/lib/\\$compiler" + lib.optionalString (ghc ? hadrian) "/lib") "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") @@ -285,7 +285,8 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}"; - mkGhcLibdir = ghc: "lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; + mkGhcLibdir = ghc: "lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + + lib.optionalString (ghc ? hadrian) "/lib"; ghcLibdir = mkGhcLibdir ghc; nativeGhcCommand = "${nativeGhc.targetPrefix}ghc"; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 77ccd301b43f..e09e9825f555 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -53,7 +53,8 @@ let ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" - else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; + else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" + + lib.optionalString (ghc ? hadrian) "/lib"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.concatLists ( From 5318038186d0a83371d66ecfcc5732b109d2f2c8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 02:18:12 +0100 Subject: [PATCH 32/73] haskellPackages.ghcWithPackages: fix whitespace alignment --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index e09e9825f555..34eb2b71d759 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -49,8 +49,8 @@ let isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}" From 902701c0cfe4727dd21a457cbece7dfd7f859a48 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 13:21:52 +0100 Subject: [PATCH 33/73] haskell.compiler.ghc924Binary: tag bindists built using hadrian `ghc ? hadrian` can be used to check if a GHC was built using hadrian. This is often relevant since hadrian changed the ghc libdir location, so we need to install libs to a different location as well. --- pkgs/development/compilers/ghc/9.2.4-binary.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 57e0db560a98..79b006ce5537 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -94,6 +94,7 @@ let { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; + isHadrian = true; }; aarch64-darwin = { variantSuffix = ""; @@ -107,6 +108,7 @@ let { nixPackage = ncurses6; fileToCheckFor = null; } { nixPackage = libiconv; fileToCheckFor = null; } ]; + isHadrian = true; }; }; # Binary distributions for the musl libc for the respective system. @@ -118,6 +120,7 @@ let sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481"; }; isStatic = true; + isHadrian = true; # We can't check the RPATH for statically linked executable exePathForLibraryCheck = null; archSpecificLibraries = [ @@ -400,6 +403,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { From 36005f52b82650de38318ef295120ecdbdc54226 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 14:11:38 +0100 Subject: [PATCH 34/73] haskell.compiler.ghc8102Binary: tag bindists built using hadrian --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 10ee40f710c8..41461a26d425 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -122,6 +122,7 @@ let # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -420,6 +421,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { From 328d6f84992c24a62e59f42bd8ec32cd42f3225e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 22 Jan 2023 14:12:00 +0100 Subject: [PATCH 35/73] haskell.compiler.ghc8107Binary: tag bindists built using hadrian Surprisingly, the aarch64-darwin bindist for 8.10.7 was still built using make. --- pkgs/development/compilers/ghc/8.10.7-binary.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 94ad5a78a0a7..22552fa67fb2 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -137,6 +137,7 @@ let # instead of `libtinfo.so.*.` { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } ]; + isHadrian = true; }; }; }; @@ -416,6 +417,13 @@ stdenv.mkDerivation rec { # Our Cabal compiler name haskellCompilerName = "ghc-${version}"; + } // lib.optionalAttrs (binDistUsed.isHadrian or false) { + # Normal GHC derivations expose the hadrian derivation used to build them + # here. In the case of bindists we just make sure that the attribute exists, + # as it is used for checking if a GHC derivation has been built with hadrian. + # The isHadrian mechanism will become obsolete with GHCs that use hadrian + # exclusively, i.e. 9.6 (and 9.4?). + hadrian = null; }; meta = rec { From e9cf3f794af3e89010fc23a9978c2f119d96baea Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 6 Feb 2023 10:56:35 -0300 Subject: [PATCH 36/73] haskellPackages.hslua-core: skip tests for Musl * Fixes #214916 --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3396c160ddb4..4ab8c4b03516 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -929,12 +929,9 @@ self: super: { ''; }) super.hpack; - # hslua has tests that appear to break when using musl. + # hslua has tests that break when using musl. # https://github.com/hslua/hslua/issues/106 - # Note that hslua is currently version 1.3. However, in the latest version - # (>= 2.0), hslua has been split into multiple packages and this override - # will likely need to be moved to the hslua-core package. - hslua = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua else super.hslua; + hslua-core = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua-core else super.hslua-core; # The test suite runs for 20+ minutes on a very fast machine, which feels kinda disproportionate. prettyprinter = dontCheck super.prettyprinter; From ed5543bccac98ca5a8f26a3b5022ba4d73a488a0 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 8 Feb 2023 11:54:21 +0100 Subject: [PATCH 37/73] haskellPackages.pandoc-crossref: Backpin for LTS compat --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f4aed098a1a3..2f37b91d9b49 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -86,6 +86,8 @@ default-package-overrides: - implicit-hie < 0.1.3 # latest version requires Cabal >= 3.8 - shake-cabal < 0.2.2.3 + # needed as long as we have pandoc < 3.0, i.e. stackage lts 20 + - pandoc-crossref < 0.3.15.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1b786cb26072..c3df8a2e3469 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -213075,6 +213075,42 @@ self: { }) {}; "pandoc-crossref" = callPackage + ({ mkDerivation, base, containers, criterion, data-default, deepseq + , directory, filepath, gitrev, hspec, microlens, microlens-mtl + , microlens-th, mtl, open-browser, optparse-applicative, pandoc + , pandoc-types, syb, template-haskell, temporary, text, utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.14.0"; + sha256 = "1f55xz5r7h6vjjj0dsq5glavn0zjh02imi4mja8qbwn3rvi67l86"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-default directory filepath microlens + microlens-mtl microlens-th mtl pandoc pandoc-types syb + template-haskell text utility-ht + ]; + executableHaskellDepends = [ + base deepseq gitrev open-browser optparse-applicative pandoc + pandoc-types template-haskell temporary text + ]; + testHaskellDepends = [ + base containers data-default directory filepath hspec microlens mtl + pandoc pandoc-types text + ]; + benchmarkHaskellDepends = [ + base criterion pandoc pandoc-types text + ]; + doHaddock = false; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + mainProgram = "pandoc-crossref"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + + "pandoc-crossref_0_3_15_0" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl , microlens-th, mtl, open-browser, optparse-applicative, pandoc @@ -213108,6 +213144,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-crossref"; maintainers = [ lib.maintainers.maralorn ]; }) {}; From bc0633140ba728d3f846c1567f2d7ab605797a90 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 8 Feb 2023 12:03:43 +0100 Subject: [PATCH 38/73] haskellPackages.pandoc-cli: Mark broken until we bump stackage --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4ab8c4b03516..65feba3d079c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -138,6 +138,8 @@ self: super: { # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; + pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli)); + # sse2 flag due to https://github.com/haskell/vector/issues/47. # Jailbreak is necessary for QuickCheck dependency. vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector); From a570185a9a08f9cb9490962859e2969d1a267201 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Feb 2023 06:30:29 +0000 Subject: [PATCH 39/73] juju: 2.9.38 -> 3.1.0 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index e280b7390035..4806e3ae4a73 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.38"; + version = "3.1.0"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-QTO6MHiFx3nDXDaaVy7rCiR0ttBXt5oAw94/ZDTICOM="; + sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o="; }; - vendorHash = "sha256-QOu1azw3OUWaz7MRFGZ5CGX4bVegbFYp76/XpesnaUM="; + vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From 47301c257adf2e479d9ef810d92aa1aa2a7df0b5 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 10 Feb 2023 00:25:01 +0000 Subject: [PATCH 40/73] vscode: 1.75.0 -> 1.75.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1e6195021c69..65675dd92488 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1b1xk4f736lxg7vsqhnra0x1vvb3x9fj7ijxqk5liz5pap18k1c8"; - x86_64-darwin = "1pi2kspq162aaj42ssmrf67bbdk4n0vx618z8avxnbx3wbcrsnap"; - aarch64-linux = "1j6qim8k94a2baj8w098l6x3i94n34g62c1brfmhha8fr48jzlir"; - aarch64-darwin = "0agl2n6ljd5rc5shypn5j1292pf673nhqhmwhg5bg9qsawar0ksf"; - armv7l-linux = "10k4pzp9lyn5g8frgixcx9jyixwckr1481d1npdzrgcdwfwrmf20"; + x86_64-linux = "0661qkcljxdpi5f6cyfqr8vyf87p94amzdspcg8hjrz18j1adb0h"; + x86_64-darwin = "0781ad52vcqgam3iprm56kvcv5v12pba0i5spazr5zssnn3w3ym0"; + aarch64-linux = "0fwl12yngq3z2f18hp43q7nmnjdikly05q9rar9vcjc63h2pzfc5"; + aarch64-darwin = "1nldkg14zvk6nc72l50w4lv9k490vn34ms6z9x2b9zkx15d09v7x"; + armv7l-linux = "0mhriqi6hzn7wwfzl98dvcghkpkfa4rbbxvmyvzzc5ycgbs6r1mx"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.75.0"; + version = "1.75.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From daf0f2b3a19f712315a8bb23571bea36166e3c39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Feb 2023 06:23:40 +0100 Subject: [PATCH 41/73] ocamlPackages.lsp: fix build of version 1.4.1 --- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 3111d4277c41..1c7d72cbc36d 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -26,7 +26,7 @@ buildDunePackage rec { pname = "lsp"; inherit (jsonrpc) version src; duneVersion = if lib.versionAtLeast version "1.10.0" then "3" else "2"; - minimumOCamlVersion = + minimalOCamlVersion = if lib.versionAtLeast version "1.7.0" then "4.12" else @@ -74,7 +74,6 @@ buildDunePackage rec { [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ocamlformat-rpc-lib ] else [ - cppo ppx_yojson_conv_lib ocaml-syntax-shims octavius @@ -83,6 +82,8 @@ buildDunePackage rec { cmdliner ]; + nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo; + propagatedBuildInputs = [ csexp jsonrpc From 45c94650254e7c3f610fef443d9481406a9c535e Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 10 Feb 2023 18:49:59 +0800 Subject: [PATCH 42/73] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1790450](https://hydra.nixos.org/eval/1790450) of nixpkgs commit [3eecda0](https://github.com/NixOS/nixpkgs/commits/3eecda0ad62b39adbc9660321b28554ff909ce73) as of 2023-02-10 10:47 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 25 ++++++++ .../transitive-broken.yaml | 13 ++++ .../haskell-modules/hackage-packages.nix | 62 +++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d10c626a9b7..570f58ec2faa 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -924,6 +924,7 @@ broken-packages: - credential-store - critbit - criterion-cmp + - criterion-compare - criterion-plus - criterion-to-html - criu-rpc-types @@ -1103,6 +1104,7 @@ broken-packages: - derive-monoid - derive-trie - deriving-openapi3 + - deriving-trans - derp-lib - describe - descriptive @@ -1434,6 +1436,7 @@ broken-packages: - extensible-effects-concurrent - extensible-skeleton - external-sort + - extism - extractelf - ez3 - ez-couch @@ -2915,6 +2918,7 @@ broken-packages: - khph - kickass-torrents-dump-parser - kickchan + - kind-generics-deriving - kleene-list - kmn-programming - kmonad @@ -3062,6 +3066,7 @@ broken-packages: - libpafe - libpq - librandomorg + - libsecp256k1 - libsystemd-daemon - libtagc - libxls @@ -3352,6 +3357,8 @@ broken-packages: - ml-w - mm2 - mmsyn2 + - mmsyn7l + - mmsyn7ukr-array - mmtf - mmtl - Mobile-Legends-Hack-Cheats @@ -3800,10 +3807,12 @@ broken-packages: - pandoc-filter-indent - pandoc-include - pandoc-lens + - pandoc-lua-engine - pandoc-markdown-ghci-filter - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot + - pandoc-server - pandoc-unlit - pandoc-utils - pandora @@ -3949,7 +3958,13 @@ broken-packages: - phone-numbers - phone-push - phonetic-languages-constaints + - phonetic-languages-constraints-array + - phonetic-languages-filters-array + - phonetic-languages-permutations-array + - phonetic-languages-phonetics-basics + - phonetic-languages-plus - phonetic-languages-simplified-properties-array-old + - phonetic-languages-ukrainian-array - phonetic-languages-vector - phraskell - Phsu @@ -4687,10 +4702,12 @@ broken-packages: - servant-router - servant-scotty - servant-seo + - servant-serf - servant-smsc-ru - servant-stache - servant-static-th - servant-streaming + - servant-streamly - servant-tracing - servant-typed-error - servant-wasm @@ -4863,6 +4880,7 @@ broken-packages: - snake-game - snap-accept - snap-auth-cli + - snap-blaze-clay - snap-configuration-utilities - snap-error-collector - snap-language @@ -5303,6 +5321,7 @@ broken-packages: - threadscope - threepenny-editors - threepenny-gui-contextmenu + - threepenny-gui-flexbox - thrift - Thrift - throttled-io-loop @@ -5482,6 +5501,7 @@ broken-packages: - type-indexed-queues - type-int - type-interpreter + - typelet - type-level-bst - type-level-natural-number-induction - type-level-natural-number-operations @@ -5514,6 +5534,8 @@ broken-packages: - uhexdump - uhttpc - ui-command + - ukrainian-phonetics-basic-array + - ukrainian-phonetics-basic-array-bytestring - unamb-custom - unbeliever - unbounded-delays-units @@ -5748,6 +5770,7 @@ broken-packages: - webkit-javascriptcore - webmention - web-output + - web-page - web-push - Webrexp - web-routes-quasi @@ -5787,6 +5810,7 @@ broken-packages: - wol - word24 - word2vec-model + - wordchoice - wordify - Wordlint - wordn @@ -5967,6 +5991,7 @@ broken-packages: - yoda - Yogurt - youtube + - yu-auth - yu-core - yuiGrid - yu-tool diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e3cc5ad4d9b7..05492ca714ba 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -464,7 +464,9 @@ dont-distribute-packages: - algebra-sql - algebraic - algolia + - algorithmic-composition-basic - algorithmic-composition-frequency-shift + - algorithmic-composition-overtones - align-audio - alms - alpha @@ -2543,6 +2545,7 @@ dont-distribute-packages: - lapack - lapack-comfort-array - lapack-hmatrix + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -2765,6 +2768,7 @@ dont-distribute-packages: - mkbndl - mlist - mmsyn6ukr + - mmsyn6ukr-array - mmsyn7h - mmsyn7s - mmsyn7ukr @@ -2998,6 +3002,7 @@ dont-distribute-packages: - padKONTROL - pairing - panda + - pandoc-crossref_0_3_15_0 - pandoc-highlighting-extensions - pandoc-japanese-filters - pandora-io @@ -3066,8 +3071,15 @@ dont-distribute-packages: - phonetic-languages-general - phonetic-languages-permutations - phonetic-languages-properties + - phonetic-languages-simplified-base - phonetic-languages-simplified-common + - phonetic-languages-simplified-examples-array + - phonetic-languages-simplified-examples-common + - phonetic-languages-simplified-generalized-examples-array + - phonetic-languages-simplified-generalized-examples-common + - phonetic-languages-simplified-generalized-properties-array - phonetic-languages-simplified-lists-examples + - phonetic-languages-simplified-properties-array - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double - phonetic-languages-ukrainian @@ -3745,6 +3757,7 @@ dont-distribute-packages: - strict-containers-lens - strict-containers-serialise - strict-data + - string-interpreter - string-typelits - stripe-haskell - stripe-http-client diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c3df8a2e3469..8d054c40d69e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -27804,6 +27804,7 @@ self: { ]; description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "algorithmic-composition-complex" = callPackage @@ -27854,6 +27855,7 @@ self: { libraryHaskellDepends = [ algorithmic-composition-basic base ]; description = "Some variants of the overtones functions to generate a timbre"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "align" = callPackage @@ -70763,7 +70765,9 @@ self: { ]; description = "A simple tool for visualising differences in Criterion benchmark results"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "criterion-compare"; + broken = true; }) {}; "criterion-measurement" = callPackage @@ -79062,6 +79066,8 @@ self: { ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "derivingvia-extras" = callPackage @@ -95764,6 +95770,8 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Extism bindings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {extism = null;}; "extism-manifest" = callPackage @@ -170909,6 +170917,8 @@ self: { ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kind-generics-th" = callPackage @@ -174655,6 +174665,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "large-generics" = callPackage @@ -178095,6 +178106,8 @@ self: { ]; description = "Bindings for secp256k1"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) secp256k1;}; "libsodium" = callPackage @@ -192460,6 +192473,7 @@ self: { ]; description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn6ukra"; }) {}; @@ -192505,7 +192519,9 @@ self: { ]; description = "Modifies the amplitudes of the sounds representations created by mmsyn7ukr-array and mmsyn7ukr packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "mmsyn7l"; + broken = true; }) {}; "mmsyn7s" = callPackage @@ -192561,6 +192577,8 @@ self: { ]; description = "A simple reduced basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h-array, dobutokO2-array and other similar packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mmsyn7ukr-common" = callPackage @@ -213396,6 +213414,8 @@ self: { ]; description = "Lua engine to power custom pandoc conversions"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pandoc-lua-marshal" = callPackage @@ -213641,6 +213661,8 @@ self: { ]; description = "Pandoc document conversion as an HTTP servant-server"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pandoc-sidenote" = callPackage @@ -220126,6 +220148,8 @@ self: { libraryHaskellDepends = [ base subG ]; description = "Constraints to filter the needed permutations"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-examples" = callPackage @@ -220171,6 +220195,8 @@ self: { libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-general" = callPackage @@ -220211,6 +220237,8 @@ self: { libraryHaskellDepends = [ base subG ]; description = "Permutations and universal set related functions for the phonetic-languages series"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phonetic-languages-phonetics-basics" = callPackage @@ -220231,7 +220259,9 @@ self: { ]; description = "A library for working with generalized phonetic languages usage"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "pldPL"; + broken = true; }) {}; "phonetic-languages-plus" = callPackage @@ -220254,7 +220284,9 @@ self: { ]; description = "Some common shared between different packages functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "distributionTextG"; + broken = true; }) {}; "phonetic-languages-properties" = callPackage @@ -220300,6 +220332,7 @@ self: { ]; description = "A basics of the phonetic-languages functionality that can be groupped"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-common" = callPackage @@ -220366,6 +220399,7 @@ self: { ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-examples-common" = callPackage @@ -220384,6 +220418,7 @@ self: { ]; description = "Some commonly used by phonetic-languages-simplified* series functions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage @@ -220415,6 +220450,7 @@ self: { ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-examples-common" = callPackage @@ -220431,6 +220467,7 @@ self: { ]; description = "Some common code for phonetic languages generalized functionality"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage @@ -220448,6 +220485,7 @@ self: { ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-lists-examples" = callPackage @@ -220504,6 +220542,7 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-array-common" = callPackage @@ -220606,7 +220645,9 @@ self: { executableHaskellDepends = [ base mmsyn2-array mmsyn5 ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "unconcatUkr"; + broken = true; }) {}; "phonetic-languages-vector" = callPackage @@ -256871,7 +256912,9 @@ self: { executableHaskellDepends = [ base ]; description = "Automatically generate Servant API modules"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-serf"; + broken = true; }) {}; "servant-serialization" = callPackage @@ -257184,7 +257227,9 @@ self: { ]; description = "Servant Stream support for streamly"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-streamly-example"; + broken = true; }) {}; "servant-subscriber" = callPackage @@ -264988,6 +265033,8 @@ self: { libraryHaskellDepends = [ base blaze-html clay snap-core ]; description = "blaze-html-clay integration for Snap"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-configuration-utilities" = callPackage @@ -274554,6 +274601,7 @@ self: { ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "string-isos" = callPackage @@ -287190,7 +287238,9 @@ self: { executableHaskellDepends = [ base threepenny-gui ]; description = "Flexbox layouts for Threepenny-gui"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "threepenny-flexbox-exe"; + broken = true; }) {}; "thrift" = callPackage @@ -295690,6 +295740,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -296629,6 +296681,8 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-basic-array-bytestring" = callPackage @@ -296644,6 +296698,8 @@ self: { ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ukrainian-phonetics-common" = callPackage @@ -307223,6 +307279,8 @@ self: { ]; description = "Monoidally construct web pages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "web-plugins" = callPackage @@ -310215,7 +310273,9 @@ self: { benchmarkHaskellDepends = [ base criterion pandoc text ]; description = "Get word counts and distributions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "wrd"; + broken = true; }) {}; "wordcloud" = callPackage @@ -318591,6 +318651,8 @@ self: { testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yu-core" = callPackage From 69107327afaade10401dec44068f4987b388b6b6 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Fri, 10 Feb 2023 19:33:01 +0100 Subject: [PATCH 43/73] uptime-kuma: node2nix -> buildNpmPackage --- .../monitoring/uptime-kuma/composition.nix | 17 - .../monitoring/uptime-kuma/default.nix | 45 +- .../monitoring/uptime-kuma/node-env.nix | 686 --- .../monitoring/uptime-kuma/node-packages.nix | 5099 ----------------- .../monitoring/uptime-kuma/package.json | 178 - pkgs/servers/monitoring/uptime-kuma/update.sh | 26 - 6 files changed, 14 insertions(+), 6037 deletions(-) delete mode 100644 pkgs/servers/monitoring/uptime-kuma/composition.nix delete mode 100644 pkgs/servers/monitoring/uptime-kuma/node-env.nix delete mode 100644 pkgs/servers/monitoring/uptime-kuma/node-packages.nix delete mode 100644 pkgs/servers/monitoring/uptime-kuma/package.json delete mode 100755 pkgs/servers/monitoring/uptime-kuma/update.sh diff --git a/pkgs/servers/monitoring/uptime-kuma/composition.nix b/pkgs/servers/monitoring/uptime-kuma/composition.nix deleted file mode 100644 index ca76a98f5a65..000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 943ee9ce1589..fa1b4dc26698 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -1,19 +1,17 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fetchzip, nixosTests, iputils, nodejs, makeWrapper }: -let - deps = import ./composition.nix { inherit pkgs; }; -in -stdenv.mkDerivation (finalAttrs: { +{ pkgs, lib, fetchFromGitHub, buildNpmPackage, python3, nodejs, nixosTests }: + +buildNpmPackage rec { pname = "uptime-kuma"; version = "1.19.6"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; - rev = finalAttrs.version; + rev = version; sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; }; - uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4="; + npmDepsHash = "sha256-lVMPxUe+W/FlFQS2L+/UfpC21pIKJE89clmJywSv7w4="; patches = [ # Fixes the permissions of the database being not set correctly @@ -21,35 +19,21 @@ stdenv.mkDerivation (finalAttrs: { ./fix-database-permissions.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ python3 ]; - installPhase = '' - mkdir -p $out/share/ - cp -r server $out/share/ - cp -r db $out/share/ - cp -r src $out/share/ - cp package.json $out/share/ - ln -s ${deps.package}/lib/node_modules/uptime-kuma/node_modules/ $out/share/ - ln -s ${finalAttrs.passthru.ui} $out/share/dist + CYPRESS_INSTALL_BINARY = 0; # Stops Cypress from trying to download binaries + + postInstall = '' + cp -r dist $out/lib/node_modules/uptime-kuma/ ''; postFixup = '' makeWrapper ${nodejs}/bin/node $out/bin/uptime-kuma-server \ - --add-flags $out/share/server/server.js \ - --chdir $out/share/ + --add-flags $out/lib/node_modules/uptime-kuma/server/server.js \ + --chdir $out/lib/node_modules/uptime-kuma ''; - passthru = { - tests.uptime-kuma = nixosTests.uptime-kuma; - - updateScript = ./update.sh; - - ui = fetchzip { - name = "uptime-kuma-dist-${finalAttrs.version}"; - url = "https://github.com/louislam/uptime-kuma/releases/download/${finalAttrs.version}/dist.tar.gz"; - sha256 = finalAttrs.uiSha256; - }; - }; + passthru.tests.uptime-kuma = nixosTests.uptime-kuma; meta = with lib; { description = "A fancy self-hosted monitoring tool"; @@ -57,5 +41,4 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ julienmalka ]; }; -}) - +} diff --git a/pkgs/servers/monitoring/uptime-kuma/node-env.nix b/pkgs/servers/monitoring/uptime-kuma/node-env.nix deleted file mode 100644 index 5dad9ec63d47..000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/node-env.nix +++ /dev/null @@ -1,686 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <=16.*" - }, - "scripts": { - "install-legacy": "npm install", - "update-legacy": "npm update", - "lint:js": "eslint --ext \".js,.vue\" --ignore-path .gitignore .", - "lint-fix:js": "eslint --ext \".js,.vue\" --fix --ignore-path .gitignore .", - "lint:style": "stylelint \"**/*.{vue,css,scss}\" --ignore-path .gitignore", - "lint-fix:style": "stylelint \"**/*.{vue,css,scss}\" --fix --ignore-path .gitignore", - "lint": "npm run lint:js && npm run lint:style", - "dev": "concurrently -k -r \"wait-on tcp:3000 && npm run start-server-dev \" \"npm run start-frontend-dev\"", - "start-frontend-dev": "cross-env NODE_ENV=development vite --host --config ./config/vite.config.js", - "start": "npm run start-server", - "start-server": "node server/server.js", - "start-server-dev": "cross-env NODE_ENV=development node server/server.js", - "build": "vite build --config ./config/vite.config.js", - "test": "node test/prepare-test-server.js && npm run jest-backend", - "test-with-build": "npm run build && npm test", - "jest-backend": "cross-env TEST_BACKEND=1 jest --runInBand --detectOpenHandles --forceExit --config=./config/jest-backend.config.js", - "tsc": "tsc", - "vite-preview-dist": "vite preview --host --config ./config/vite.config.js", - "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine", - "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", - "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", - "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", - "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push", - "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push", - "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", - "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push", - "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", - "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push", - "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist", - "download-dist": "node extra/download-dist.js", - "mark-as-nightly": "node extra/mark-as-nightly.js", - "reset-password": "node extra/reset-password.js", - "remove-2fa": "node extra/remove-2fa.js", - "compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1", - "test-install-script-centos7": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/centos7.dockerfile .", - "test-install-script-alpine3": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/alpine3.dockerfile .", - "test-install-script-ubuntu": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu.dockerfile .", - "test-install-script-ubuntu1604": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/ubuntu1604.dockerfile .", - "test-nodejs16": "docker build --progress plain -f test/ubuntu-nodejs16.dockerfile .", - "simple-dns-server": "node extra/simple-dns-server.js", - "simple-mqtt-server": "node extra/simple-mqtt-server.js", - "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix", - "ncu-patch": "npm-check-updates -u -t patch", - "release-final": "node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js", - "release-beta": "node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts", - "git-remove-tag": "git tag -d", - "build-dist-and-restart": "npm run build && npm run start-server-dev", - "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", - "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e", - "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js", - "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js", - "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"", - "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go" - }, - "dependencies": { - "@grpc/grpc-js": "~1.7.3", - "@louislam/ping": "~0.4.2-mod.1", - "@louislam/sqlite3": "15.1.2", - "args-parser": "~1.3.0", - "axios": "~0.27.0", - "axios-ntlm": "1.3.0", - "badge-maker": "~3.3.1", - "bcryptjs": "~2.4.3", - "bree": "~7.1.5", - "cacheable-lookup": "~6.0.4", - "chardet": "~1.4.0", - "check-password-strength": "^2.0.5", - "cheerio": "~1.0.0-rc.12", - "chroma-js": "~2.4.2", - "command-exists": "~1.2.9", - "compare-versions": "~3.6.0", - "compression": "~1.7.4", - "dayjs": "~1.11.5", - "express": "~4.17.3", - "express-basic-auth": "~1.2.1", - "express-static-gzip": "~2.1.7", - "form-data": "~4.0.0", - "http-graceful-shutdown": "~3.1.7", - "http-proxy-agent": "~5.0.0", - "https-proxy-agent": "~5.0.1", - "iconv-lite": "~0.6.3", - "jsesc": "~3.0.2", - "jsonwebtoken": "~9.0.0", - "jwt-decode": "~3.1.2", - "limiter": "~2.1.0", - "mqtt": "~4.3.7", - "mssql": "~8.1.4", - "mysql2": "~2.3.3", - "node-cloudflared-tunnel": "~1.0.9", - "node-radius-client": "~1.0.0", - "nodemailer": "~6.6.5", - "notp": "~2.0.3", - "password-hash": "~1.2.2", - "pg": "~8.8.0", - "pg-connection-string": "~2.5.0", - "prom-client": "~13.2.0", - "prometheus-api-metrics": "~3.2.1", - "protobufjs": "~7.1.1", - "redbean-node": "~0.2.0", - "socket.io": "~4.5.3", - "socket.io-client": "~4.5.3", - "socks-proxy-agent": "6.1.1", - "tar": "~6.1.11", - "tcp-ping": "~0.1.1", - "thirty-two": "~1.0.2" - }, - "devDependencies": { - "@actions/github": "~5.0.1", - "@babel/eslint-parser": "~7.17.0", - "@babel/preset-env": "^7.15.8", - "@fortawesome/fontawesome-svg-core": "~1.2.36", - "@fortawesome/free-regular-svg-icons": "~5.15.4", - "@fortawesome/free-solid-svg-icons": "~5.15.4", - "@fortawesome/vue-fontawesome": "~3.0.0-5", - "@popperjs/core": "~2.10.2", - "@types/bootstrap": "~5.1.9", - "@vitejs/plugin-legacy": "~2.1.0", - "@vitejs/plugin-vue": "~3.1.0", - "@vue/compiler-sfc": "~3.2.36", - "@vuepic/vue-datepicker": "~3.4.8", - "aedes": "^0.46.3", - "babel-plugin-rewire": "~1.2.0", - "bootstrap": "5.1.3", - "chart.js": "~3.6.2", - "chartjs-adapter-dayjs": "~1.0.0", - "concurrently": "^7.1.0", - "core-js": "~3.26.1", - "cross-env": "~7.0.3", - "cypress": "^10.1.0", - "delay": "^5.0.0", - "dns2": "~2.0.1", - "eslint": "~8.14.0", - "eslint-plugin-vue": "~8.7.1", - "favico.js": "~0.3.10", - "jest": "~27.2.5", - "postcss-html": "~1.5.0", - "postcss-rtlcss": "~3.7.2", - "postcss-scss": "~4.0.4", - "prismjs": "~1.29.0", - "qrcode": "~1.5.0", - "rollup-plugin-visualizer": "^5.6.0", - "sass": "~1.42.1", - "stylelint": "~14.7.1", - "stylelint-config-standard": "~25.0.0", - "terser": "~5.15.0", - "timezones-list": "~3.0.1", - "typescript": "~4.4.4", - "v-pagination-3": "~0.1.7", - "vite": "~3.1.0", - "vite-plugin-compression": "^0.5.1", - "vue": "next", - "vue-chart-3": "3.0.9", - "vue-confirm-dialog": "~1.0.2", - "vue-contenteditable": "~3.0.4", - "vue-i18n": "~9.2.2", - "vue-image-crop-upload": "~3.0.3", - "vue-multiselect": "~3.0.0-alpha.2", - "vue-prism-editor": "~2.0.0-alpha.2", - "vue-qrcode": "~1.0.0", - "vue-router": "~4.0.14", - "vue-toastification": "~2.0.0-rc.5", - "vuedraggable": "~4.1.0", - "wait-on": "^6.0.1" - } -} diff --git a/pkgs/servers/monitoring/uptime-kuma/update.sh b/pkgs/servers/monitoring/uptime-kuma/update.sh deleted file mode 100755 index 3bc5fb558863..000000000000 --- a/pkgs/servers/monitoring/uptime-kuma/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq - -set -euo pipefail - -latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/louislam/uptime-kuma/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; uptime-kuma.version or (lib.getVersion uptime-kuma)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "uptime-kuma is up-to-date: $currentVersion" - exit 0 -fi - -update-source-version uptime-kuma 0 0000000000000000000000000000000000000000000000000000000000000000 -update-source-version uptime-kuma "$latestVersion" - -store_src="$(command nix-build . -A uptime-kuma.src --no-out-link)" - -cd "$(dirname "${BASH_SOURCE[0]}")" - -node2nix \ - --nodejs-16 \ - --lock "$store_src/package-lock.json" \ - --composition ./composition.nix - - From c7961565fd6d5c1d692eba9c2da3d27c7e813625 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 10 Feb 2023 19:04:52 -0300 Subject: [PATCH 44/73] python311Packages.aiocache: 0.11.1 -> 0.12.0 Release: https://github.com/aio-libs/aiocache/releases/tag/v0.12.0 Diff: https://github.com/aio-libs/aiocache/compare/0.11.1...v0.12.0 --- pkgs/development/python-modules/aiocache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54979dbd7ba4..7ca49b495f1c 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aiocache"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + rev = "v${version}"; + sha256 = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; propagatedBuildInputs = [ From fe33f762c16ce47901303063c7e755421225262c Mon Sep 17 00:00:00 2001 From: SharzyL Date: Sat, 11 Feb 2023 10:46:37 +0800 Subject: [PATCH 45/73] circt: 1.29.0 -> 1.30.0 Release notes: https://github.com/llvm/circt/releases/tag/firtool-1.30.0 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index a8e36cbc785f..7bf6a64eeb84 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-HsXwh98RZuXvK/KkZ2NAGwWNLxUAQVj+WKzZXd4C4Is="; + sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8="; fetchSubmodules = true; }; From 35a23cf4e9a4ad16ca7913f1c8023121c8a43b1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:11:01 +0100 Subject: [PATCH 46/73] python311Packages.aiocache: update meta - disable on unsupported Python releases --- .../python-modules/aiocache/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 7ca49b495f1c..b96d97ee409a 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , msgpack +, pythonOlder }: buildPythonPackage rec { pname = "aiocache"; version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; + rev = "refs/tags/v${version}"; + hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; propagatedBuildInputs = [ @@ -23,11 +27,15 @@ buildPythonPackage rec { # aiomcache would be required but last release was in 2017 doCheck = false; - pythonImportsCheck = [ "aiocache" ]; + + pythonImportsCheck = [ + "aiocache" + ]; meta = with lib; { description = "Python API Rate Limit Decorator"; - homepage = "https://github.com/tomasbasham/ratelimit"; + homepage = "https://github.com/aio-libs/aiocache"; + changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; From caf3e38874e328c43d7eac59f51a09795c7b932e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:12:59 +0100 Subject: [PATCH 47/73] python311Packages.aiocache: add optional-dependencies --- pkgs/development/python-modules/aiocache/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index b96d97ee409a..cca2c68c52fa 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -20,10 +20,14 @@ buildPythonPackage rec { hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; - propagatedBuildInputs = [ - aioredis - msgpack - ]; + passthru.optional-dependencies = { + redis = [ + redis + ]; + msgpack = [ + msgpack + ]; + }; # aiomcache would be required but last release was in 2017 doCheck = false; From f82355f05053a0c3087beb01478e19f19a511088 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:16:11 +0100 Subject: [PATCH 48/73] python311Packages.aiocache: fix module name --- pkgs/development/python-modules/aiocache/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index cca2c68c52fa..105ebc9188ea 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { redis = [ - redis + aioredis ]; msgpack = [ msgpack From 058a16781e1c05398bd70110c2288176ea39320b Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Sat, 11 Feb 2023 10:10:03 +0100 Subject: [PATCH 49/73] kodi.packages.invidious: 0.1.0+matrix.1 -> unstable-2022-11-28 --- .../video/kodi/addons/invidious/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index c2885ba03a0a..f219a3fd1fdf 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,13 +1,18 @@ -{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "0.1.0+matrix.1"; + version = "unstable-2022-11-28"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + # video search doesn't work for the version on kodi.tv + # if the result contains channels + # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 + src = fetchFromGitHub { + owner = "TheAssassin"; + repo = "kodi-invidious-plugin"; + rev = "85b66525632d94630c9301d9c490fc002a335d77"; + hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; }; propagatedBuildInputs = [ @@ -18,9 +23,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.invidious"; - }; }; meta = with lib; { From e8b59a1e2ed7d0523ba1ad55bfe296bfaadab923 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sat, 11 Feb 2023 11:12:51 +0100 Subject: [PATCH 50/73] nixos/dokuwiki: remove last reference to aclUse This was overlooked in #209299, but will throw a trace when building a system even when the setting was not set. --- nixos/modules/services/web-apps/dokuwiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 215372083654..c85109b1479e 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -82,7 +82,7 @@ let basePackage = cfg.package; localConfig = dokuwikiLocalConfig hostName cfg; pluginsConfig = dokuwikiPluginsLocalConfig hostName cfg; - aclConfig = if cfg.aclUse && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; + aclConfig = if cfg.settings.useacl && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; }; aclOpts = { ... }: { From 21b68892429601e69240952e70f542a9b7ddd142 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 11 Feb 2023 08:07:21 -0300 Subject: [PATCH 51/73] python311Packages.pyflunearyou: fix build --- .../python-modules/pyflunearyou/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index ea59fa0dc10f..cd04d00ee32e 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -9,6 +9,7 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , msgpack , ujson }: @@ -27,13 +28,14 @@ buildPythonPackage rec { sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' - ''; + pythonRelaxDeps = [ + "aiocache" + "ujson" + ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ From 50668ca3f2130b56904be767f17782f9fbe6b7c3 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 9 Feb 2023 15:18:50 +0800 Subject: [PATCH 52/73] helmfile: 0.145.2 -> 0.150.0 --- .../networking/cluster/helmfile/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2a9b04772334..fba5d36a4256 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.145.2"; + version = "0.150.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; + sha256 = "sha256-7wCt+JAuozsd+LifLArfPNwiKK/tDvgwpIwVCW4nU3Y="; }; - vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; + vendorSha256 = "sha256-vLLS+/Xfnlt6cvkNvXKX3DVLku1Q4bRCiv2vMTfOnfw="; doCheck = false; @@ -23,8 +23,9 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd helmfile \ - --bash ./autocomplete/helmfile_bash_autocomplete \ - --zsh ./autocomplete/helmfile_zsh_autocomplete + --bash <($out/bin/helmfile completion bash) \ + --fish <($out/bin/helmfile completion fish) \ + --zsh <($out/bin/helmfile completion zsh) ''; meta = { From 6dc06cb28234e73ce14c30d291b1bf9bd8802aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 11 Feb 2023 17:36:54 +0100 Subject: [PATCH 53/73] synology-drive-client: 3.2.0 -> 3.2.1 --- .../networking/synology-drive-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index dea70ffacdce..850692f18547 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.2.0-13258"; + version = "3.2.1-13272"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; + sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; + sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; }; nativeBuildInputs = [ cpio xar undmg ]; From 3631a8f43796993c34f63750e8243e93094ca437 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 9 Feb 2023 16:46:21 -0800 Subject: [PATCH 54/73] maintainers: add _9999years --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 92ddda5ca230..18b4118d6310 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -169,6 +169,12 @@ githubId = 12578560; name = "Quinn Bohner"; }; + _9999years = { + email = "rbt@fastmail.com"; + github = "9999years"; + githubId = 15312184; + name = "Rebecca Turner"; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; From debd68673f06dfd19498a44df8af8b1be2f71b1f Mon Sep 17 00:00:00 2001 From: squalus Date: Sat, 11 Feb 2023 13:04:34 -0800 Subject: [PATCH 55/73] standardnotes: 3.144.3 -> 3.148.0 --- pkgs/applications/editors/standardnotes/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 0e0eb4b22d3b..4f601a56f8ba 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.144.3", + "version": "3.148.0", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-x86_64.AppImage", - "hash": "sha512-NHuabqi8pjCnSI6EwhPLgWjyytW/ZnGvGCjb/hXscRVcJgJiQZ7FNZnnepFtZ3c0z0F4bM6AYcH+eWmt0ySgXw==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-x86_64.AppImage", + "hash": "sha512-Nzvzl3O7/AXj/Sr5CMfmLktx+w9OUHPZmHH8pxx5GYhmjAgYCh2V0w1iPe5G7/nJpx+jSBJXSKq3jR3wYCeXWA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.144.3/standard-notes-3.144.3-linux-arm64.AppImage", - "hash": "sha512-EaCq/0IgrSPWCkWtOBzMISfuajgGZKborPO4SoWi2QgMmwZXgLc/RBCVzVBT9C2EQLmc506IVrjOdAzkuQM5TQ==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.148.0/standard-notes-3.148.0-linux-arm64.AppImage", + "hash": "sha512-Owwc0WRlATTYZYrUtW6iZK8gXktHstDclqHmo5GZ1AAqB7/W9qTuQ2LNMjfL0kAzIQw/JCBfxvDCG9DjEM6eYA==" } } } From 092a6d7fc7239bb206cf4724efac07f7de2b0275 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 11 Feb 2023 16:13:08 -0500 Subject: [PATCH 56/73] lhapdf: fix python module on darwin --- .../libraries/physics/lhapdf/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 60b5a0b581dc..00f548806fc5 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -9,6 +9,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; }; + patches = [ + # avoid silent compilation failures + (fetchpatch { + name = "lhapdf-propagate_returncode.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; + hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; + }) + + # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin + (fetchpatch { + name = "lhapdf-Wl_stack_size.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; + hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; + }) + ]; + # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' From db43cf90f71fc12a47bae199fac01c6924cc691d Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 11 Feb 2023 17:18:40 -0500 Subject: [PATCH 57/73] felix-fm: 2.2.4 -> 2.2.5 Diff: https://github.com/kyoheiu/felix/compare/v2.2.4...v2.2.5 Changelog: https://github.com/kyoheiu/felix/blob/v2.2.5/CHANGELOG.md --- pkgs/applications/file-managers/felix-fm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index f299d9fe3fa1..069e6f63cc22 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8="; + sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; }; - cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc="; + cargoSha256 = "sha256-xqWDWN3xkzBwgW0f64QhYHfsOS3Ed50jlQFuHG81/KY="; nativeBuildInputs = [ pkg-config ]; From e62bf5d95328f6dd64f1d0a3a45903e9c01c86c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 22:30:08 +0000 Subject: [PATCH 58/73] jackett: 0.20.3017 -> 0.20.3035 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index cebf1249e59a..2f33b841525e 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3017"; + version = "0.20.3035"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-Hc4EzHqydcBGbiQkr4Hhnfjly9CwaCJXau7WwBb/T+qYdCkOKwrGeuNr3UEMP2x4dth+713HQRrgXviQo+jJlw=="; + hash = "sha512-t9wMlKKeM3eP9ZJY7uXmWEQrpCXwmE7Tuxsx9ajh3p09ko265YiSQRSC7mPEBLSV7eVRBqh8rlVKCE2rm5Rglw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 66cf322e315b67d70b5f04047de77a4e2807dea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 23:36:28 +0000 Subject: [PATCH 59/73] python310Packages.fastbencode: 0.1 -> 0.2 --- pkgs/development/python-modules/fastbencode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 2b63ee846b84..82522db24ae2 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wal451pQSLuoM9kNbnSKVZUMqLWfEukXwqLI58p+tvU="; + hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8="; }; nativeBuildInputs = [ From a6a71a301a75f0a78981b7ab5de74260f33dafd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:11:08 +0100 Subject: [PATCH 60/73] httpx: 1.2.6 -> 1.2.7 Diff: https://github.com/projectdiscovery/httpx/compare/refs/tags/v1.2.6...v1.2.7 Changelog: https://github.com/projectdiscovery/httpx/releases/tag/v1.2.7 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 7b26825b70c9..bcf55ea52639 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-XGKz4Y04EpfJGkEfUE20Egv9dFiSEHOpDcQ2OfJ9wu8="; + hash = "sha256-kZU7k7vAKgQfCQobGa5i5ZnO8ARUSozv4gz93g912uM="; }; - vendorHash = "sha256-PsASCNHR52E4TSIK5s0ReJptKcondq39Dn2PsMQ8laA="; + vendorHash = "sha256-1EQt7L+dQvpBOGVHeaIOCUG960yv5h9nuQNnF4wSoug="; # Tests require network access doCheck = false; From 969b740bada1175df247765e26aeb1258b0559cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:16:47 +0100 Subject: [PATCH 61/73] qovery-cli: 0.48.6 -> 0.49.0 Diff: https://github.com/Qovery/qovery-cli/compare/v0.48.6...v0.49.0 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.49.0 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 84c894a57fcf..3b35207e8499 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.6"; + version = "0.49.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI="; + hash = "sha256-O5JUWD7Wbe/5BM5fr6z76Re7PpRwFJV++lze+pv5el0="; }; - vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw="; + vendorHash = "sha256-Hb4bqOK4h68ZCN/bTPQLd4hC7oZUrj21DupVA4GrlNA="; nativeBuildInputs = [ installShellFiles ]; From 8f2b53105151afc64a742f8b7927e7a0525e14fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:21:00 +0100 Subject: [PATCH 62/73] trufflehog: 3.26.0 -> 3.27.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.26.0...3.27.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.27.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 3f4613b98762..ef79d4e3d4ce 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-cjggYIc/xy7w8Q8yXd26QWr1ky4gMuwRAmxrEObVlx0="; + hash = "sha256-zhzYBub5TnJvInMAcAzvh78o4MWHD4EJNn8PbtvHies="; }; - vendorHash = "sha256-z2na/CO/YqIYEAYJ9ATQ/wbOOBFt0Kr+ERN5TCFbZbA="; + vendorHash = "sha256-IiMFSYZ7kdb5HHPFuRJKi+WXLdERSwyph1vSEQ/7RRk="; # Test cases run git clone and require network access doCheck = false; From d87401bb137f05f6feb27eb6cf557e1c44f28067 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:22:37 +0100 Subject: [PATCH 63/73] python310Packages.goodwe: 0.2.24 -> 0.2.25 Diff: https://github.com/marcelblijleven/goodwe/compare/refs/tags/v0.2.24...v0.2.25 Changelog: https://github.com/marcelblijleven/goodwe/releases/tag/v0.2.25 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 6d3875d3789d..3676c1a4e137 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.24"; + version = "0.2.25"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-dcz9IEPr5n86NHne9lEDB0kERY8o+jUEqPmz6QMEF4Q="; + sha256 = "sha256-RT8fkFHiqUaahowk6EDpaf8s4JUuHSHPNT0iEr/pDVg="; }; postPatch = '' From ad9d11710eba30a92fcd01ddc120a8426adf0c22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:23:43 +0100 Subject: [PATCH 64/73] python310Packages.govee-ble: 0.22.0 -> 0.23.0 Diff: https://github.com/Bluetooth-Devices/govee-ble/compare/refs/tags/v0.22.0...v0.23.0 Changelog: https://github.com/bluetooth-devices/govee-ble/blob/v0.23.0/CHANGELOG.md --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 233d0bbbce81..2678c0120bee 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.22.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HAUHNxO7dfocazGhcvvcqbZot/RkAP50DrsEkocOugI="; + hash = "sha256-/uv4P7wB/5QQW2IA+PT6VMPWd91Aoyxsez+8ptrIa5M="; }; nativeBuildInputs = [ From 547d08cb2e67f3e5aeef36ebe176d24ba47d43e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:25:38 +0100 Subject: [PATCH 65/73] python310Packages.fakeredis: 2.7.1 -> 2.8.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.7.1...v2.8.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.8.0 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index f23269a3b28e..147fef19dcd8 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.7.1"; + version = "2.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-4g97cqMwtSLhDOVwBrunsq+JQ33BfeKcP0fJP4N48d8="; + hash = "sha256-QOARAT1XSoW/PJli6BzNOZZJjiSubz8zqndEHZCCqag="; }; nativeBuildInputs = [ From ff0d83d39b64aec7c7a1712dfaf7372ee601ba86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:31:33 +0100 Subject: [PATCH 66/73] python310Packages.aioesphomeapi: 13.1.0 -> 13.2.0 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v13.1.0...v13.2.0 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.2.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 82cdb3733bb5..12bdd985abbe 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.1.0"; + version = "13.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-slPYf7H8vwgSlqm7H7JnJnU17nL2Hwg9hHO0le33IqU="; + hash = "sha256-ACO5vp5ZMxzfY4RBvZ+vbk+fsj43Q896bar0+HNYHwE="; }; postPatch = '' From 92321a724921c6218e85b1e82d5730a82507616d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Feb 2023 01:35:09 +0100 Subject: [PATCH 67/73] python310Packages.asteval: 0.9.28 -> 0.9.29 Diff: https://github.com/newville/asteval/compare/refs/tags/0.9.28...0.9.29 --- pkgs/development/python-modules/asteval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index ed434bcb6bc7..4bfd53c08561 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.28"; + version = "0.9.29"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "newville"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-J35AqVSFpIsw0XThbLCJjS9NFRFeyYV/YrwdfcOrFhk="; + hash = "sha256-cJIrb0lo/FmeyZd8L6nlCEt6MP7Fdv3rr5C6xvplN6c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 493b9dc63199a8ceb98372f39f0c4f72385aff15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Feb 2023 01:03:24 +0000 Subject: [PATCH 68/73] flexget: 3.5.21 -> 3.5.22 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f14433b6c179..5a71b1acfcc3 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.21"; + version = "3.5.22"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; + hash = "sha256-I+7fTSyw5oKrad6HMxhex2wI4JLXDtoxHL4pxO3w2l8="; }; postPatch = '' From 10cf86b6351a13ad1287fe267236a130e4b635ef Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 10 Feb 2023 13:17:04 -0800 Subject: [PATCH 69/73] nix-your-shell: init at 1.0.1 An `any-nix-shell` alternative with support for `nix develop` / flakes. https://github.com/MercuryTechnologies/nix-your-shell --- pkgs/shells/nix-your-shell/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/shells/nix-your-shell/default.nix diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix new file mode 100644 index 000000000000..c5dfaab71505 --- /dev/null +++ b/pkgs/shells/nix-your-shell/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: +rustPlatform.buildRustPackage rec { + pname = "nix-your-shell"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "MercuryTechnologies"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kdZFwMHatnhdXGSIItuE3g27qqUKqT/Hkbz13Ba5eq4="; + }; + + cargoSha256 = "sha256-U4nN/N345XFRj0L9cLJAjRuND0W3OE6XEB/z3zXaUiQ="; + + meta = with lib; { + description = "A `nix` and `nix-shell` wrapper for shells other than `bash`"; + homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; + license = [ licenses.mit ]; + maintainers = [ maintainers._9999years ]; + }; + + passthru.updateScript = nix-update-script { }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afec35a3a835..3828519a56cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13840,6 +13840,8 @@ with pkgs; any-nix-shell = callPackage ../shells/any-nix-shell { }; + nix-your-shell = callPackage ../shells/nix-your-shell { }; + bash = lowPrio (callPackage ../shells/bash/5.nix { binutils = stdenv.cc.bintools; }); From 32eecc6cc96ba426cda9a8e7ab66d931eb141cee Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 5 Feb 2023 14:16:08 +0900 Subject: [PATCH 70/73] haskellPackages.heystone: fix darwin dylibs --- pkgs/development/haskell-modules/configuration-darwin.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 2c40ee7711ee..2ea7f41ed79f 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -311,6 +311,8 @@ self: super: ({ # https://github.com/NixOS/nixpkgs/issues/149692 Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; + heystone = addBuildTool pkgs.fixDarwinDylibNames super.heystone; + } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: From bcbb17dc0820d00ce8b859c2cef72e5453e7d015 Mon Sep 17 00:00:00 2001 From: Marin Date: Sat, 11 Feb 2023 10:30:33 -0500 Subject: [PATCH 71/73] age-plugin-yubikey: 0.3.2 -> 0.3.3 --- pkgs/tools/security/age-plugin-yubikey/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/age-plugin-yubikey/default.nix b/pkgs/tools/security/age-plugin-yubikey/default.nix index 67c850eba4ae..2a7701ed9e3f 100644 --- a/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "age-plugin-yubikey"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x4J8lE4Peenu3I7bZ3yoLpyukkMHD2re63GCni0cfnI="; + sha256 = "sha256-b7/65mfUr4p8tP4uU/BFonW0DqTTMIhEgB2xIwIxQVg="; }; - cargoSha256 = "sha256-Qp7AXy044G17FxR2sopN00cgX91A8TAydrwvJrAfhns="; + cargoSha256 = "sha256-LnHpinNZZHrIEWrVW0t1ja5WN57/fmiSmZlB0ylau8Y="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 3ba3e203479686fa3c6506f9a48acaa28b154756 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Sun, 12 Feb 2023 12:29:13 +0800 Subject: [PATCH 72/73] nixos/virtualisation/linode-image: Migrate to new openssh options. --- nixos/modules/virtualisation/linode-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/linode-config.nix b/nixos/modules/virtualisation/linode-config.nix index d664e8269f41..bbf81bda9c02 100644 --- a/nixos/modules/virtualisation/linode-config.nix +++ b/nixos/modules/virtualisation/linode-config.nix @@ -6,8 +6,8 @@ with lib; services.openssh = { enable = true; - permitRootLogin = "prohibit-password"; - passwordAuthentication = mkDefault false; + settings.PermitRootLogin = "prohibit-password"; + settings.PasswordAuthentication = mkDefault false; }; networking = { From 8ef7a3b83fdd90c307582a39764792c07b0b9ca1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 12 Feb 2023 03:09:06 +0000 Subject: [PATCH 73/73] =?UTF-8?q?terraform-providers.grafana:=201.34.0=20?= =?UTF-8?q?=E2=86=92=201.35.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 428fc225e1b5..896143421298 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -467,13 +467,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", + "hash": "sha256-4K0Pk7tgnOjFdHpe6SZNSt/wU8OBzdB/y99nibW5bAY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.34.0", + "rev": "v1.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" + "vendorHash": "sha256-oSpAq2834Nt+E8l64YhvuXdfUsoTU5rBr2I8+Yz9tkc=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=",