From c0da39e7bb6d4f326c5ed07e76883c57dfe3fad4 Mon Sep 17 00:00:00 2001 From: RaySlash Date: Tue, 26 Sep 2023 14:06:15 +1000 Subject: [PATCH 001/203] maintainers: add rayslash Add rayslash in maintainer list. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3de94c1ed5b8..574f01add772 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14427,6 +14427,12 @@ githubId = 145816; name = "David McKay"; }; + rayslash = { + email = "stevemathewjoy@tutanota.cm"; + github = "rayslash"; + githubId = 45141270; + name = "Steve Mathew Joy"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "freeman42x"; From 082a03e152664089552d3d83b033bd1d5a451d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 11 Oct 2023 12:34:04 +0200 Subject: [PATCH 002/203] haskell.compiler.ghc*Binary: fix globbing --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 1 + pkgs/development/compilers/ghc/8.10.7-binary.nix | 1 + pkgs/development/compilers/ghc/9.2.4-binary.nix | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 41461a26d425..3454d543cdbe 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -212,6 +212,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index 22552fa67fb2..9adeb8330625 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -210,6 +210,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 79b006ce5537..dd35ed560e71 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -196,6 +196,7 @@ stdenv.mkDerivation rec { (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in lib.concatStringsSep "\n" [ ('' + shopt -u nullglob echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" if ! test -e ${buildExeGlob}; then echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; @@ -368,7 +369,9 @@ stdenv.mkDerivation rec { # Recache package db which needs to happen for Hadrian bindists # where we modify the package db before installing + '' - "$out/bin/ghc-pkg" --package-db="$out/lib/"ghc-*/package.conf.d recache + shopt -s nullglob + package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d) + "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; # In nixpkgs, musl based builds currently enable `pie` hardening by default From d73c49026a37079a61307386864e71d84205a983 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 22 Oct 2023 02:31:26 +0200 Subject: [PATCH 003/203] haskellPackages: stackage LTS 21.14 -> LTS 21.16 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 143 +++++++++--------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index e3444f9fbfca..8be7c0fe44f3 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 21.14 +# Stackage LTS 21.16 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -117,7 +117,7 @@ default-package-overrides: - audacity ==0.0.2.1 - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - - autodocodec ==0.2.0.5 + - autodocodec ==0.2.1.0 - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 @@ -148,8 +148,8 @@ default-package-overrides: - base-compat ==0.12.3 - base-compat-batteries ==0.12.3 - basement ==0.0.16 - - base-orphans ==0.9.0 - - base-prelude ==1.6.1 + - base-orphans ==0.9.1 + - base-prelude ==1.6.1.1 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - battleship-combinatorics ==0.0.1 @@ -182,7 +182,7 @@ default-package-overrides: - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - binary-orphans ==1.0.4.1 - - binary-parser ==0.5.7.3 + - binary-parser ==0.5.7.4 - binary-search ==2.0.0 - binary-shared ==0.8.3 - binary-tagged ==0.3.1 @@ -199,7 +199,7 @@ default-package-overrides: - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0 - Blammo ==1.1.2.1 - - blank-canvas ==0.7.3 + - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 - blas-comfort-array ==0.0.0.3 @@ -248,7 +248,7 @@ default-package-overrides: - bugsnag-hs ==0.2.0.12 - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.0.1 - - bugzilla-redhat ==1.0.1 + - bugzilla-redhat ==1.0.1.1 - burrito ==2.0.1.6 - bv ==0.5 - byteable ==0.1.1 @@ -265,7 +265,7 @@ default-package-overrides: - bytestring-builder ==0.10.8.2.0 - bytestring-lexing ==0.5.0.10 - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.6 + - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.10 - bytestring-trie ==0.2.7.2 @@ -365,9 +365,9 @@ default-package-overrides: - colourista ==0.1.0.2 - columnar ==1.0.0.0 - combinatorial ==0.1.1 - - comfort-array ==0.5.2.3 + - comfort-array ==0.5.3 - comfort-array-shape ==0.0 - - comfort-blas ==0.0.0.1 + - comfort-blas ==0.0.1 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 @@ -391,7 +391,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.3 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.19 + - concurrent-output ==1.10.20 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - conduino ==0.2.2.0 @@ -546,7 +546,7 @@ default-package-overrides: - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - - deferred-folds ==0.9.18.3 + - deferred-folds ==0.9.18.5 - dejafu ==2.4.0.5 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -702,7 +702,7 @@ default-package-overrides: - errors-ext ==0.4.2 - ersatz ==0.4.13 - esqueleto ==3.5.10.3 - - event-list ==0.1.2 + - event-list ==0.1.2.1 - eventstore ==1.4.2 - every ==0.0.1 - evm-opcodes ==0.1.2 @@ -742,6 +742,7 @@ default-package-overrides: - fast-logger ==3.2.2 - fast-math ==1.0.2 - fastmemo ==0.1.1 + - fast-myers-diff ==0.0.0 - fb ==2.1.1.1 - fcf-family ==0.2.0.0 - fdo-notify ==0.3.1 @@ -860,27 +861,27 @@ default-package-overrides: - genvalidity-case-insensitive ==0.0.0.1 - genvalidity-containers ==1.0.0.1 - genvalidity-criterion ==1.1.0.0 - - genvalidity-hspec ==1.0.0.2 + - genvalidity-hspec ==1.0.0.3 - genvalidity-hspec-aeson ==1.0.0.0 - genvalidity-hspec-binary ==1.0.0.0 - genvalidity-hspec-cereal ==1.0.0.0 - - genvalidity-hspec-hashable ==1.0.0.0 + - genvalidity-hspec-hashable ==1.0.0.1 - genvalidity-hspec-optics ==1.0.0.0 - genvalidity-hspec-persistent ==1.0.0.0 - - genvalidity-mergeful ==0.3.0.0 + - genvalidity-mergeful ==0.3.0.1 - genvalidity-mergeless ==0.3.0.0 - - genvalidity-persistent ==1.0.0.1 + - genvalidity-persistent ==1.0.0.2 - genvalidity-property ==1.0.0.0 - genvalidity-scientific ==1.0.0.0 - genvalidity-sydtest ==1.0.0.0 - genvalidity-sydtest-aeson ==1.0.0.0 - - genvalidity-sydtest-hashable ==1.0.0.0 + - genvalidity-sydtest-hashable ==1.0.0.1 - genvalidity-sydtest-lens ==1.0.0.0 - genvalidity-sydtest-persistent ==1.0.0.0 - genvalidity-text ==1.0.0.1 - genvalidity-time ==1.0.0.1 - genvalidity-typed-uuid ==0.1.0.1 - - genvalidity-unordered-containers ==1.0.0.0 + - genvalidity-unordered-containers ==1.0.0.1 - genvalidity-uuid ==1.0.0.1 - genvalidity-vector ==1.0.0.0 - geodetics ==0.1.2 @@ -900,11 +901,11 @@ default-package-overrides: - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.12 - ghc-syntax-highlighter ==0.0.9.0 - - ghc-tcplugins-extra ==0.4.4 + - ghc-tcplugins-extra ==0.4.5 - ghc-trace-events ==0.1.2.7 - - ghc-typelits-extra ==0.4.5 - - ghc-typelits-knownnat ==0.7.8 - - ghc-typelits-natnormalise ==0.7.8 + - ghc-typelits-extra ==0.4.6 + - ghc-typelits-knownnat ==0.7.9 + - ghc-typelits-natnormalise ==0.7.9 - ghc-typelits-presburger ==0.7.2.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.27 @@ -1069,7 +1070,7 @@ default-package-overrides: - hfsevents ==0.1.6 - hgal ==2.0.0.3 - hidapi ==0.1.8 - - hi-file-parser ==0.1.4.0 + - hi-file-parser ==0.1.5.0 - highlighting-kate ==0.6.4 - hindent ==6.0.0 - hinfo ==0.0.3.0 @@ -1282,7 +1283,7 @@ default-package-overrides: - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1.1 - - indexed-traversable ==0.1.2.1 + - indexed-traversable ==0.1.3 - indexed-traversable-instances ==0.1.1.2 - inf-backprop ==0.1.0.2 - infer-license ==0.2.0 @@ -1332,7 +1333,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.9 + - isomorphism-class ==0.1.0.10 - iterable ==3.0 - ix-shapable ==0.1.0 - jack ==0.7.2.2 @@ -1361,7 +1362,7 @@ default-package-overrides: - justified-containers ==0.3.0.0 - jwt ==0.11.0 - kan-extensions ==5.2.5 - - kansas-comet ==0.4.1 + - kansas-comet ==0.4.2 - katip ==0.8.7.4 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.2.2 @@ -1375,11 +1376,11 @@ default-package-overrides: - keyed-vals-mem ==0.2.2.0 - keyed-vals-redis ==0.2.2.0 - keys ==3.12.3 - - ki ==1.0.1.0 + - ki ==1.0.1.1 - kind-apply ==0.4.0.0 - kind-generics ==0.5.0.0 - kind-generics-th ==0.2.3.3 - - ki-unlifted ==1.0.0.1 + - ki-unlifted ==1.0.0.2 - kleene ==0.1 - kmeans ==0.1.3 - knob ==0.2.2 @@ -1454,10 +1455,10 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.8.1 + - ListLike ==4.7.8.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-t ==1.0.5.6 + - list-t ==1.0.5.7 - list-transformer ==1.0.9 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 @@ -1548,9 +1549,9 @@ default-package-overrides: - microlens ==0.4.13.1 - microlens-aeson ==2.5.1 - microlens-contra ==0.1.0.3 - - microlens-ghc ==0.4.14.1 + - microlens-ghc ==0.4.14.2 - microlens-mtl ==0.2.0.3 - - microlens-platform ==0.4.3.3 + - microlens-platform ==0.4.3.4 - microlens-th ==0.4.3.14 - microspec ==0.2.1.3 - microstache ==1.0.2.3 @@ -1672,7 +1673,7 @@ default-package-overrides: - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.5.1.3 + - neat-interpolation ==0.5.1.4 - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 @@ -1687,7 +1688,7 @@ default-package-overrides: - netwire-input-glfw ==0.0.11 - network ==3.1.4.0 - network-bsd ==2.8.1.0 - - network-byte-order ==0.1.6 + - network-byte-order ==0.1.7 - network-conduit-tls ==1.3.2 - network-info ==0.2.1 - network-ip ==0.3.0.3 @@ -1711,11 +1712,11 @@ default-package-overrides: - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.5 - - non-empty ==0.3.4 + - non-empty ==0.3.5 - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.2.0 + - nonempty-vector ==0.2.3 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 @@ -1852,8 +1853,8 @@ default-package-overrides: - pem ==0.2.4 - percent-format ==0.0.4 - perfect-hash-generator ==1.0.0 - - persistent ==2.14.5.2 - - persistent-discover ==0.1.0.6 + - persistent ==2.14.6.0 + - persistent-discover ==0.1.0.7 - persistent-documentation ==0.1.0.4 - persistent-iproute ==0.2.5 - persistent-lens ==1.0.0 @@ -1862,10 +1863,10 @@ default-package-overrides: - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.13.6.1 - - persistent-qq ==2.12.0.5 + - persistent-qq ==2.12.0.6 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 - - persistent-sqlite ==2.13.1.1 + - persistent-sqlite ==2.13.2.0 - persistent-template ==2.12.0.0 - persistent-test ==2.13.1.3 - persistent-typed-db ==0.1.0.7 @@ -1908,7 +1909,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.2 + - polysemy ==1.9.1.3 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.1 - polysemy-webserver ==0.2.1.2 @@ -1955,7 +1956,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.7 + - primitive-extras ==0.10.1.8 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 @@ -1997,7 +1998,7 @@ default-package-overrides: - PyF ==0.11.1.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.8 + - qrcode-core ==0.9.9 - qrcode-juicypixels ==0.8.5 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 @@ -2009,7 +2010,7 @@ default-package-overrides: - quickcheck-classes-base ==0.6.2.0 - quickcheck-groups ==0.0.0.0 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.29.1 + - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - quickcheck-monoid-subclasses ==0.1.0.0 - quickcheck-simple ==0.1.1.1 @@ -2097,7 +2098,7 @@ default-package-overrides: - rel8 ==1.4.1.0 - relapse ==1.0.0.1 - reliable-io ==0.0.2 - - relude ==1.2.0.0 + - relude ==1.2.1.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2136,7 +2137,7 @@ default-package-overrides: - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - - rrb-vector ==0.2.0.0 + - rrb-vector ==0.2.0.1 - RSA ==2.4.1 - rss ==3000.2.0.7 - rss-conduit ==0.6.0.1 @@ -2291,7 +2292,7 @@ default-package-overrides: - simple-vec3 ==0.6.0.1 - since ==0.0.0 - singleton-bool ==0.1.6 - - singleton-nats ==0.4.6 + - singleton-nats ==0.4.7 - singletons ==3.0.2 - singletons-base ==3.1.1 - singletons-presburger ==0.7.2.0 @@ -2338,7 +2339,7 @@ default-package-overrides: - speedy-slice ==0.3.2 - splice ==0.6.1.1 - split ==0.2.3.5 - - splitmix ==0.1.0.4 + - splitmix ==0.1.0.5 - splitmix-distributions ==1.0.0 - split-record ==0.1.1.4 - Spock ==0.14.0.0 @@ -2378,7 +2379,7 @@ default-package-overrides: - stm-containers ==1.2.0.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.11 + - stm-hamt ==1.2.0.13 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.7 - stm-split ==0.0.2.1 @@ -2387,10 +2388,10 @@ default-package-overrides: - storable-endian ==0.2.6.1 - storable-record ==0.0.7 - storable-tuple ==0.1 - - storablevector ==0.2.13.1 - - store ==0.7.16 - - store-core ==0.4.4.4 - - store-streaming ==0.2.0.3 + - storablevector ==0.2.13.2 + - store ==0.7.18 + - store-core ==0.4.4.6 + - store-streaming ==0.2.0.5 - stratosphere ==0.60.0 - Stream ==0.4.7.2 - streaming ==0.2.4.0 @@ -2438,28 +2439,28 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.7 - - swish ==0.10.6.0 + - swish ==0.10.7.0 - syb ==0.7.2.4 - - sydtest ==0.15.1.0 + - sydtest ==0.15.1.1 - sydtest-aeson ==0.1.0.0 - sydtest-amqp ==0.1.0.0 - sydtest-autodocodec ==0.0.0.0 - - sydtest-discover ==0.0.0.3 + - sydtest-discover ==0.0.0.4 - sydtest-hedgehog ==0.4.0.0 - sydtest-hedis ==0.0.0.0 - sydtest-mongo ==0.0.0.0 - - sydtest-persistent ==0.0.0.1 - - sydtest-persistent-postgresql ==0.2.0.2 - - sydtest-persistent-sqlite ==0.2.0.2 + - sydtest-persistent ==0.0.0.2 + - sydtest-persistent-postgresql ==0.2.0.3 + - sydtest-persistent-sqlite ==0.2.0.3 - sydtest-process ==0.0.0.0 - sydtest-rabbitmq ==0.1.0.0 - sydtest-servant ==0.2.0.2 - sydtest-typed-process ==0.0.0.0 - - sydtest-wai ==0.2.0.0 + - sydtest-wai ==0.2.0.1 - sydtest-webdriver ==0.0.0.1 - - sydtest-webdriver-screenshot ==0.0.0.1 + - sydtest-webdriver-screenshot ==0.0.0.2 - sydtest-webdriver-yesod ==0.0.0.1 - - sydtest-yesod ==0.3.0.1 + - sydtest-yesod ==0.3.0.2 - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 @@ -2552,7 +2553,7 @@ default-package-overrides: - text-builder-linear ==0.1.1.1 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - - text-icu ==0.8.0.3 + - text-icu ==0.8.0.4 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2564,7 +2565,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.5 - text-show ==3.10.4 - - text-show-instances ==3.9.6 + - text-show-instances ==3.9.7 - text-zipper ==0.13 - tfp ==1.0.2 - tf-random ==0.5 @@ -2667,7 +2668,7 @@ default-package-overrides: - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - typecheck-plugin-nat-simple ==0.1.0.9 - - typed-process ==0.2.11.0 + - typed-process ==0.2.11.1 - typed-uuid ==0.2.0.0 - type-equality ==1 - type-errors ==0.2.0.2 @@ -2748,12 +2749,12 @@ default-package-overrides: - utf8-string ==1.0.2 - utility-ht ==0.0.17 - uuid ==1.3.15 - - uuid-types ==1.0.5 + - uuid-types ==1.0.5.1 - valida ==1.1.0 - valida-base ==0.2.0 - validate-input ==0.5.0.0 - validationt ==0.3.0 - - validity ==0.12.0.1 + - validity ==0.12.0.2 - validity-aeson ==0.2.0.5 - validity-bytestring ==0.4.1.1 - validity-case-insensitive ==0.0.0.0 @@ -2771,7 +2772,7 @@ default-package-overrides: - vault ==0.3.1.5 - vcs-ignore ==0.0.2.0 - vec ==0.5 - - vector ==0.13.0.0 + - vector ==0.13.1.0 - vector-algorithms ==0.9.0.1 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 @@ -2788,7 +2789,7 @@ default-package-overrides: - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==6.0.1 + - versions ==6.0.2 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -2917,7 +2918,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.17 - - Yampa ==0.14.4 + - Yampa ==0.14.5 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 From e5997282a390870f80174fbb18ea39aeafb3984c Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 22 Oct 2023 02:31:45 +0200 Subject: [PATCH 004/203] all-cabal-hashes: 2023-10-04T18:27:12Z -> 2023-10-21T19:49:07Z 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 fd0f1b564733..cbfd42dfc874 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz", - "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v", - "msg": "Update from Hackage at 2023-10-04T18:27:12Z" + "commit": "49d09494dd24eae895fe1260e2c26157f740e451", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", + "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", + "msg": "Update from Hackage at 2023-10-21T19:49:07Z" } From 13fea7f2add742b9b969fc7fe32f01f28684b3b5 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 22 Oct 2023 02:32:54 +0200 Subject: [PATCH 005/203] 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 | 3787 ++++++++++------- 1 file changed, 2360 insertions(+), 1427 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f46ce422cc7f..dc371485e31d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,39 +811,39 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, aeson, alex, array, async, base, binary - , blaze-html, boxes, bytestring, Cabal, case-insensitive + ({ mkDerivation, aeson, alex, ansi-terminal, array, async, base + , binary, blaze-html, boxes, bytestring, Cabal, case-insensitive , containers, data-hash, deepseq, directory, dlist, edit-distance , emacs, equivalence, exceptions, filepath, ghc-compact, gitrev , happy, hashable, haskeline, monad-control, mtl, murmur-hash - , parallel, pretty, process, regex-tdfa, split, stm, STMonadTrans - , strict, text, time, time-compat, transformers + , parallel, peano, pretty, process, regex-tdfa, split, stm + , STMonadTrans, strict, text, time, time-compat, transformers , unordered-containers, uri-encode, vector, vector-hashtables, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.3"; - sha256 = "05k0insn1c2dbpddl1slcdn972j8vgkzzy870yxl43j75j0ckb5y"; - revision = "4"; - editedCabalFile = "1xfhn4ap5h5aj9vp9m474p98jz7g4azf5m7ngwbj7ivhgnkl32wh"; + version = "2.6.4"; + sha256 = "0jzgynv737f4lwamyx1lihrabib0qcaik3cs5zrxryjpj5qvqb2v"; + revision = "1"; + editedCabalFile = "1n3w7ajswgafyjzc8ym1dqpmralnsaj3923qxvs4n0xdc6rc72r9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ - aeson array async base binary blaze-html boxes bytestring - case-insensitive containers data-hash deepseq directory dlist - edit-distance equivalence exceptions filepath ghc-compact gitrev - hashable haskeline monad-control mtl murmur-hash parallel pretty - process regex-tdfa split stm STMonadTrans strict text time - time-compat transformers unordered-containers uri-encode vector - vector-hashtables zlib + aeson ansi-terminal array async base binary blaze-html boxes + bytestring case-insensitive containers data-hash deepseq directory + dlist edit-distance equivalence exceptions filepath ghc-compact + gitrev hashable haskeline monad-control mtl murmur-hash parallel + peano pretty process regex-tdfa split stm STMonadTrans strict text + time time-compat transformers unordered-containers uri-encode + vector vector-hashtables zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.abbradar lib.maintainers.iblech lib.maintainers.turion @@ -867,15 +867,17 @@ self: { }) {}; "AhoCorasick" = callPackage - ({ mkDerivation, array, base, hashable, mtl, unordered-containers + ({ mkDerivation, array, base, containers, hashable, mtl, tasty + , tasty-hunit, unordered-containers }: mkDerivation { pname = "AhoCorasick"; - version = "0.0.3"; - sha256 = "171im3xhrgdzhpxmi1350323apy58pisap0dskcibd3g4jmzslza"; + version = "0.0.4"; + sha256 = "12ddmnmlf46g23j31q0rgh67bh0brjb6p5iax5qi78n39c0pwlz5"; libraryHaskellDepends = [ array base hashable mtl unordered-containers ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Aho-Corasick string matching algorithm"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -1173,8 +1175,8 @@ self: { }: mkDerivation { pname = "AsyncRattus"; - version = "0.1"; - sha256 = "0ppij9i4nv26dkc9gb5b669bvb3wipx1a5kam23cx5gia60k45s1"; + version = "0.1.0.1"; + sha256 = "0q1ly8452dyyhgfy94k122mrk6v9wwzmszfp41rs8asqfvlj905f"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc hashtables simple-affine-space transformers @@ -2108,6 +2110,8 @@ self: { pname = "Blammo"; version = "1.1.2.1"; sha256 = "0j71glqsvzrmvj5ag32n48ib8wyyasjw0vdz2g93l2g2zhmsyz8y"; + revision = "1"; + editedCabalFile = "12kfvkvc78d386w4v8wdhwb3xd6470cnpqsaxd5kwldvvaz5hznj"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2850,15 +2854,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_1_0" = callPackage + "Cabal_3_10_2_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.1.0"; - sha256 = "1vlqrh75s1n82ymd7yxbmy9py1n35fvdhw7hn1ph2y1i9j7apnqb"; + version = "3.10.2.0"; + sha256 = "0nsnf14ja30vhsqf2scaqb1a4wjr8491i83nxi4r9m47m40yw8sc"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2929,15 +2933,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal-syntax_3_10_1_0" = callPackage + "Cabal-syntax_3_10_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers, unix }: mkDerivation { pname = "Cabal-syntax"; - version = "3.10.1.0"; - sha256 = "08pmafs761bk892s2arf8s17wswhxr8ar642vsh6hxrjalihk01v"; + version = "3.10.2.0"; + sha256 = "0j2j4r93rjidrgfjgwfm25l369yq3zklcqvgq4891k9ik98irkvs"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -3110,8 +3114,8 @@ self: { pname = "Chart"; version = "1.9.4"; sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; - revision = "1"; - editedCabalFile = "0l9irzb4zq5jhgl1rvwgxz6rrzxjndj4arjv7adlzs5zl43iazqr"; + revision = "3"; + editedCabalFile = "0yppwi2cqy46dzasbdvq2120m8zrak1lj1qhlv5x7dzbdrji0529"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -6291,8 +6295,8 @@ self: { }: mkDerivation { pname = "FiniteCategories"; - version = "0.3.0.1"; - sha256 = "0jsggzvdxx7v02inl68fc3x86xrbsn2407hnfqy5c9rkiiqx7w94"; + version = "0.5.0.0"; + sha256 = "022cli3n96389dkcff85kbg95a2v4zmr66pmv36g1pjxvgsr6ffn"; libraryHaskellDepends = [ base containers directory filepath random text WeakSets ]; @@ -6310,8 +6314,8 @@ self: { }: mkDerivation { pname = "FiniteCategoriesGraphViz"; - version = "0.1.0.0"; - sha256 = "07ssar4sv8wma7imgc9mnx77c4kd9n9bqr87f1d5aqxvv2a62np0"; + version = "0.2.0.0"; + sha256 = "1ff4mqbqlpki959d9qcq6h91v4p93iq4llac47kgzv98mcwvy146"; libraryHaskellDepends = [ base containers directory fgl filepath FiniteCategories graphviz process random text WeakSets @@ -6373,6 +6377,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "Flint2" = callPackage + ({ mkDerivation, base, flint, gmp, groups, QuickCheck }: + mkDerivation { + pname = "Flint2"; + version = "0.1.0.1"; + sha256 = "1jw0x82mgqy4pxwxpyv0crz7n72kv255iq4pxr8c5xkvsw6w2w5i"; + libraryHaskellDepends = [ base groups QuickCheck ]; + librarySystemDepends = [ flint gmp ]; + libraryPkgconfigDepends = [ flint gmp ]; + testHaskellDepends = [ base ]; + description = "Haskell bindings for the flint library for number theory"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) flint; inherit (pkgs) gmp;}; + "Flippi" = callPackage ({ mkDerivation, base, cgi, containers, directory, haskell98 , old-time, parsec, xhtml @@ -9797,8 +9815,8 @@ self: { pname = "HTTP"; version = "4000.4.1"; sha256 = "0lyl5lpkk51xn3dfndh8ksgvwcdsviyigmsnp3d28lbpxkpxhcfz"; - revision = "2"; - editedCabalFile = "1bpq8xjyrgcxs6yf6wh7ada2xrln1dqi02b5ilj8gwn1p30hq8nr"; + revision = "3"; + editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time transformers @@ -10170,6 +10188,8 @@ self: { pname = "HaXml"; version = "1.25.13"; sha256 = "0wxkp9bnbnjrjrzsmpm6nknzn0ijiiajd5kms81kgyfypm4m91ax"; + revision = "1"; + editedCabalFile = "0rj3d04yw276hwbw09x2ydm5pmkfmm917cc540bwi9x108ksbr1g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11371,6 +11391,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "HsYAML_0_2_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.1.3"; + sha256 = "144xixvi6nfhg1rjq5aglj0vmvpf482rxzn5vlv19n4gbfnaj9p0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl , scientific, text, unordered-containers, vector @@ -11379,8 +11421,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "9"; - editedCabalFile = "1rfaj175vh635s8csm6pazrvwwaw8gg3axi2cchpafw5pb9n5xg8"; + revision = "10"; + editedCabalFile = "1x99nqpd037a5p0lqk6qn9cmdafgcajk4gnvxd5dw5gdpyq85x3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13285,10 +13327,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.8.1"; - sha256 = "10i1ynfhafnmiw0ka9w0v05y5dcdcifsh0kx5f8py1k5ax1ha4by"; - revision = "2"; - editedCabalFile = "0bdj0m0wjxzkrhdjdmaazgh7hwgvdjmnjsawyn83pjl6l36ygmxh"; + version = "4.7.8.2"; + sha256 = "1m7rmz8qkyb6c2mag4p39gw9cjhw7xdsshvb7vik8694l3qplqxd"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -14328,8 +14368,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "3"; - editedCabalFile = "0v61hlrggnflb9cbpzs3nw8km12scsnvgz9a0gb8lwi26ksgqmnz"; + revision = "4"; + editedCabalFile = "0hz8l2yx9p5qwis7lxsnk7n3zss00hw3rxphhj6ih56ppjv7d6h3"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -16168,6 +16208,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; + revision = "1"; + editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -17258,12 +17300,14 @@ self: { }) {}; "QuickCheck-GenT" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, random }: + ({ mkDerivation, base, mmorph, QuickCheck, random, transformers }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.2.2"; - sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz"; - libraryHaskellDepends = [ base mtl QuickCheck random ]; + version = "0.2.2.1"; + sha256 = "16kn7l98h7px3644gjc24a8pgisy1gr3w5k4gzw71dp6msqcbnqh"; + libraryHaskellDepends = [ + base mmorph QuickCheck random transformers + ]; description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; }) {}; @@ -17841,6 +17885,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "Rattus_0_5_1_1" = callPackage + ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space + , transformers + }: + mkDerivation { + pname = "Rattus"; + version = "0.5.1.1"; + sha256 = "171ssph6mx12cfc1wx63qn41s7w7fsv686kr6zchd2dg6pwn60gz"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base containers ghc simple-affine-space transformers + ]; + testHaskellDepends = [ base containers ]; + description = "A modal FRP language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -21844,8 +21906,8 @@ self: { }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.10.5"; - sha256 = "1brqn6zx4ynljc424dpwrxj5fjmvl0mgp7wycnzpfxpfmwwqib4a"; + version = "0.11.0.1"; + sha256 = "0v8grsc28sni1mapnr56mvmg956q8nw6qqkdfwwhksyykfz6w9fm"; libraryHaskellDepends = [ base bytestring system-cxx-std-lib transformers vector vulkan ]; @@ -22038,8 +22100,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.4.0.1"; - sha256 = "0lv7vwj3vl8i18w2l0jkv6i3l9ihpy7lrxd84s666fspx6fxkdp9"; + version = "1.5.0.0"; + sha256 = "1h6n8z1f097rgzymx4ivqbkwiv7c9ignkpbybp342rw3k6cd7rk3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -22902,8 +22964,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.4"; - sha256 = "1lj1fj77ajckxhv9avx22djyl4jp44693y54j6hyx0xfp4dafhr5"; + version = "0.14.5"; + sha256 = "1pr9g5rhxx9v54f4d0cjwy9yr6wd32ssi23wms8kmf9avjbi0gms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25631,7 +25693,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_2_0_0" = callPackage + "aeson_2_2_1_0" = callPackage ({ mkDerivation, base, base-compat, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist , exceptions, filepath, generic-deriving, generically, ghc-prim @@ -25645,15 +25707,17 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.2.0.0"; - sha256 = "0z1f65iv0sigiqmm4vwbj3bzmn0ka0m56nkalhv2h5r9jc0y4rfx"; + version = "2.2.1.0"; + sha256 = "0zsxkb7lizn1c1a5q4jzg4wyxb17njx2rahxf9fdn4hdx38fykli"; + revision = "1"; + editedCabalFile = "1jrny4i1hc335yz5vc2r1nx1lnpy5q5jqqg1fc2y2cw2vam62fm2"; libraryHaskellDepends = [ base bytestring containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable - integer-conversion network-uri OneTuple primitive QuickCheck - scientific semialign strict tagged template-haskell text - text-iso8601 text-short th-abstraction these time time-compat - unordered-containers uuid-types vector witherable + integer-conversion integer-logarithms network-uri OneTuple + primitive QuickCheck scientific semialign strict tagged + template-haskell text text-iso8601 text-short th-abstraction these + time time-compat unordered-containers uuid-types vector witherable ]; testHaskellDepends = [ base base-compat base-orphans base16-bytestring bytestring @@ -26635,6 +26699,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-unqualified-ast" = callPackage + ({ mkDerivation, aeson, base, scientific, text, vector }: + mkDerivation { + pname = "aeson-unqualified-ast"; + version = "1.0.0.3"; + sha256 = "09a0mj7cwwh9jppg8a9n69zq86gma3ssqzxjwfy1nqwqa0sa1dd2"; + libraryHaskellDepends = [ aeson base scientific text vector ]; + description = "Aliases to \"aeson\" AST making it importable unqualified"; + license = lib.licenses.mit; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -27037,6 +27112,30 @@ self: { mainProgram = "agda2lagda"; }) {}; + "agda2train" = callPackage + ({ mkDerivation, aeson, aeson-pretty, Agda, async, base, bytestring + , containers, deepseq, directory, file-embed, filepath, mtl, pretty + , unordered-containers + }: + mkDerivation { + pname = "agda2train"; + version = "0.0.3.0"; + sha256 = "0kc49cwkdj7fgfbi4nwwdk675bnnw2zqj09snlczm3yc0357gkfa"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson Agda async base containers file-embed mtl pretty + ]; + executableHaskellDepends = [ + aeson aeson-pretty Agda async base bytestring containers deepseq + directory file-embed filepath mtl pretty unordered-containers + ]; + doHaddock = false; + description = "Agda backend to generate training data for machine learning purposes"; + license = lib.licenses.bsd3; + mainProgram = "agda2train"; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -27271,8 +27370,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.9.1"; - sha256 = "15l6lgzl64ym21rzf6dbp927bj0s23kx9rp2z34k36ghy4sbdqjz"; + version = "6.0.0"; + sha256 = "1pqib3g333zhzpra22qxilwbw6v54dnzciqwi5668rhwnv66a8h4"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -27287,8 +27386,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.3.2"; - sha256 = "1bd85lk70h6p4a1v0h8dhbnsx5sc8cyj916kaq1hn6r0ykkrnsjd"; + version = "0.4"; + sha256 = "0civg85a1rv3n2400fi9hi30zb1l1sycxjccxxmkd8kk4izcjxkz"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl mwc-random random ]; @@ -27320,8 +27419,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.3.3"; - sha256 = "0ps0spjd7himcfgr9ahh27c24isdvxrihf4qv2sr7cs33n6h7hsj"; + version = "5.4.0"; + sha256 = "1b4izqmafs1biak33fgz5pr8xcjsr35g19r9d3y6sznjcc48d58b"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -27336,8 +27435,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-cairo"; - version = "5.1"; - sha256 = "0ya9zl73zjq6xnr5b6a15jcw9dvsjhlj2xz0xlc402v96siwb690"; + version = "5.4.1"; + sha256 = "1jg6cb4c4njw0n4kzx6ghdhd3zmza0h2vvzsi1w7jy2rzipzc1bm"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-cairo colour lens @@ -27353,8 +27452,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "5.3"; - sha256 = "10m85nx1jdvv3vyg6rmpjiajpch4pnyamh3vxw6b4dwn140zlqq8"; + version = "5.4.1"; + sha256 = "1mcyiz9b91zbsy098h5192j047rnws1hkqg59dnhk2dwg4kvapmn"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -27369,8 +27468,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-diagrams"; - version = "5.1"; - sha256 = "13vgcm5dmqml9751wylvshxvgx8bgki2ymfp87l1llrp8qfxy95j"; + version = "5.4.1"; + sha256 = "1g7xw4yc0bpgigq3zy1s7cw3kp6x4y9hplm23gwzf7kf5b0c8ivx"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-diagrams colour containers filepath lens @@ -27385,8 +27484,8 @@ self: { }: mkDerivation { pname = "aivika-gpss"; - version = "0.6.2"; - sha256 = "09dfb212jjyd4fwqbl1bmm5k2sndzpx47vw688vgnx37zd94jwwj"; + version = "0.7.1"; + sha256 = "140v910ivhryb5jan6an083xcjcghgdyqary0qyi4isjiikahlpq"; libraryHaskellDepends = [ aivika aivika-transformers base containers hashable mtl unordered-containers @@ -27403,8 +27502,8 @@ self: { }: mkDerivation { pname = "aivika-lattice"; - version = "0.6.2"; - sha256 = "0misn0pkrkfyyzg859y57ida2xc9ibmz5ykizj1fw30zsby57skl"; + version = "0.7"; + sha256 = "19zmzl8irs779m2g7284114fdk1z99kq6fnbw1cb2zwj3xl0212r"; libraryHaskellDepends = [ aivika aivika-transformers array base containers mtl mwc-random random @@ -27419,8 +27518,8 @@ self: { }: mkDerivation { pname = "aivika-realtime"; - version = "0.3.1"; - sha256 = "0wvv41ip4izwa22l7p6zz1sdr8vchlakvm5vka33r5gkq10fw6s9"; + version = "0.4"; + sha256 = "1v02fmcp271w3zbq68nzjlqhs2yn9v4ks6vcanjrcc9mrkfwz0m6"; libraryHaskellDepends = [ aivika aivika-transformers async base containers mtl mwc-random random stm time vector @@ -27435,8 +27534,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.9.1"; - sha256 = "0ii7g6a29fksg3lrk6vvlhaafdjssqypz92spksnpgjfv7iamk99"; + version = "6.0.0"; + sha256 = "1fr6zrf401sg5a8w3k0fman4d6qg9cfy9j1vsw58l5z609ma79jx"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -28176,8 +28275,8 @@ self: { ({ mkDerivation, assoc, base, bifunctors, lens, semigroupoids }: mkDerivation { pname = "alignment"; - version = "0.1.0.3"; - sha256 = "09icpp5s8sfygcq423mczmapn0ssc9s9i9v5cr78bf687wqy7yqv"; + version = "0.1.0.4"; + sha256 = "0579myc2fr0ksbsykyl6bw2v204vmvmkyc4phgm8dnmh921zchpz"; libraryHaskellDepends = [ assoc base bifunctors lens semigroupoids ]; @@ -32781,6 +32880,8 @@ self: { pname = "amazonka-mtl"; version = "0.1.1.0"; sha256 = "0r7fmffqj3yl6vwidfny4s2ynhkfx9h0di6l7pm79j5m5fp5vdvr"; + revision = "1"; + editedCabalFile = "1hsrc72v7qqbpzi5pqbjb8ysrhiiydk7fi6i9078nf8f1jammd4h"; libraryHaskellDepends = [ amazonka amazonka-core base conduit lens mtl resourcet unliftio-core @@ -36586,16 +36687,13 @@ self: { }) {}; "apecs-physics" = callPackage - ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + ({ mkDerivation, apecs, base, containers, inline-c, linear , template-haskell, vector }: mkDerivation { pname = "apecs-physics"; - version = "0.4.5"; - sha256 = "1ksxx5x998csgi3lr2yl18mk5sjccin20b15swyx1g9k7fsm7nx5"; - revision = "1"; - editedCabalFile = "0kzg82azksva8l13548qk4bkx5ww1z0ca1bv141gp4fr0vamw446"; - setupHaskellDepends = [ base Cabal ]; + version = "0.4.6"; + sha256 = "14x26x6c747fh1yrl50g0pwcirbk7r7qxvy48h8y8zrm0n158n5c"; libraryHaskellDepends = [ apecs base containers inline-c linear template-haskell vector ]; @@ -37352,8 +37450,8 @@ self: { }: mkDerivation { pname = "appendful-persistent"; - version = "0.1.0.0"; - sha256 = "0aw463j5qyjazzj7w325fn85nyz3i7rml1c5f02ps06n9rhw0w1k"; + version = "0.1.0.1"; + sha256 = "02l78jqyc20q1i4d1b83ds63pd2nl189wg29zbvwryjcajr8ci3f"; libraryHaskellDepends = [ appendful base containers microlens persistent ]; @@ -38050,8 +38148,8 @@ self: { pname = "arch-hs"; version = "0.11.1.0"; sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4"; - revision = "2"; - editedCabalFile = "17y3c5rk3bylmnm63x06a50wa5r38wbm18gq3w5mbf6pfqfimkj5"; + revision = "3"; + editedCabalFile = "1924crg373xid7pxcpi178njmiiaq1m8cf59y96zjhaw4z07054q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38085,6 +38183,8 @@ self: { pname = "arch-web"; version = "0.2"; sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; + revision = "1"; + editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -38689,8 +38789,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; - revision = "1"; - editedCabalFile = "0vpldqnwzanpn8bavcarlzbajx57j43ddfm91jl3qbi32x4mbzja"; + revision = "2"; + editedCabalFile = "0fxzpwvn8n2sfnjl6qqsh556sjyng4gw2ddfbvhzf346xb3nrnzv"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -40186,8 +40286,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "3"; - editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6"; + revision = "4"; + editedCabalFile = "0bax7cvg85jhg7n1rl2mdj90j4qn27ssaprkw7wr1r0lw3yfx34v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -41117,8 +41217,8 @@ self: { pname = "attoparsec"; version = "0.14.4"; sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz"; - revision = "4"; - editedCabalFile = "07sqs9rnxyjgrz22nxsx9xwj5hkljnyw8bqcbb75kbqi6c9ky6ba"; + revision = "5"; + editedCabalFile = "1bmih9b4b3vdad8mpwy6k15ay2k8zbxl0z5x40b47ml1p0wraw7c"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim scientific text transformers @@ -41149,14 +41249,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "attoparsec-aeson_2_2_0_0" = callPackage + "attoparsec-aeson_2_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , integer-conversion, primitive, scientific, text, vector }: mkDerivation { pname = "attoparsec-aeson"; - version = "2.2.0.0"; - sha256 = "1r228cpyd27658csc5pabbwjwf1q5q93a3f1fkymjh4ib4rzw27s"; + version = "2.2.0.1"; + sha256 = "02f406d5jh038qn8cccr0fbxkczhgzplmnfb448hrl25gcxg5ifg"; libraryHaskellDepends = [ aeson attoparsec base bytestring integer-conversion primitive scientific text vector @@ -41325,6 +41425,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-iso8601_1_1_0_1" = callPackage + ({ mkDerivation, attoparsec, base, integer-conversion, text, time + , time-compat + }: + mkDerivation { + pname = "attoparsec-iso8601"; + version = "1.1.0.1"; + sha256 = "0swi953apv2mm1q213afxiv2mmknzz5pmpdk824n1s26rfwny83k"; + libraryHaskellDepends = [ + attoparsec base integer-conversion text time time-compat + ]; + description = "Parsing of ISO 8601 dates, originally from aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-iteratee" = callPackage ({ mkDerivation, attoparsec, base, bytestring, iteratee , transformers @@ -41839,8 +41955,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.0.5"; - sha256 = "0wk84rnxdy6wh8953yx2gfn4kfpranv42w1hs13gxmrg0b2n3pjy"; + version = "0.2.1.0"; + sha256 = "0i65xldrrygy7y64y2s47fwm1n87zr753q777ii7gd2qs8hqx1wy"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -42569,6 +42685,8 @@ self: { pname = "aws-arn"; version = "0.3.1.0"; sha256 = "09jd8lf6w76adkcq5kycj1nwhr7qpn5ivm6dap3zlkngp0z9sdqb"; + revision = "1"; + editedCabalFile = "029q777z4pd0vnj9c4v1ivzjb7azj6aq8gb55bwidw21lq55p98r"; libraryHaskellDepends = [ base deriving-compat hashable profunctors tagged text ]; @@ -43299,6 +43417,8 @@ self: { pname = "aws-sns-verify"; version = "0.0.0.3"; sha256 = "1l6w3am550ls656s9hnjib6zj0g6471brsj4vn9c7i03qqwgdgmy"; + revision = "1"; + editedCabalFile = "1azc52s8akmf7kvlvxmnxkcbn5fhca9za5kzzypjanfj2ysdjpzr"; libraryHaskellDepends = [ aeson base bytestring crypton-x509 crypton-x509-validation errors http-conduit memory network-uri pem regex-tdfa text @@ -44249,6 +44369,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "barbies_2_0_5_0" = callPackage + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "barbies"; + version = "2.0.5.0"; + sha256 = "1j8c45k1x9vi9w44qnc8nyy0y4p97clvbq07vby7wn26zdawl8nm"; + libraryHaskellDepends = [ base distributive transformers ]; + testHaskellDepends = [ + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "barbies-layered" = callPackage ({ mkDerivation, barbies, base, doctest, doctest-discover, hspec , hspec-discover, transformers @@ -44436,12 +44573,12 @@ self: { broken = true; }) {}; - "base_4_18_1_0" = callPackage + "base_4_19_0_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.18.1.0"; - sha256 = "1kwz6pyg3mww3w6c7fkqz0av81lym2gnvq48501i8nzgkzg0gj26"; + version = "4.19.0.0"; + sha256 = "03cipapd0b522zsh65a65q4nvrq8f6himh7sdag49fpr2hnw4vr6"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -44459,12 +44596,12 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat_0_13_0" = callPackage + "base-compat_0_13_1" = callPackage ({ mkDerivation, base, ghc-prim, unix }: mkDerivation { pname = "base-compat"; - version = "0.13.0"; - sha256 = "03d3rr7v27giv90dz8128mzfa76qxkbvkzm7fiwh76l4v9sn1xlb"; + version = "0.13.1"; + sha256 = "08c43vzhq0dsnd8lqzrpimlj3h2386ybb8qksdk01fy8as6rw7fv"; libraryHaskellDepends = [ base ghc-prim unix ]; description = "A compatibility layer for base"; license = lib.licenses.mit; @@ -44486,14 +44623,14 @@ self: { license = lib.licenses.mit; }) {}; - "base-compat-batteries_0_13_0" = callPackage + "base-compat-batteries_0_13_1" = callPackage ({ mkDerivation, base, base-compat, foldable1-classes-compat , ghc-prim, hspec, hspec-discover, OneTuple, QuickCheck }: mkDerivation { pname = "base-compat-batteries"; - version = "0.13.0"; - sha256 = "161g4g8ncnwbqafxp5hdbmv4qfmscf7b3pd88l49nkyns50ays1p"; + version = "0.13.1"; + sha256 = "00m8lx2raldr6xvlc92za11a2sj3x0031vi6v3as0cnvl58mnliy"; libraryHaskellDepends = [ base base-compat foldable1-classes-compat ghc-prim OneTuple ]; @@ -44595,8 +44732,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.9.0"; - sha256 = "0qkfs49gm0zv946h47bi8nshp6b2d6d5drlslm4adm8y4kcd8gk1"; + version = "0.9.1"; + sha256 = "0wpi3q4y9rhk5k9mz8bjy8qbl3pfxm4qqbxym3b15cn5haijvgsv"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -44608,8 +44745,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "1.6.1"; - sha256 = "0rbx6k85svqrkw5ixp2xal8bg6xrz729g7rrhkgsr3ixv38k943j"; + version = "1.6.1.1"; + sha256 = "1lqxa8lhnhiyxkqcwq82a8g2sizhagy3l0z7x57xrmn9y81sy241"; libraryHaskellDepends = [ base ]; description = "Featureful preludes formed solely from the \"base\" package"; license = lib.licenses.mit; @@ -44752,6 +44889,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "base32_0_4" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, memory + , QuickCheck, random-bytestring, tasty, tasty-hunit + , tasty-quickcheck, text, text-short + }: + mkDerivation { + pname = "base32"; + version = "0.4"; + sha256 = "1m08m51d49lfs5rfc5kjj0g19xq53c2ldngcykld6a4ma0fqdrws"; + libraryHaskellDepends = [ + base bytestring deepseq text text-short + ]; + testHaskellDepends = [ + base bytestring memory QuickCheck random-bytestring tasty + tasty-hunit tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq memory random-bytestring text + ]; + description = "Fast RFC 4648-compliant Base32 encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "base32-bytestring" = callPackage ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion , hspec, QuickCheck @@ -45716,6 +45877,8 @@ self: { pname = "bcp47-orphans"; version = "0.1.0.6"; sha256 = "18r6wwj7sq5q1r9fg0kiss5p7h0qh485paginrc46lzygx4l5r3q"; + revision = "1"; + editedCabalFile = "0mf4plqqr6aw9jprp3fmmkpvk2g3h8hjn4wkp23ni07v818mlvlf"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent serialise text @@ -47467,8 +47630,8 @@ self: { pname = "binary-instances"; version = "1.0.4"; sha256 = "0pv4idgzl2wkm15ih594gbw6wihwrdspa91j5ajgwr4ikx6f3v3h"; - revision = "2"; - editedCabalFile = "04y9j42c3avfhf35jzh52w0zrp0m4j8cvbn3zqjjybyvhw3jgihf"; + revision = "3"; + editedCabalFile = "1ih6sdi3lhrpv78l9mikpz15r0yplnxgm9ml728ai4ja4hjjfwbb"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable primitive scientific tagged text text-binary time-compat @@ -47540,8 +47703,8 @@ self: { pname = "binary-orphans"; version = "1.0.4.1"; sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; - revision = "2"; - editedCabalFile = "1q9fbn41fi4wfk8mrm9izy5jna86gmy7gxhz94crqfhp5f89v58l"; + revision = "3"; + editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary OneTuple QuickCheck quickcheck-instances tagged tasty @@ -47552,18 +47715,16 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text - , transformers + ({ mkDerivation, base, base-prelude, bytestring, mtl, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "binary-parser"; - version = "0.5.7.3"; - sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd"; + version = "0.5.7.4"; + sha256 = "06lkx75q6ffbdjl442l035xf5rl5ykjzw4488w0xnxzlmyl4v0ms"; libraryHaskellDepends = [ base bytestring mtl text transformers ]; testHaskellDepends = [ - base base-prelude bytestring mtl QuickCheck quickcheck-instances - tasty tasty-hunit tasty-quickcheck text transformers + base-prelude bytestring tasty tasty-hunit tasty-quickcheck ]; description = "An efficient but limited parser API specialised to bytestrings"; license = lib.licenses.mit; @@ -47865,10 +48026,12 @@ self: { }: mkDerivation { pname = "binder"; - version = "0.1"; - sha256 = "0j0c3vbxxw4mcrfq1q2h3m4psjhg6kw81m2vrpnk8pqxq30v6kkv"; + version = "0.3"; + sha256 = "0swl5l3h3631fjlxn3k2vdbbj604p4bfjcfm6x3vzx3al9hnjcc8"; libraryHaskellDepends = [ base containers lens text transformers ]; - testHaskellDepends = [ base containers hspec text transformers ]; + testHaskellDepends = [ + base containers hspec lens text transformers + ]; testToolDepends = [ hspec-discover ]; description = "Variable binding for abstract syntax tree"; license = lib.licenses.mit; @@ -50454,10 +50617,8 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.7.3"; - sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "17"; - editedCabalFile = "00q92mlylrp73v624i6h4jc4v9yxcdm6zjhdylh7zklc2di9ihgb"; + version = "0.7.4"; + sha256 = "1qm0ms3jk8m5zv81lh3pn5n04afyq7bpn9lc137ddmm9blnkzndi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -52403,6 +52564,8 @@ self: { pname = "boring"; version = "0.2.1"; sha256 = "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"; + revision = "1"; + editedCabalFile = "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"; libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; @@ -53185,8 +53348,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.5"; - sha256 = "18113bfyak9bsn7fwjx01511g4v3qls8w5qls1q407gx3dafhyw2"; + version = "0.1.1.6"; + sha256 = "0m4m6sw4fhfy75dirnwchg3jr175d9c7splkhfkb6p4i8995m5kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -53258,8 +53421,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.3"; - sha256 = "1f299fss8p7111wr56a8346zqkl02b7pcp9n6pri7wh2zrc4lw8i"; + version = "2.2.0.4"; + sha256 = "1mjwzkh6236y09h8xqzcgddypyipr2h8b4x308lh51cqb07rjczq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54331,29 +54494,6 @@ self: { }) {}; "bugzilla-redhat" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, hspec, http-conduit, http-types, iso8601-time - , resourcet, text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bugzilla-redhat"; - version = "1.0.1"; - sha256 = "19dir39yxqd5psf3gj4f3vhcbdad1np7374nkxfk0gg4xxvywcvi"; - revision = "2"; - editedCabalFile = "0gqsmxrydy6isyfx4g8snpg50i3f0jcw9yyr385ys28zw7ak29qr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring connection containers - http-conduit http-types iso8601-time resourcet text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec time ]; - description = "A Haskell interface to the Bugzilla native REST API"; - license = lib.licenses.bsd3; - }) {}; - - "bugzilla-redhat_1_0_1_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , hspec, http-conduit, http-types, iso8601-time, resourcet, text , time, unordered-containers, vector @@ -54372,7 +54512,6 @@ self: { testHaskellDepends = [ aeson base hspec time ]; description = "A Haskell interface to the Bugzilla native REST API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "build" = callPackage @@ -55060,8 +55199,8 @@ self: { pname = "byte-order"; version = "0.1.3.0"; sha256 = "0lr5ijhc165qhviabklnl0zpbk5400wb1fqd1xn7x0ga1vvclxhl"; - revision = "1"; - editedCabalFile = "0gkp45pasdg9k98yaw3fpsch4wy50q5n4wdmqlsffciimc0k11x1"; + revision = "2"; + editedCabalFile = "136zdv7hfxp4vyd5ckc9rmadg8szjr7vrwxyjq6jlhapgh3afcqh"; libraryHaskellDepends = [ base primitive primitive-unaligned wide-word ]; @@ -55107,6 +55246,8 @@ self: { pname = "bytebuild"; version = "0.3.14.0"; sha256 = "0ql3fyd0l4gm3wbziky8r3bgd97kazpqbmiqwhrxvznf201zkhfy"; + revision = "1"; + editedCabalFile = "0pgm553m4abfq7bhrz4r0hymww32sqy4ln0j3v3ydb93x6l1fp1v"; libraryHaskellDepends = [ base byteslice bytestring haskell-src-meta integer-logarithms natural-arithmetic primitive primitive-offset run-st @@ -55703,18 +55844,16 @@ self: { }) {}; "bytestring-strict-builder" = callPackage - ({ mkDerivation, base, bytestring, criterion, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, bytestring, criterion, quickcheck-instances + , rerebase, tasty, tasty-quickcheck }: mkDerivation { pname = "bytestring-strict-builder"; - version = "0.4.5.6"; - sha256 = "0zqi65jpf6f3gyhcg11hfn7b457c3zsmgsyqx8gi9sqh5pzn34kw"; + version = "0.4.5.7"; + sha256 = "1wblyys69avihm41lyxs04yvg1p85jp598w5ralv85mrgirb39np"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + quickcheck-instances rerebase tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict bytestring builder"; @@ -55787,6 +55926,25 @@ self: { license = lib.licenses.mit; }) {}; + "bytestring-tree-builder_0_2_7_11" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "bytestring-tree-builder"; + version = "0.2.7.11"; + sha256 = "1kwj10nibw6bd0nkwg090nn27ayaq85x211ss2zvi63qs37cjmxp"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base-prelude bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base-prelude bytestring criterion ]; + description = "A very efficient ByteString builder implementation based on the binary tree"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-trie" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -56543,6 +56701,8 @@ self: { pname = "cabal-debian"; version = "5.2.2"; sha256 = "1xafkjh4g60gcgrcl1l8xyla3firjxkaaks44plq1z9gnnwlfb90"; + revision = "1"; + editedCabalFile = "10saybpzsp3vwlbb3dv9glnmz8g9i79k3n3l2klmwmnggi8s35ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56741,8 +56901,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.7"; - sha256 = "1j21ynngk937p7jq361zn5kq0wiwnn6lypqm4z8z9mwa9knc2sv3"; + version = "0.1.9"; + sha256 = "00bcyx7i7h04hn2s8j7p4fsa64l48zizsdmmzqrhfiafwapmfg4n"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -58811,21 +58971,21 @@ self: { "candid" = callPackage ({ mkDerivation, base, base32, bytestring, cereal, constraints - , containers, crc, directory, dlist, doctest, file-embed, filepath - , hex-text, leb128-cereal, megaparsec, mtl, optparse-applicative - , parser-combinators, prettyprinter, row-types, scientific - , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, tasty-smallcheck, template-haskell, text - , transformers, unordered-containers, vector + , containers, digest, directory, dlist, doctest, file-embed + , filepath, hex-text, leb128-cereal, megaparsec, mtl + , optparse-applicative, parser-combinators, prettyprinter + , row-types, scientific, smallcheck, split, tasty, tasty-hunit + , tasty-quickcheck, tasty-rerun, tasty-smallcheck, template-haskell + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "candid"; - version = "0.4.0.2"; - sha256 = "04gy0nlk28hd5glzbscfhh0f01kxvxvjy2pcis8m0n4r6n7l2qlr"; + version = "0.5"; + sha256 = "1va9n08m6y9avbjxgclhasmnbf41bqx0j1s4j12rsblhci5cxqpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base32 bytestring cereal constraints containers crc dlist + base base32 bytestring cereal constraints containers digest dlist file-embed hex-text leb128-cereal megaparsec mtl parser-combinators prettyprinter row-types scientific split template-haskell text transformers unordered-containers vector @@ -59902,14 +60062,15 @@ self: { }) {}; "casr-logbook" = callPackage - ({ mkDerivation, base, containers, digit, lens, lucid, text, time + ({ mkDerivation, attoparsec, base, containers, digit, lens, lucid + , text, time }: mkDerivation { pname = "casr-logbook"; - version = "0.6.12"; - sha256 = "1s4v5a22apd7sw8c7ri8sazi1gqjg7p6b8y9j1g8avx5zc1m58f7"; + version = "0.6.13"; + sha256 = "1401mwcf5av11f37kz1hk5axzji21an4irk6fqypakply4q5kvqd"; libraryHaskellDepends = [ - base containers digit lens lucid text time + attoparsec base containers digit lens lucid text time ]; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; @@ -61108,8 +61269,8 @@ self: { pname = "cereal-conduit"; version = "0.8.0"; sha256 = "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r"; - revision = "1"; - editedCabalFile = "1imyl3g2bni8bc6kajr857xh94fscphksj3286pxfpa8yp9vqqpc"; + revision = "2"; + editedCabalFile = "1w26az4pj699qbpa9pz55g4svkbs92ls5k6wkzjn40ghisnjk2q6"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet transformers ]; @@ -61431,6 +61592,8 @@ self: { pname = "cfn-flip"; version = "0.1.0.3"; sha256 = "18nfqbc0iw5zvg9krrm8wyi6x34qxf7arp4jzf1l8qabds5s5371"; + revision = "1"; + editedCabalFile = "0816bw34b174wpxjw99lz8z8qi2l5w00dppb7kysjdbwh8a3gws0"; libraryHaskellDepends = [ aeson base bytestring conduit libyaml text unliftio unliftio-core yaml @@ -62687,6 +62850,8 @@ self: { pname = "chimera"; version = "0.3.3.0"; sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; + revision = "1"; + editedCabalFile = "197xa0hgf2w4yhifnkqck6biipz8ffjg61y59plamb9rjv62k0bv"; libraryHaskellDepends = [ adjunctions base distributive mtl primitive transformers vector ]; @@ -62699,6 +62864,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "chimera_0_3_4_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, infinite-list + , mtl, primitive, QuickCheck, random, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers + , vector + }: + mkDerivation { + pname = "chimera"; + version = "0.3.4.0"; + sha256 = "1g3bpwhka21x6rl8c8zdwywn7vbq7gp5mc8hb5w24bh0j7cxr67l"; + libraryHaskellDepends = [ + adjunctions base distributive infinite-list mtl primitive + transformers vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; + description = "Lazy infinite streams with O(1) indexing and applications for memoization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chiphunk" = callPackage ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar , vector-space @@ -66179,6 +66368,8 @@ self: { pname = "cmark-gfm"; version = "0.2.6"; sha256 = "0sd8q42j51ba7ymyxk5360mhvhbnirsd371d3sggl6sbslxzp34m"; + revision = "1"; + editedCabalFile = "1385k2xvxy9ssw69g606vwnpm07sf919prciwvnaipsxiwwbjwl6"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -66634,6 +66825,19 @@ self: { license = lib.licenses.mpl20; }) {}; + "co-log-core_0_3_2_1" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.3.2.1"; + sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "co-log-json" = callPackage ({ mkDerivation, aeson, base, bytestring, co-log-core, containers , string-conv, text @@ -66653,10 +66857,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.3"; - sha256 = "1c6pyfynzd95vxywl7c110nh8z0rzhvfh9hzbq1nn4ik5whqjnbp"; - revision = "1"; - editedCabalFile = "1h35a10zh6xjqjrvj38r9kn49zzvf9lvqrpfgd6vnnsjvyi3jzsx"; + version = "0.0.1.4"; + sha256 = "1cah2a6hz8g30jqfq05r103sj42aix4hqdl8kys57zkfq2ap4myy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -67898,8 +68100,8 @@ self: { pname = "colourista"; version = "0.1.0.2"; sha256 = "0g06116kjg9pbp0l7n33agqbks3kw5z4rjqyhylha8miah5sxbwn"; - revision = "1"; - editedCabalFile = "0wjngfcnqaibdds17q8r8v8yvbl94qxbjhmill4vi1fzfsiw4yrg"; + revision = "3"; + editedCabalFile = "1q07rz48xrs68gg3pywdivw2m97xbgcb4337jfzdsb0wv6n8z2r5"; libraryHaskellDepends = [ ansi-terminal base bytestring text ]; testHaskellDepends = [ base bytestring hspec text ]; description = "Convenient interface for printing colourful messages"; @@ -68064,8 +68266,8 @@ self: { }: mkDerivation { pname = "combinat"; - version = "0.2.10.0"; - sha256 = "125yf5ycya722k85iph3dqv63bpj1a862c0ahs2y0snyd2qd6h35"; + version = "0.2.10.1"; + sha256 = "179w7qnn3dhh71xgi21k9y0215z5v2gsa54yn1i1rhvg63z6fvkd"; libraryHaskellDepends = [ array base compact-word-vectors containers random transformers ]; @@ -68216,8 +68418,8 @@ self: { }: mkDerivation { pname = "comfort-array"; - version = "0.5.2.3"; - sha256 = "0x9pwk25bpq63nllqc00mmjbrvwzz0nw8pgxbdakpmm2ymyj9p14"; + version = "0.5.3"; + sha256 = "18s3yg8d2mfj2gkkxg1m2w3lrv1zdgv3bh2fsxzwnygr2p9451r1"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record storablevector @@ -68257,15 +68459,15 @@ self: { "comfort-blas" = callPackage ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , netlib-ffi, QuickCheck, transformers, utility-ht + , netlib-ffi, QuickCheck, semigroups, transformers, utility-ht }: mkDerivation { pname = "comfort-blas"; - version = "0.0.0.1"; - sha256 = "19wfmn6fxl31kd0f4r5gcrpp50k9j735pnbzdw4p16p9p71cqb5k"; + version = "0.0.1"; + sha256 = "1yfmhv712dnnwlh62gcq2vchmg8vcv54l50jy1mibpx1is7kjcr9"; libraryHaskellDepends = [ base blas-ffi comfort-array containers deepseq guarded-allocation - netlib-ffi transformers utility-ht + netlib-ffi semigroups transformers utility-ht ]; testHaskellDepends = [ base comfort-array containers doctest-exitcode-stdio doctest-lib @@ -68285,6 +68487,8 @@ self: { pname = "comfort-fftw"; version = "0.0.0.1"; sha256 = "10934ckhl5hj4k331cdhdz6512m3hyn4bm4w1xwqja4j0arndklb"; + revision = "1"; + editedCabalFile = "1vlj4jn5qzv71dw5fd32wb7gkjhs0f91yc2qxbcv2dbdzqbzkrwr"; libraryHaskellDepends = [ base comfort-array deepseq fftw-ffi netlib-ffi QuickCheck ]; @@ -68330,6 +68534,8 @@ self: { pname = "comfort-graph"; version = "0.0.4"; sha256 = "1v3acgdr8srvpddl2kvap556ag93b9yphjf3y1qy14sq6f7v46hc"; + revision = "1"; + editedCabalFile = "0lkk5p558x0dv8vfy329g2amaai76gkxdnb8nzy3miw76vvi5xrw"; libraryHaskellDepends = [ base containers QuickCheck semigroups transformers utility-ht ]; @@ -69050,6 +69256,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "compdata_0_13_1" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl + , QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, th-expand-syns + , transformers, tree-view, uniplate + }: + mkDerivation { + pname = "compdata"; + version = "0.13.1"; + sha256 = "001k1pd28cgbspd2n74p29hc69ch9mmkqfazki7qj17kzcaq5n2l"; + revision = "1"; + editedCabalFile = "12bhc1vpnlshq2kap9p3j6a7pxwdm7b761rr64g6c5xdla5y3vpq"; + libraryHaskellDepends = [ + base containers deepseq mtl QuickCheck template-haskell + th-expand-syns transformers tree-view + ]; + testHaskellDepends = [ + base containers deepseq HUnit mtl QuickCheck template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 + th-expand-syns transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq mtl QuickCheck random + template-haskell th-expand-syns transformers uniplate + ]; + description = "Compositional Data Types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "compdata-automata" = callPackage ({ mkDerivation, base, compdata, containers, criterion, projection }: @@ -70386,8 +70622,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.19"; - sha256 = "16g749ghsqp0n6xqk9z3hj8di97r09gvw0dfk7jfq5crc02b69j2"; + version = "1.10.20"; + sha256 = "1ji1fh0dd2wl9vi9y9205hr49wjakrx5iwkk84idb7pvjnmba8wf"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -72350,6 +72586,25 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_14" = callPackage + ({ mkDerivation, base, binary, boring, deepseq, ghc-prim, hashable + , hspec, hspec-discover, mtl, transformers, type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.14"; + sha256 = "19f4rprxzlddc2w66ib612lfvz9vh979xvffyimnn3zdphm342dq"; + libraryHaskellDepends = [ + base binary boring deepseq ghc-prim hashable mtl transformers + type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -73041,6 +73296,22 @@ self: { license = lib.licenses.mit; }) {}; + "contravariant-extras_0_3_5_4" = callPackage + ({ mkDerivation, base, contravariant, template-haskell + , template-haskell-compat-v0208 + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.5.4"; + sha256 = "13i9cip0qb8piib2sfq35qvb978npra2w53zvc28fxxnik9icfig"; + libraryHaskellDepends = [ + base contravariant template-haskell template-haskell-compat-v0208 + ]; + description = "Extras for the \"contravariant\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "control" = callPackage ({ mkDerivation, base, basic, stm, template-haskell, transformers }: @@ -73953,6 +74224,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, githash, hashable, hourglass, mtl + , prettyprinter, process, safe-exceptions, stm, template-haskell + , terminal-size, text, text-short, transformers, typed-process + , unix, unliftio-core + }: + mkDerivation { + pname = "core-program"; + version = "0.7.0.0"; + sha256 = "17xbah7g8apcksn5x32cqwcfxd6xw5z1msx0rsjg2nyyn559p2vb"; + libraryHaskellDepends = [ + base bytestring core-data core-text directory exceptions filepath + fsnotify githash hashable hourglass mtl prettyprinter process + 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 @@ -79286,8 +79579,8 @@ self: { pname = "data-array-byte"; version = "0.1.0.1"; sha256 = "002n0af7q08q3fmgsc5b47s1clirxy0lrqglwxzhabg0nfhfrdhv"; - revision = "1"; - editedCabalFile = "1nma7gz7lhain6jvwb3w3s53716ss8ypkk93gxpsaaz824svvw9f"; + revision = "2"; + editedCabalFile = "0g0xvsrinssn2a6z9sdaa2px5ra3rvr2lm5zixlpaq845f5y52dd"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base quickcheck-classes-base tasty tasty-quickcheck @@ -81599,6 +81892,17 @@ self: { broken = true; }) {}; + "day-comonoid" = callPackage + ({ mkDerivation, base, comonad, kan-extensions }: + mkDerivation { + pname = "day-comonoid"; + version = "0.1"; + sha256 = "0v1p0jw51rx6p2nz9bg1qlv2zhgpwdn7y208zihr3lgz3c62fqng"; + libraryHaskellDepends = [ base comonad kan-extensions ]; + description = "A comonoid w.r.t. Day"; + license = lib.licenses.bsd3; + }) {}; + "daytripper" = callPackage ({ mkDerivation, base, bytestring, directory, falsify , optparse-applicative, tagged, tasty, tasty-hunit @@ -83009,8 +83313,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "9"; - editedCabalFile = "1ww3328aga9s7knbl8xxvsff13gdnl3rdqplpx11rl6k6gnr032k"; + revision = "10"; + editedCabalFile = "1pms44620yw0i08zbaf1v9wi36ai43sd3s762jcx5cap1shjl4qv"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -83098,21 +83402,20 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector + , primitive, quickcheck-instances, rerebase, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.18.3"; - sha256 = "0x27yqcmpcdfnpf7hn0v574wr641xg23k8fn18w9klc0l3m3089v"; + version = "0.9.18.5"; + sha256 = "1riczgknn87b7cqpk8crq33zwkq80gv5ha9ang5ib5rlg6fmckn4"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive text transformers unordered-containers vector ]; testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck + quickcheck-instances rerebase tasty tasty-quickcheck ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; @@ -85820,6 +86123,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "di-monad_1_3_5" = callPackage + ({ mkDerivation, base, conduit, containers, di-core, exceptions + , monad-control, mtl, pipes, pipes-safe, primitive, resourcet, stm + , streaming, transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "di-monad"; + version = "1.3.5"; + sha256 = "0l22yqigv7nkc54bcnz2fy8kxnl8dgj1wzs8cf24fy1apahz8kx0"; + libraryHaskellDepends = [ + base conduit containers di-core exceptions monad-control mtl pipes + pipes-safe primitive resourcet stm streaming transformers + transformers-base unliftio-core + ]; + description = "mtl flavoured typeful hierarchical structured logging for di-core"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "di-polysemy" = callPackage ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { @@ -86508,6 +86830,8 @@ self: { pname = "dialogue"; version = "0.1.0"; sha256 = "03rlcyvkzm9fyqdsgswx9sgw2jdiplngw9a1rknngwnwnx5mqbpm"; + revision = "1"; + editedCabalFile = "1g4297n8xdnjs8ylxvs3whqq2d984g57fyxb7dm46dm809mhbhd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory ]; @@ -87653,6 +87977,8 @@ self: { pname = "directory"; version = "1.3.8.1"; sha256 = "174fkmss6yxvnyd0wawkc1l1f5rqkpl2s387ad2jvlw7flcm70mx"; + revision = "1"; + editedCabalFile = "1yd7hqs70486gbf7yms6gbx2zm34m1hakx5rh3dd4rd38w4hlfxx"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -90220,7 +90546,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_1" = callPackage + "doctest_0_22_2" = callPackage ({ mkDerivation, base, code-page, deepseq, directory, exceptions , filepath, ghc, ghc-paths, hspec, hspec-core, hspec-discover , HUnit, mockery, process, QuickCheck, setenv, silently @@ -90228,8 +90554,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.1"; - sha256 = "0xszdclizmlf5gsnn4fwbvncjs6fbif9a5956pnxr50g5fxfi6xk"; + version = "0.22.2"; + sha256 = "1rf6hbiml8jk5n9j9isqi012chhhzjlp224hqwz7xh8r830kkf5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90396,6 +90722,33 @@ self: { license = lib.licenses.mit; }) {}; + "doctest-parallel_0_3_1" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob + , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random + , setenv, silently, stringbuilder, syb, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.3.1"; + sha256 = "0lbiwi2jc6d68hhkvsgwhrwrbhw9f56r2mqnp7l6i779gpzdriqd"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions filepath ghc ghc-paths Glob process random syb + template-haskell transformers unordered-containers + ]; + testHaskellDepends = [ + base base-compat code-page containers deepseq directory exceptions + filepath ghc ghc-paths hspec hspec-core HUnit mockery process + QuickCheck setenv silently stringbuilder syb transformers + ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -92254,8 +92607,8 @@ self: { pname = "dual-tree"; version = "0.2.3.1"; sha256 = "19nm34d166fhlkk7npx0iq9kbx7300a82bg75q1sx98jqfa4nffh"; - revision = "1"; - editedCabalFile = "0prbgzh1bhgrg6qxp5l2m33f5xcjjjpzbm32xx2rgyi4w1yf3587"; + revision = "2"; + editedCabalFile = "1qlrrvw3j9h12nj105aa5ckri5580xgbi16gph70i5w2crmrvphw"; libraryHaskellDepends = [ base monoid-extras semigroups ]; testHaskellDepends = [ base monoid-extras QuickCheck semigroups testing-feat @@ -95395,17 +95748,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "eliminators_0_9_3" = callPackage + "eliminators_0_9_4" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.3"; - sha256 = "0pmh4ds1xmk464988airlwdj47mbq9xzgvfmpsp7dw84k0226pyg"; - revision = "1"; - editedCabalFile = "0nxnc1y8lnwmbg1igd8mndkav0ilvb20pbs0d2yvxr032bi35jc4"; + version = "0.9.4"; + sha256 = "1qr02xlmb6nfd505z0iw7bj7kpha8wyvcr31rm92r1a78pwvysaf"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -98092,8 +98443,8 @@ self: { pname = "errors"; version = "2.3.0"; sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7"; - revision = "4"; - editedCabalFile = "0sji6ny86f4j9ch1cyf2p1mcr5b2ighvw4bb9rssvypxb6k2r68f"; + revision = "5"; + editedCabalFile = "0ljfsadhqbqjivrr08x11zazpl115902ikvyhxq6nmg6zp54w7al"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat ]; @@ -98445,6 +98796,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto-compat" = callPackage + ({ mkDerivation, base, conduit, esqueleto, hspec, persistent + , resourcet, transformers + }: + mkDerivation { + pname = "esqueleto-compat"; + version = "0.0.2.0"; + sha256 = "0r76i5597lmd31384k0961hvps57xcf9dadscvd729yrf0plahvk"; + libraryHaskellDepends = [ + base conduit esqueleto persistent resourcet transformers + ]; + testHaskellDepends = [ base hspec ]; + description = "Compatibility operators for Persistent and Esqueleto"; + license = lib.licenses.bsd3; + }) {}; + "esqueleto-pgcrypto" = callPackage ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent , persistent-postgresql, QuickCheck, text, transformers, unliftio @@ -99308,10 +99675,8 @@ self: { }: mkDerivation { pname = "event-list"; - version = "0.1.2"; - sha256 = "177q99iswmanh34wlgklw1djvv5v1c0b5ysyi7mdmb70fsw30kk2"; - revision = "1"; - editedCabalFile = "19n1snzzqg4mkpss2b29zsv8h4n1nmzcmyclap11gcsjmv75mwzh"; + version = "0.1.2.1"; + sha256 = "0wkrzflrkaa7qg4lwzgfm0dhmghgiqph4hnpnd4smpv98sz3bcq0"; libraryHaskellDepends = [ base non-negative QuickCheck semigroups transformers utility-ht ]; @@ -100737,8 +101102,8 @@ self: { }: mkDerivation { pname = "exitcode"; - version = "0.1.0.6"; - sha256 = "07knpcak3ca38r7g9x4ixi36rg6zllrn2azbqlkgmmdqwqmcaj7w"; + version = "0.1.0.9"; + sha256 = "0g63q2y1ipgnylfjp28yly6lbps7gbnam7lpg1x8hnmlvfz89mj7"; libraryHaskellDepends = [ base bifunctors filepath lens mtl process semigroupoids semigroups transformers @@ -100767,17 +101132,15 @@ self: { }) {}; "exon" = callPackage - ({ mkDerivation, base, criterion, flatparse, generics-sop - , ghc-hs-meta, hedgehog, incipit-base, tasty, tasty-hedgehog - , template-haskell + ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base + , parsec, tasty, tasty-hedgehog, template-haskell }: mkDerivation { pname = "exon"; - version = "1.5.0.1"; - sha256 = "1kj81x9haqvx61bi3f7baaqxnbpw6xkyfcmgb3653c1wiscd756d"; + version = "1.6.0.1"; + sha256 = "0r26dvc4dc865x84pz8y4yh43pzzgdy524aggwn3q2m3frdc7zba"; libraryHaskellDepends = [ - base flatparse generics-sop ghc-hs-meta incipit-base - template-haskell + base ghc incipit-base parsec template-haskell ]; testHaskellDepends = [ base hedgehog incipit-base tasty tasty-hedgehog template-haskell @@ -101058,8 +101421,8 @@ self: { pname = "explicit-exception"; version = "0.2"; sha256 = "0n2cgliy0ls9740crzpk19wl3cbk5zq90x7qmhhw8idbip7xidni"; - revision = "1"; - editedCabalFile = "0k1299cvh6ayh26nidxnywpdmby5v52k23kyaxzla5i611306v10"; + revision = "2"; + editedCabalFile = "0wixdj39wxyfy82yp344nn38b6d1cmf32jmx89x98j4pvqb65cy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq semigroups transformers ]; @@ -101372,8 +101735,8 @@ self: { pname = "extended-reals"; version = "0.2.4.0"; sha256 = "19df7zlm8kisihmnpg3ni5qg4p0vkilsny0ngch0b8b0pr56cb0c"; - revision = "1"; - editedCabalFile = "07qsnn05q9n2l4jh7agql44l2z7rqnwdcp9bssri4chs0jvk15rg"; + revision = "2"; + editedCabalFile = "1v4vcrf66bapldw5jswkp4jb1v1qlr5cx2mgjnxb8mszir7s6p1f"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -101553,8 +101916,8 @@ self: { }: mkDerivation { pname = "extensions"; - version = "0.1.0.0"; - sha256 = "1b4wiw228hlk0ywjzpgw7rg9nwfmav82c976ipn0ql0gyh7v27xc"; + version = "0.1.0.1"; + sha256 = "1rf6jhmms6ll7mn9rh81amzb7nd4zjqcnxdzivw50dxcrcfmdiq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102216,6 +102579,8 @@ self: { pname = "faktory"; version = "1.1.2.4"; sha256 = "0mn888cjk8ag94il7zcbk6q5cq2vf2dxf1b8ba8ki2rypxld5m7a"; + revision = "1"; + editedCabalFile = "10gpavyqdx9kcrp963wgx0jfvm4xf97yg92y4gvk5vkpjipmx5mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102245,6 +102610,8 @@ self: { pname = "faktory"; version = "1.1.2.5"; sha256 = "0ax5hk98k4v8vnhv6rvbjxhynqkzijb5l7dbaxp15mh6yd2y981f"; + revision = "1"; + editedCabalFile = "072nm86gyqgnrcfdq466nkpkcsp417zibj1ni2s9b7ndw63x4k1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103128,8 +103495,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.3.2"; - sha256 = "0qzfn271ka46f11hrbzq8axc3npkx1n5y5pihpg1gdccqmw6aazq"; + version = "1.3.3"; + sha256 = "1j4g4q37ly0np6zyyswfx79i5hn3pj4zzby0y5k62jin2v6xvq3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103505,14 +103872,24 @@ self: { }) {}; "fec" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, criterion, data-serializer + , deepseq, extra, hspec, QuickCheck, quickcheck-instances, random + }: mkDerivation { pname = "fec"; - version = "0.1.1"; - sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.0"; + sha256 = "018vwvx2ailk7yc8a5jxbnykca212gr8p7kv3v6k8dnp881flilw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring deepseq extra ]; + executableHaskellDepends = [ base bytestring criterion random ]; + testHaskellDepends = [ + base bytestring data-serializer hspec QuickCheck + quickcheck-instances random + ]; description = "Forward error correction of ByteStrings"; - license = "GPL"; + license = lib.licenses.gpl2Plus; + mainProgram = "benchmark-zfec"; }) {}; "fedora-composes" = callPackage @@ -104441,14 +104818,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "fgl_5_8_1_1" = callPackage + "fgl_5_8_2_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: mkDerivation { pname = "fgl"; - version = "5.8.1.1"; - sha256 = "1bccd85756nk09hgv6h52k4vkxw2xdqbk5m20g8q6301rdpgs239"; + version = "5.8.2.0"; + sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -104960,16 +105337,16 @@ self: { "filepather" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant - , directory, filepath, lens, mmorph, mtl, semigroupoids, time - , transformers + , directory, exitcode, filepath, lens, mmorph, mtl, semigroupoids + , time, transformers }: mkDerivation { pname = "filepather"; - version = "0.5.1"; - sha256 = "1drd7sfng2bmrmprj3yqazd76j2jny3rxcid7xvq95ga2imch45w"; + version = "0.5.5"; + sha256 = "05dqkpdhlw6lkkrwvdk2g6bcymr1mpn55ky4vzyd9729xglk5c5p"; libraryHaskellDepends = [ - base bytestring containers contravariant directory filepath lens - mmorph mtl semigroupoids time transformers + base bytestring containers contravariant directory exitcode + filepath lens mmorph mtl semigroupoids time transformers ]; description = "Functions on System.FilePath"; license = lib.licenses.bsd3; @@ -105779,8 +106156,8 @@ self: { }: mkDerivation { pname = "fits-parse"; - version = "0.3.5"; - sha256 = "0gs3ikdsn7g9g1mpdibimvybgmawmmpm8af6cj9gn0c617gqdm6r"; + version = "0.3.6"; + sha256 = "19mwisig0ffxyni6b1yqs9vxnl5161vxl7zj5bj96njw1f3sjxqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107745,6 +108122,20 @@ self: { license = lib.licenses.mit; }) {}; + "focus_1_0_3_2" = callPackage + ({ mkDerivation, base, rerebase, tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "focus"; + version = "1.0.3.2"; + sha256 = "11n2dh0ilc2hqh96ivy1k2y3pi8y1ll11awp4r3h40w17023yjz2"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + description = "A general abstraction for manipulating elements of container data structures"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "focuslist" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , genvalidity, genvalidity-containers, genvalidity-hspec, hedgehog @@ -108172,8 +108563,8 @@ self: { }: mkDerivation { pname = "fontconfig-pure"; - version = "0.3.0.0"; - sha256 = "1a9kd8wl2078bkh3p45z0m4zq8g3ya8gnzri0g3dj6rpjhrmhh51"; + version = "0.4.0.0"; + sha256 = "05nlnr5v1gfi0wrksdpzszpvj1vj5ff2wv2nzm7g43dr9j33xyf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109298,10 +109689,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fractionizer"; - version = "0.10.0.0"; - sha256 = "0bda0bv4skc53x1x37p71a7n2a994wp45y1143447fv87bj4pmjx"; + version = "0.17.0.0"; + sha256 = "0y2rkbmpzhn0zz273i1lfxv7f270yv89nmacs9m17rhjcj9n7243"; libraryHaskellDepends = [ base ]; - description = "Allows to approximate the fractional numbers in the range [0.005, 1] with sum of 2 or 3 unit fractions of special types."; + description = "Numbers in the range [0.005, 1] as a sum of 2, 3, 4 or 5 unit fractions of special types."; license = lib.licenses.mit; }) {}; @@ -109454,16 +109845,17 @@ self: { , hw-kafka-client, immortal, lens, lens-aeson, memcache , monad-control, monad-validate, MonadRandom, mtl, network-uri , nonempty-containers, path-pieces, persistent - , persistent-postgresql, postgresql-simple, primitive, QuickCheck - , resource-pool, resourcet, retry, safe, scientist, semigroupoids - , template-haskell, text, time, transformers, transformers-base - , typed-process, unliftio, unliftio-core, unordered-containers - , vector, wai, wai-extra, yaml, yesod-core, yesod-test + , persistent-postgresql, postgresql-simple, primitive, pureMD5 + , QuickCheck, resource-pool, resourcet, retry, safe, scientist + , semigroupoids, serialise, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml + , yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.10.1.0"; - sha256 = "1kwqiglc28xh73qh7fqs4233rxadfpp7yff9vf289xklw6c8la51"; + version = "1.10.2.0"; + sha256 = "18d8594pz123kbhvw3igazs5ngd8rrs050ivb1hmksr6x2r6b6mm"; libraryHaskellDepends = [ aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit @@ -109477,8 +109869,8 @@ self: { hw-kafka-client immortal lens memcache monad-control monad-validate MonadRandom mtl network-uri nonempty-containers path-pieces persistent persistent-postgresql postgresql-simple primitive - resource-pool resourcet retry safe scientist semigroupoids - template-haskell text time transformers transformers-base + pureMD5 resource-pool resourcet retry safe scientist semigroupoids + serialise template-haskell text time transformers transformers-base typed-process unliftio unliftio-core unordered-containers vector wai wai-extra yaml yesod-core yesod-test ]; @@ -112174,21 +112566,21 @@ self: { }) {}; "fuzzyset" = callPackage - ({ mkDerivation, base, data-default, hspec, ieee754, text - , text-metrics, unordered-containers, vector + ({ mkDerivation, base, hspec, ieee754, mtl, text, text-metrics + , transformers, unordered-containers, vector }: mkDerivation { pname = "fuzzyset"; - version = "0.2.4"; - sha256 = "0rj6d5z2cy954w3xzq4dfn0i3dg2idb8y2lcf2f10ar42r58zhxn"; + version = "0.3.1"; + sha256 = "07i0ygbikr5rdmwp00yrql6xjprzhkqb5jr12w1l56n1xssf71zx"; libraryHaskellDepends = [ - base data-default text text-metrics unordered-containers vector + base mtl text text-metrics transformers unordered-containers vector ]; testHaskellDepends = [ - base data-default hspec ieee754 text text-metrics + base hspec ieee754 mtl text text-metrics transformers unordered-containers vector ]; - description = "Fuzzy set for approximate string matching"; + description = "Fuzzy set data structure for approximate string matching"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -113715,6 +114107,8 @@ self: { pname = "generic-data"; version = "1.1.0.0"; sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; + revision = "1"; + editedCabalFile = "1njfdpp8rckkibixp89rz8dh4qmz67404gbwq2l0qmfcglzf997p"; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th show-combinators @@ -114050,18 +114444,21 @@ self: { "generic-persistence" = callPackage ({ mkDerivation, base, convertible, generic-deriving, HDBC - , HDBC-sqlite3, hspec, hspec-discover, QuickCheck, resource-pool + , HDBC-postgresql, HDBC-sqlite3, hspec, hspec-discover, QuickCheck + , raw-strings-qq, resource-pool, template-haskell }: mkDerivation { pname = "generic-persistence"; - version = "0.4.0.0"; - sha256 = "18k08qr3zc56zgk6m2g6mh5138v0lf7rh4warvz8vfpxm5wvbn7i"; + version = "0.6.0"; + sha256 = "00clpi6ijwagp3zrjb94kwv03wxcx4aqq22zn32kxhz8b3w71jd1"; libraryHaskellDepends = [ - base convertible generic-deriving HDBC resource-pool + base convertible generic-deriving HDBC raw-strings-qq resource-pool + template-haskell ]; testHaskellDepends = [ - base convertible generic-deriving HDBC HDBC-sqlite3 hspec - hspec-discover QuickCheck resource-pool + base convertible generic-deriving HDBC HDBC-postgresql HDBC-sqlite3 + hspec hspec-discover QuickCheck raw-strings-qq resource-pool + template-haskell ]; testToolDepends = [ hspec-discover ]; description = "Database persistence using generics"; @@ -114305,6 +114702,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "generics-sop_0_5_1_4" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "generics-sop"; + version = "0.5.1.4"; + sha256 = "0zkri1w7qdqlxcfx0kzld7ai5g7xzxwxjxjfa7wnjx09fqhiqsk1"; + libraryHaskellDepends = [ + base ghc-prim sop-core template-haskell th-abstraction + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Generic Programming using True Sums of Products"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "generics-sop-lens" = callPackage ({ mkDerivation, base, generics-sop, lens }: mkDerivation { @@ -114746,25 +115163,6 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-property, hspec - , hspec-core, QuickCheck, transformers, validity - }: - mkDerivation { - pname = "genvalidity-hspec"; - version = "1.0.0.2"; - sha256 = "00sv0mzlvny5ch7c9fnd19szqd0pjrkvi080x1i62qa5fdzs5yc4"; - libraryHaskellDepends = [ - base genvalidity genvalidity-property hspec hspec-core QuickCheck - transformers validity - ]; - testHaskellDepends = [ - base genvalidity hspec hspec-core QuickCheck - ]; - description = "Standard spec's for GenValidity instances"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-hspec_1_0_0_3" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity }: @@ -114781,7 +115179,6 @@ self: { ]; description = "Standard spec's for GenValidity instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -114846,27 +115243,6 @@ self: { }) {}; "genvalidity-hspec-hashable" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec - , genvalidity-property, hashable, hspec, hspec-core, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec-hashable"; - version = "1.0.0.0"; - sha256 = "14fg796iivlpp4gqsmma9zf0z9iqk524ydyqmza83qrjh8v2ff5v"; - libraryHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-property hashable - hspec QuickCheck validity - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-property hashable - hspec hspec-core QuickCheck validity - ]; - description = "Standard spec's for Hashable instances"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-hspec-hashable_1_0_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec , genvalidity-property, hashable, hspec, hspec-core, QuickCheck , validity @@ -114885,7 +115261,6 @@ self: { ]; description = "Standard spec's for Hashable instances"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-hspec-optics" = callPackage @@ -114928,24 +115303,27 @@ self: { }) {}; "genvalidity-mergeful" = callPackage - ({ mkDerivation, base, containers, criterion, genvalidity - , genvalidity-containers, genvalidity-criterion, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid - , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid + ({ mkDerivation, autodocodec, autodocodec-yaml, base, containers + , criterion, genvalidity, genvalidity-containers + , genvalidity-criterion, genvalidity-sydtest + , genvalidity-sydtest-aeson, genvalidity-time, genvalidity-uuid + , mergeful, mtl, pretty-show, QuickCheck, random + , safe-coloured-text, sydtest, sydtest-discover, time, uuid }: mkDerivation { pname = "genvalidity-mergeful"; - version = "0.3.0.0"; - sha256 = "0dd22kdlydhdns86awmmzbnr9bwrb84623zcyb5b9aaxmq75ifza"; + version = "0.3.0.1"; + sha256 = "1k18biwqva6wkdhapwfr56xrbsvyqp6183p0fi2kma4rv3g4hfpy"; libraryHaskellDepends = [ base containers genvalidity genvalidity-containers genvalidity-time mergeful QuickCheck ]; testHaskellDepends = [ - base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random - time uuid + autodocodec autodocodec-yaml base containers genvalidity-sydtest + genvalidity-sydtest-aeson genvalidity-uuid mergeful mtl pretty-show + QuickCheck random safe-coloured-text sydtest time uuid ]; + testToolDepends = [ sydtest-discover ]; benchmarkHaskellDepends = [ base criterion genvalidity-criterion mergeful ]; @@ -115027,32 +115405,6 @@ self: { }) {}; "genvalidity-persistent" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, genvalidity - , genvalidity-containers, genvalidity-criterion, genvalidity-hspec - , hspec, persistent, persistent-template, QuickCheck - , validity-containers, validity-persistent - }: - mkDerivation { - pname = "genvalidity-persistent"; - version = "1.0.0.1"; - sha256 = "1h3illab5k0rzmyi1pjc4yij2dsxn9gnmrvdgll32plxkdmyp0jr"; - libraryHaskellDepends = [ - base containers genvalidity genvalidity-containers persistent - QuickCheck validity-containers validity-persistent - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec persistent - persistent-template QuickCheck validity-containers - ]; - benchmarkHaskellDepends = [ - base criterion deepseq genvalidity genvalidity-criterion persistent - persistent-template - ]; - description = "GenValidity support for Persistent"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-persistent_1_0_0_2" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, genvalidity , genvalidity-containers, genvalidity-criterion, genvalidity-hspec , hspec, persistent, persistent-template, QuickCheck @@ -115076,7 +115428,6 @@ self: { ]; description = "GenValidity support for Persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -115153,27 +115504,6 @@ self: { }) {}; "genvalidity-sydtest-hashable" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-sydtest, hashable - , QuickCheck, sydtest, sydtest-discover, validity - }: - mkDerivation { - pname = "genvalidity-sydtest-hashable"; - version = "1.0.0.0"; - sha256 = "05482ynm19k9wj0hvvlfimvdng1wkl35409lp1r6vj02b7ml4i2z"; - libraryHaskellDepends = [ - base genvalidity genvalidity-sydtest hashable QuickCheck sydtest - validity - ]; - testHaskellDepends = [ - base genvalidity genvalidity-sydtest hashable QuickCheck sydtest - validity - ]; - testToolDepends = [ sydtest-discover ]; - description = "Standard spec's for Hashable instances for sydtest"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-sydtest-hashable_1_0_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-sydtest, hashable , QuickCheck, sydtest, sydtest-discover, validity }: @@ -115192,7 +115522,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Standard spec's for Hashable instances for sydtest"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-sydtest-lens" = callPackage @@ -115304,27 +115633,6 @@ self: { }) {}; "genvalidity-unordered-containers" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable - , hspec, QuickCheck, unordered-containers, validity - , validity-unordered-containers - }: - mkDerivation { - pname = "genvalidity-unordered-containers"; - version = "1.0.0.0"; - sha256 = "1sd67x2kw7l0kbsaa67x3an94sv1hvnkbb8r42v36cc5jjaw29dk"; - libraryHaskellDepends = [ - base genvalidity hashable QuickCheck unordered-containers validity - validity-unordered-containers - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec unordered-containers - validity - ]; - description = "GenValidity support for unordered-containers"; - license = lib.licenses.mit; - }) {}; - - "genvalidity-unordered-containers_1_0_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity , validity-unordered-containers @@ -115343,7 +115651,6 @@ self: { ]; description = "GenValidity support for unordered-containers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-uuid" = callPackage @@ -115865,21 +116172,24 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_6_3" = callPackage + "ghc_9_8_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc - , process, stm, template-haskell, time, transformers, unix + , process, semaphore-compat, stm, template-haskell, time + , transformers, unix }: mkDerivation { pname = "ghc"; - version = "9.6.3"; - sha256 = "0zl2g21ak4awsfr4qq2fdxngwnbhr27jsqnn15ld3wwhnwx9d106"; - setupHaskellDepends = [ base Cabal directory filepath process ]; + version = "9.8.1"; + sha256 = "15863rp4lcpz2h7f0ncix7n53b5yxk5ndp0g8hk4z1b1y2dwm0w3"; + setupHaskellDepends = [ + base Cabal containers directory filepath process + ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-boot ghc-heap ghci hpc process stm - template-haskell time transformers unix + exceptions filepath ghc-boot ghc-heap ghci hpc process + semaphore-compat stm template-haskell time transformers unix ]; libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; @@ -115954,14 +116264,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_6_3" = callPackage + "ghc-boot_9_8_1" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.6.3"; - sha256 = "0m0w1v1s63w4zzh18q4ac403pxm7ic0v6cc6r8fl0pjl0cxsgbwr"; + version = "9.8.1"; + sha256 = "080qalf35kvf9qgyn9w59m1szwl5n8ahvjdzqr7vrd5kf0f9cczz"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -115972,12 +116282,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_6_3" = callPackage + "ghc-boot-th_9_8_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.6.3"; - sha256 = "05bp3yr0pmim1zzc5jrbsvjb3vpvbg8wi4n9339s3cvrral57p5b"; + version = "9.8.1"; + sha256 = "16vsirgz8g0zmika6pr638mh4s5xrgwsc6dgnhyhwryg10mabp66"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -115990,8 +116300,8 @@ self: { pname = "ghc-byteorder"; version = "4.11.0.0.10"; sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; - revision = "4"; - editedCabalFile = "0jc4d4is49d6ddxpdkyqkpr464y80ydsb57shqndp08assplj93b"; + revision = "5"; + editedCabalFile = "1q56xwm9rvjaix9l2bvfgkkcr0mg9n8f23a7mvvd8ij9b34pd3qa"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; doHaddock = false; @@ -116536,12 +116846,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_6_3" = callPackage + "ghc-heap_9_8_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.6.3"; - sha256 = "17lfv1cdqcrh8g6lps9lkisn3imfylg89xqx4k8amh59b9l4jmj6"; + version = "9.8.1"; + sha256 = "1z0gghf7ki2sz60ikgdw3d42djphl5lf27z8mfnzcvxp3p6ajxmz"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -116586,10 +116896,8 @@ self: { }: mkDerivation { pname = "ghc-hs-meta"; - version = "0.1.2.0"; - sha256 = "13i4fcc3wfx94n75cxp00p62mnm0raf2xqj2afrzcw3q6mc0l0y4"; - revision = "1"; - editedCabalFile = "18wp54bnfx7ks9zvsjpykpkpr7gwqql6bq8n85mydgx9zm5638dz"; + version = "0.1.3.0"; + sha256 = "1w1l7l3c96k30v715sbf4vhzw7q86p4piwq91i9zqijgy0wl9rz6"; libraryHaskellDepends = [ base bytestring ghc ghc-boot template-haskell ]; @@ -116737,21 +117045,23 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_6_2_20230523" = callPackage + "ghc-lib_9_8_1_20231009" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser - , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time - , transformers, unix + , ghc-prim, happy, hpc, parsec, pretty, process, rts + , semaphore-compat, stm, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "9.6.2.20230523"; - sha256 = "0wlmljbalbfm2y9i2c5ygnsks4gbfzw6ap725bffjcpwd8ma8cq4"; + version = "9.8.1.20231009"; + sha256 = "09qlh8yjfi1380p3sibhfc16n7kx1yz22g1lvr5zjpwq4i3pjnpm"; + revision = "1"; + editedCabalFile = "1y25kfansr726l508mc86a6i20gvca6mr0b5fibicjmg4s5z908l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty - process rts stm time transformers unix + process rts semaphore-compat stm time transformers unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; @@ -116820,15 +117130,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_6_2_20230523" = callPackage + "ghc-lib-parser_9_8_1_20231009" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.6.2.20230523"; - sha256 = "104q0lw7maz1ma67invxz6aw9pn99j3f9l15nl3387pgxb666gjq"; + version = "9.8.1.20231009"; + sha256 = "1s3w8ggzil7dskns0fyk744xmi8b5q98lcqvw188z92h5md9yi2j"; + revision = "1"; + editedCabalFile = "1sck4dgbl8sakz7r1vc79paacic4ll92cw8hzbl658ykkn3qr6mh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -116900,14 +117212,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_6_0_2" = callPackage + "ghc-lib-parser-ex_9_8_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.6.0.2"; - sha256 = "1fr653b4hgwxz12mvbf9wd93r83qk3qdajplrdmw85hk0f9qfq9a"; + version = "9.8.0.0"; + sha256 = "1xchnw1x27k3v02h0mpvm0m78jkhb1kvybjgrky7a3wfn3irv1nj"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -117159,13 +117471,13 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-prim_0_10_0" = callPackage + "ghc-prim_0_11_0" = callPackage ({ mkDerivation, base, c, Cabal, directory, filepath, process, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.10.0"; - sha256 = "1n9skdsfiya4hlfw44f4p9a14xwnmjxgpdcddlqxkc3gscs62m6q"; + version = "0.11.0"; + sha256 = "118c37r8q94x0za1x6iqlfl429czgp5ii6mjdb1f7ba3nx9azzl5"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ rts ]; librarySystemDepends = [ c ]; @@ -117409,13 +117721,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_10_0" = callPackage + "ghc-syntax-highlighter_0_0_11_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.10.0"; - sha256 = "145xjyraqd62k5amyqi9028rr9v2lgz3irmgz5v2hppza1i5qy72"; + version = "0.0.11.0"; + sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -117562,8 +117874,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.4"; - sha256 = "0yfyxwjsg0r6biy8mskc0xpm32z6zldhzxlvy9dr22h8ds57089w"; + version = "0.4.5"; + sha256 = "1hqhmsa2nic6lpq2d778ksi3ffy865fn72cs2f8d0dxf1di32s0b"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -117620,8 +117932,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.5"; - sha256 = "1asr1ykmqalvbyrhf91vsnx989vw3qp28w8sl3pgwns1azirsz7r"; + version = "0.4.6"; + sha256 = "1f4n3s6cjxz3q04ixwi4mvxqb23vpifjlrfnzh4zif0kcf47sp70"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -117641,8 +117953,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.8"; - sha256 = "08pa3gbzxmz5iif9ggg7xvg0bz0h4h4bdnwkvy6lljh2r4fyw8r7"; + version = "0.7.9"; + sha256 = "1h3d0vjz3j9cgng330dj4zlvnvjkwzk2f76w1q6b5vda5pq676cd"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -117661,8 +117973,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.8"; - sha256 = "0hny036kinnn73byyhdwvmp2s5c27zs7krrz01kx5xk7mmhhx2nn"; + version = "0.7.9"; + sha256 = "1fn7ia00hrhi54m5bzzl0bb49lr6jbjr8crmasbh7ndplfv8zq46"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-tcplugins-extra transformers ]; @@ -117964,8 +118276,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "2.3.0.0"; - sha256 = "0h05xdq46bchlk64x3rlf1gn2xz3sjr9pay0b1p2l7jc951czdg4"; + version = "2.4.0.0"; + sha256 = "1pscx95wmykrrlycpavh1j8vwp3x0k1cfvq9ndpz3qmj8djyyxb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118009,8 +118321,8 @@ self: { }: mkDerivation { pname = "ghcide-bench"; - version = "2.3.0.0"; - sha256 = "17clwl9scj3yzg6x8krmcjpi90h9ivrf840xw3y90n2lx0835w04"; + version = "2.4.0.0"; + sha256 = "0glpjp3qrnbmbn8xi78lgx88v3lppljny9lxyi45dzf71hzab2yc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119928,6 +120240,18 @@ self: { mainProgram = "gibbon"; }) {}; + "gigaparsec" = callPackage + ({ mkDerivation, base, containers, selective, tasty, tasty-hunit }: + mkDerivation { + pname = "gigaparsec"; + version = "0.1.0.0"; + sha256 = "177y3rnsg4zy94j2snpcnqdq754b33ni7m07fs7srbyarpm6kd21"; + libraryHaskellDepends = [ base containers selective ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; + description = "Refreshed parsec-style library for compatiblity with Scala parsley"; + license = lib.licenses.bsd3; + }) {}; + "gimlh" = callPackage ({ mkDerivation, base, split }: mkDerivation { @@ -121142,6 +121466,31 @@ self: { broken = true; }) {}; + "gitlab-haskell_1_0_0_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , connection, http-client, http-conduit, http-types, mtl, tasty + , tasty-hunit, temporary, text, time, transformers, tree-diff, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "1.0.0.3"; + sha256 = "0jddsxj746pfziq4i3z750v290r3m0v3wifz3kisb6ais3794cjn"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-client http-conduit + http-types mtl temporary text time transformers unix + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring tasty tasty-hunit text + tree-diff unordered-containers vector + ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -122634,6 +122983,8 @@ self: { pname = "gnuplot"; version = "0.5.7"; sha256 = "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3"; + revision = "1"; + editedCabalFile = "1x0ik81nmrxi77p1k4f7j4d5s9ajs0cy9jhr41b0qhvfsimyf0cn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125199,8 +125550,8 @@ self: { pname = "goldplate"; version = "0.2.1.1"; sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "3"; - editedCabalFile = "17v3xw6jqx74nfzgd4snqgj560i0v822vfvwkp5rq0xn1a8p4nxz"; + revision = "4"; + editedCabalFile = "03jfrffs2ip7i4qqxhy8cjynygnaahpw1z19xg4j2fh32h669i53"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125597,8 +125948,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.6.3"; - sha256 = "0rxkpxm7606lpiw4csixqfmd025f7rp6ivv86c6ximjlqzz1krhz"; + version = "0.6.6.4"; + sha256 = "052n39bnz55d8lmi3d79s0zxhzbspz6a5rw965qqbryi82hgrdp4"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -127047,6 +127398,8 @@ self: { pname = "graphula"; version = "2.0.2.2"; sha256 = "066lcn262x4l826sglybrz4mp58ishcj0h1r5h41aiy09mcf4g3v"; + revision = "2"; + editedCabalFile = "1wfvg8mkiyw5vh20syawrl201dwjx4ggd03pg1f06499anykcs8z"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text unliftio unliftio-core @@ -130469,8 +130822,8 @@ self: { pname = "hackage-security"; version = "0.6.2.3"; sha256 = "0rm0avcc1k247qbrajhzi3vz92cgcc4nr3kbhhfmfm8rjxv0bvjj"; - revision = "7"; - editedCabalFile = "09hahx1a7vvmi1y4z5h3bnvmikjdcqhdvyvmndp5q861dl3iwj98"; + revision = "8"; + editedCabalFile = "1gzk9hrq0rv94msbvnkynzj5pnh94ixray8dl639zr29qh55cbib"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -131746,8 +132099,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.4"; sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "4"; - editedCabalFile = "0lqh8dijpzw1piy3b8j2haqkkx0cqlpfs0i7x7636y2r9yl0kxl7"; + revision = "5"; + editedCabalFile = "01jpc6jp8brayi9v7ynchjgpx40dpzjcwy5lgmzkx043w5xcm6sn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135924,8 +136277,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.3.0.0"; - sha256 = "1q0xxmqhvgad89zg4qg3a4660qdmxy1m6sspyf9a7l4v2jxyl8vi"; + version = "2.4.0.0"; + sha256 = "0jzbvss1ayvq43cljvn5j2bnyrmbgwv12ik81ivqsa6dnf3xbiqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138271,8 +138624,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.2.1"; - sha256 = "1jnglyi1kmfxl69gczws2pp4x43jazrkdm5bdh978ckv9v94s849"; + version = "1.2.2"; + sha256 = "0jz4y90lp54wh2crlxvvc21gfiwdf0rmcj8f712wbgb648lyzha8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138338,7 +138691,7 @@ self: { license = lib.licenses.mit; }) {}; - "haskoin-store-data_1_2_0" = callPackage + "haskoin-store-data_1_2_2" = callPackage ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network @@ -138347,8 +138700,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "1.2.0"; - sha256 = "0a1b33q9b93wsjl2kr7iiy0fxbxi1bbdpna62sm3d2dv6lj1gck7"; + version = "1.2.2"; + sha256 = "0zqyj4dq0j2f0bn4qwvrar1b6jvcaqni296lhigpwy0h0jv8080f"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -138653,8 +139006,8 @@ self: { pname = "hasktags"; version = "0.73.0"; sha256 = "0w0g50ggdmkpxgwqdwdbizw3cz8q86l1xwhvj3bjczh72q5xa0nh"; - revision = "1"; - editedCabalFile = "1zxfnrrcbkv5if0sk8qq9f7bbhm8b7xcmavvl0ad5j1zhk9nlqy5"; + revision = "2"; + editedCabalFile = "175kmkz4k2dssn4dg0d288allkqwx8y6m3p7pcgg88km8d2p0mgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139279,6 +139632,35 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_6_3_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, network-ip + , postgresql-binary, postgresql-libpq, profunctors + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers, uuid + , vector + }: + mkDerivation { + pname = "hasql"; + version = "1.6.3.3"; + sha256 = "1w4lpiy4jynzdp1b5fn36zv5jyfgnh0fp8rr6dz7247ajzx7lfq4"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring bytestring-strict-builder + contravariant dlist hashable hashtables mtl network-ip + postgresql-binary postgresql-libpq profunctors scientific text + text-builder time transformers uuid vector + ]; + testHaskellDepends = [ + contravariant-extras quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -141499,8 +141881,8 @@ self: { }: mkDerivation { pname = "hdf5"; - version = "1.8.10"; - sha256 = "05mpfbs1hcpm92yg8x75vn7j559ivm3gixc8qj8b3xk2mz30ckai"; + version = "1.8.11"; + sha256 = "1vczdmm389zg002ay1x4ia4xx6k41zz0qj5979di03mjlrzq9nws"; libraryHaskellDepends = [ base bindings-DSL bytestring libffi lifted-base monad-control primitive tagged transformers vector @@ -142248,6 +142630,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; + revision = "1"; + editedCabalFile = "1gk52hz1ssib7cbam7nk8nws9322rsgkn7ym45dgwjbvqbz3wqs7"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -142329,19 +142713,19 @@ self: { "hedgehog-extras" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , deepseq, Diff, directory, exceptions, filepath, hedgehog - , http-conduit, hw-aeson, mmorph, mtl, network, process, resourcet - , stm, tar, temporary, text, time, transformers, unliftio + , http-conduit, mmorph, mtl, network, process, resourcet, stm, tar + , temporary, text, time, transformers, unliftio , unordered-containers, yaml, zlib }: mkDerivation { pname = "hedgehog-extras"; - version = "0.4.7.0"; - sha256 = "08144dhnnbbl7mmlypx4ji6hsifjf4ssvqh3zhyjk6zwnj5jng13"; + version = "0.4.7.1"; + sha256 = "03inmpmfh5lmrv62szrz96wrknsmpfivcgyilklpmw1k3ijm8a9x"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq Diff directory - exceptions filepath hedgehog http-conduit hw-aeson mmorph mtl - network process resourcet stm tar temporary text time transformers - unliftio unordered-containers yaml zlib + exceptions filepath hedgehog http-conduit mmorph mtl network + process resourcet stm tar temporary text time transformers unliftio + unordered-containers yaml zlib ]; description = "Supplemental library for hedgehog"; license = lib.licenses.asl20; @@ -144103,15 +144487,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "hetzner_0_4_0_1" = callPackage + "hetzner_0_5_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, country, directory, http-conduit, ip, megaparsec , scientific, text, time, yaml }: mkDerivation { pname = "hetzner"; - version = "0.4.0.1"; - sha256 = "13cykpg9505xw7b5k2897kyzibvb1y9sklr7cm4r552mk5h5wm4b"; + version = "0.5.0.0"; + sha256 = "0xrmbjv52w0gzdfvkgc6mxmq7887qsywz2xb8yrls1szw938x6q8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145185,6 +145569,8 @@ self: { pname = "hgettext"; version = "0.1.40.1"; sha256 = "1wdwrp4zjhjjq49yihid9x4lhx26nbixax84njj02d79wq2kmdb7"; + revision = "1"; + editedCabalFile = "07rr74szf26mbfj3840ln2r7sjjl8asql14yga8kw82cynzhzym5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145498,15 +145884,18 @@ self: { }) {}; "hi-file-parser" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, vector + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector }: mkDerivation { pname = "hi-file-parser"; - version = "0.1.4.0"; - sha256 = "0kaazv6qfpg7n52wms08hf63ic776p9wyyylsh0d4yrh1sbh1s52"; - libraryHaskellDepends = [ base binary bytestring mtl rio vector ]; + version = "0.1.5.0"; + sha256 = "0j6ici0s52fpyf092d3zw4qrvwmz744q538wnxxj48i8fxm7b95m"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; testHaskellDepends = [ - base binary bytestring hspec mtl rio vector + base binary bytestring hspec mtl rio text vector ]; description = "Parser for GHC's hi files"; license = lib.licenses.bsd3; @@ -146712,6 +147101,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hint_0_9_0_8" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit, random + , stm, temporary, text, transformers, typed-process, unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0.8"; + sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; + libraryHaskellDepends = [ + base containers directory exceptions filepath ghc ghc-boot + ghc-paths random temporary transformers unix + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath HUnit stm + text typed-process unix + ]; + description = "A Haskell interpreter built on top of the GHC API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -147299,8 +147710,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.6.7"; - sha256 = "1549cgc4vw1zlqg3qwslimhf17ci7c5yad4k5jrdz1mf0qqk4cv5"; + version = "0.6.9"; + sha256 = "02ihihlxxvcndm7hjiwknj1dar4d3hdwrg83zsr6q1w7gssr9bbi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147554,8 +147965,8 @@ self: { ({ mkDerivation, base, some }: mkDerivation { pname = "hkd"; - version = "0.2"; - sha256 = "1sq0w5n6y7m2qqpl9s04hsg14qc7p8xrj4x1s1lhw9qbapwb8g8w"; + version = "0.2.1"; + sha256 = "1ya8nh6grbdps7gr7aa0rbmj7xprs00qjrkazsyzak4jn829l14z"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -147646,6 +148057,28 @@ self: { mainProgram = "hkgr"; }) {}; + "hkgr_0_4_3_2" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd-args, simple-prompt, typed-process + , xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.4.3.2"; + sha256 = "1c87hpd4p4mq3cx5m52c7hkwp18f5klkkfx342q2zmkks97lf1zb"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal + simple-cmd-args simple-prompt typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "hkgr"; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -148668,8 +149101,8 @@ self: { }: mkDerivation { pname = "hls-alternate-number-format-plugin"; - version = "2.3.0.0"; - sha256 = "0sblh25z3d8y3sn3mz5bxwk4jcshavc40xb8q3qyhdy96ab93g48"; + version = "2.4.0.0"; + sha256 = "0w3hk0cnrj7llchfrr3zdqh8m3bfz8xkax6r6a6vr3gcmyl7cwim"; libraryHaskellDepends = [ aeson base containers extra ghc-boot-th ghcide hie-compat hls-graph hls-plugin-api lens lsp mtl regex-tdfa syb text @@ -148702,8 +149135,8 @@ self: { }: mkDerivation { pname = "hls-cabal-fmt-plugin"; - version = "2.3.0.0"; - sha256 = "1lx59xyx867zak74a58z049061k9mzjdvvxcb824xs4hf1kr6cxm"; + version = "2.4.0.0"; + sha256 = "1gv3jb6i7q2bwi6fzxl7gc9rjkws924l7nybkaj8m2zjzpchqqvr"; libraryHaskellDepends = [ base directory filepath ghcide hls-plugin-api lens lsp-types mtl process-extras text transformers @@ -148722,8 +149155,8 @@ self: { }: mkDerivation { pname = "hls-cabal-plugin"; - version = "2.3.0.0"; - sha256 = "1qqr6c4xdyjhsnpsv3f7hxbn2hx2qsj4mlipfr1g3rijy0qjbj6l"; + version = "2.4.0.0"; + sha256 = "17mmf5dsgsi08gvv6lalg2w92vsb6vx0vrl5n905wvngij3vydr3"; libraryHaskellDepends = [ base bytestring Cabal-syntax containers deepseq directory extra filepath ghcide hashable hls-graph hls-plugin-api lens lsp @@ -148746,8 +149179,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "2.3.0.0"; - sha256 = "0283jv1kj63lj8npbi6k91f17sql2g9hnza98cnnrj620ic9ils1"; + version = "2.4.0.0"; + sha256 = "03zjkx2i89yn5xlw4y8vdm8b7l40y04g0shck4cl9vj7sixfbpl0"; libraryHaskellDepends = [ aeson base containers extra ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -148767,8 +149200,8 @@ self: { }: mkDerivation { pname = "hls-change-type-signature-plugin"; - version = "2.3.0.0"; - sha256 = "18zals4rhx2z4dkkhz1ml6v3z53z3n4p1v66kgnxs5i4zvw282av"; + version = "2.4.0.0"; + sha256 = "1hz96bklyzhs625hhyzs3vzq2a5rvvdik22ijz3ixd7wgp2nqw18"; libraryHaskellDepends = [ base containers ghcide hls-plugin-api lsp-types regex-tdfa syb text transformers unordered-containers @@ -148788,8 +149221,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "2.3.0.0"; - sha256 = "10fr3vxw4scbpkwv32p9w2vd2k87ilvwwfm02wgh8gcxfzss53fp"; + version = "2.4.0.0"; + sha256 = "1qk332msaj7lhin5dc8fyc319ls74i1f5mac118bhsz8ikrsdd64"; libraryHaskellDepends = [ aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint ghcide hls-graph hls-plugin-api lens lsp mtl text transformers @@ -148810,8 +149243,8 @@ self: { }: mkDerivation { pname = "hls-code-range-plugin"; - version = "2.3.0.0"; - sha256 = "1pjq44mwv6q5vhj8k6i6jpklc9q69calavzj9vwvzri1zx2yv51b"; + version = "2.4.0.0"; + sha256 = "0lif9fg273i84w0nxslq2c8x62p5i8ymff1nhdqhmqac391agjka"; libraryHaskellDepends = [ aeson base containers deepseq extra ghcide hashable hls-plugin-api lens lsp mtl semigroupoids text transformers vector @@ -148836,8 +149269,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "2.3.0.0"; - sha256 = "0yqpi8v4g5n6081ymfj37sk58x4c68zbxh84v07cbvr2nm51xi0x"; + version = "2.4.0.0"; + sha256 = "0qqhbwwj66ysgnfnl7fahv9mhfxxj46p37633hn142fhzr8vmp51"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide @@ -148878,8 +149311,8 @@ self: { }: mkDerivation { pname = "hls-explicit-fixity-plugin"; - version = "2.3.0.0"; - sha256 = "1pshx1s29zv6k70rimvfdd1cz1yrs1j0206p6ndlyn6cv28vai7y"; + version = "2.4.0.0"; + sha256 = "0vd04sym8490briy8fpmbqy49vp70zw5c3r41kc9d65pglj8ph2y"; libraryHaskellDepends = [ base containers deepseq extra ghc ghcide hashable hls-plugin-api lsp text transformers @@ -148897,8 +149330,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "2.3.0.0"; - sha256 = "0lki1db4dmvky50k5k61yskfmyqmrph1lxjfwb31pg3rjiiasgqi"; + version = "2.4.0.0"; + sha256 = "175whhrpngi1pi86xb2rkgbnv9kd8gwwy6d80xc0jrx62nv6q0na"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lens lsp mtl text transformers unordered-containers @@ -148918,8 +149351,8 @@ self: { }: mkDerivation { pname = "hls-explicit-record-fields-plugin"; - version = "2.3.0.0"; - sha256 = "1f14nh9wjs35wljhrgssqm124gl4ilhxwn51fg5kbh15w6pqz1w9"; + version = "2.4.0.0"; + sha256 = "165c7knyr926ypcsyq3yafmahzn6hcnk0a6j3n0nx24wmv1912ww"; libraryHaskellDepends = [ aeson base containers ghc ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -148937,8 +149370,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "2.3.0.0"; - sha256 = "09jld74jb7k3bs4hq3jq0v4lmk8h28pqcynpxmkp0yy86hfyn6q7"; + version = "2.4.0.0"; + sha256 = "1pj61iximld14qkbjk4icbxrnnys7gmq03y4whr9qxdh93ij7b0q"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types mtl text transformers ]; @@ -148954,8 +149387,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "2.3.0.0"; - sha256 = "1qpxay22ssipnzp32sqv76iaij13lxd8bdn4zj0qflrm25m90jzz"; + version = "2.4.0.0"; + sha256 = "113xfdv9f83z5sbcra6065j2snhf6h964858rcj1xw6jb5sjhfrb"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl process-extras text transformers @@ -148977,8 +149410,8 @@ self: { }: mkDerivation { pname = "hls-gadt-plugin"; - version = "2.3.0.0"; - sha256 = "1l6kj9kp40ii8sfqsbi6mz2q8x6zp1076apdhy7d6fblrkv06ch0"; + version = "2.4.0.0"; + sha256 = "1hhvgw8k216m1cw50q5lsgl0zm5a6bp18ycpmpi4nwggazzr3hpj"; libraryHaskellDepends = [ aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers @@ -149000,8 +149433,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.3.0.0"; - sha256 = "0vhzdvmk8s73m0z667dk3ryd6rdfzz96g6872q645mdhs2hqc0zg"; + version = "2.4.0.0"; + sha256 = "0h9sf9416mg2wrgq1jmwjbm1bm9hav1qp6jn1imhlwg59ck99j25"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -149040,8 +149473,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "2.3.0.0"; - sha256 = "013vl2wrr73gzp8cswvzcis4j32a0s2zdda8nwy47k0qkmrdqxym"; + version = "2.4.0.0"; + sha256 = "136fjmsm6anjxp30ysii0n63fz895k273xwn6i85s6vl3bvlyvxk"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser @@ -149064,8 +149497,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "2.3.0.0"; - sha256 = "10x7i61pk8j9jc1l83rnp5nhxcd54dpd4kllz9gyvgxz4kvwmddy"; + version = "2.4.0.0"; + sha256 = "01mj0g5nghhkbhannvh45rsxnb0sffdhx6ly98im4y19xmx50gkr"; libraryHaskellDepends = [ aeson base containers directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -149082,8 +149515,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "2.3.0.0"; - sha256 = "0cxw2bmdlfr97vj2jgcs714pa94iw96p8xa07i8ahv6fpfc3j8rw"; + version = "2.4.0.0"; + sha256 = "0xi6qds51ds6z2l6h53d16krjc19wibcpkbxhb9v6ar0fdffbnvx"; libraryHaskellDepends = [ base extra filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp mtl ormolu process-extras text transformers @@ -149105,8 +149538,8 @@ self: { }: mkDerivation { pname = "hls-overloaded-record-dot-plugin"; - version = "2.3.0.0"; - sha256 = "1g92q71a4538l43c754q44xds6yg8sl7y8r7m3qrza664hs68wyl"; + version = "2.4.0.0"; + sha256 = "02frs42fx0snvwld950yk039c7m5m66fgz92rpkhbrnm225i0084"; libraryHaskellDepends = [ aeson base containers deepseq ghc-boot-th ghcide hls-graph hls-plugin-api lens lsp syb text transformers unordered-containers @@ -149131,8 +149564,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "2.3.0.0"; - sha256 = "1q5s8l8z007li3nbk653vd3k4wjgr92yrl16ly42pnrabwwffy77"; + version = "2.4.0.0"; + sha256 = "1yqnxsh9n5dk1kky5j36sm6lsb1zvk5r28mb3p99a9yvhcqp0zqy"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph @@ -149158,8 +149591,8 @@ self: { }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "2.3.0.0"; - sha256 = "0lxh2ynfdx78x34a2mp9qsz2kdp6hyqqjn776mbsmxz26h9i94m8"; + version = "2.4.0.0"; + sha256 = "04cy5530227m1hr62h76w7918315sxq8iqvhd9igllwh3ackyx9j"; libraryHaskellDepends = [ base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -149178,8 +149611,8 @@ self: { }: mkDerivation { pname = "hls-qualify-imported-names-plugin"; - version = "2.3.0.0"; - sha256 = "0mxd9zwsyf322lzlixs6956zhpbf9k7idvrzczfwij0jga7dppg9"; + version = "2.4.0.0"; + sha256 = "1zianxwdvbm49s9bvzk0wji4i2zyy36i5g9isdzv70hw5rl82jvx"; libraryHaskellDepends = [ aeson base containers deepseq dlist ghc ghcide hls-graph hls-plugin-api lens lsp text transformers unordered-containers @@ -149201,8 +149634,8 @@ self: { }: mkDerivation { pname = "hls-refactor-plugin"; - version = "2.3.0.0"; - sha256 = "1ywgikx5r29q9nzhk625j5q2x7bn0ss1n4xkaj79665qnyhn98kh"; + version = "2.4.0.0"; + sha256 = "02s6n5wy46kfsy91vsfkk92qi23ji525n7g5f3nbnvmmpvd4kn8y"; libraryHaskellDepends = [ aeson base bytestring containers data-default deepseq dlist extra ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens @@ -149249,8 +149682,8 @@ self: { }: mkDerivation { pname = "hls-rename-plugin"; - version = "2.3.0.0"; - sha256 = "0c4g8mzr17lp1cmhgcfw507wmmh4xi1qrqaldf0qxxd232396a43"; + version = "2.4.0.0"; + sha256 = "0ydnrmxq5ix0ly0mwsl3nxxrbwr6r975fcdw7cwz0bmyrma48w3h"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hashable hie-compat hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl @@ -149272,8 +149705,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "2.3.0.0"; - sha256 = "0345q4jxbp8vabsa8qby5bmqx3qbi55kvjwj5fzg431f4m75lsqc"; + version = "2.4.0.0"; + sha256 = "15llh584scavr6snr8bjc8kp8dz7vyh3vclsz2pzpkdcbr8ifhri"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory extra ghc ghcide hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl @@ -149321,8 +149754,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "2.3.0.0"; - sha256 = "1ar4j6r258mbmapnfsc8rwpclrcp9s4an1lgnh9jnjcn15ia5zyd"; + version = "2.4.0.0"; + sha256 = "0d42bjq4iyk5376rg4s97rv8j19y6cc9w1s7i0qm8zcbkp8vkgmc"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text @@ -149354,8 +149787,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "2.3.0.0"; - sha256 = "08rq3i6d089vfnhmpj1nlfy3nmdxxna1gmmd4kkqyv7rxqdgka39"; + version = "2.4.0.0"; + sha256 = "0dz6wmj9qdccdhpdz4qa8c68a8hx8p6h9ycnj6fg2yihg9j33qqb"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types mtl stylish-haskell text @@ -149386,8 +149819,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "2.3.0.0"; - sha256 = "1pak619y3s4mdachcqb8zbcczxxgfx35l61d2n5d2dq9n4fyhjjj"; + version = "2.4.0.0"; + sha256 = "0flb9sjaf3pbyr23a4399ygvf8ii692w9axbskfx9mwqndgc1jlw"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api lens lsp @@ -152835,14 +153268,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_4_1_0" = callPackage + "hpc-codecov_0_4_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.4.1.0"; - sha256 = "1bvc7n19bqq1g1gw555yz2l13rl6372rxd4p0lfrxhxc523gkmly"; + version = "0.4.2.0"; + sha256 = "1vfx7x9w72lca9zv489fb5h0jqc50ijmikjij6hkb3flbyskdzqd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153538,6 +153971,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "hreader_1_1_1" = callPackage + ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl + , tagged, transformers, transformers-base + }: + mkDerivation { + pname = "hreader"; + version = "1.1.1"; + sha256 = "0am8kyy046l9laqxx60nm3v6haz00wbrs1naxg0yq8z8yqcn4qvv"; + libraryHaskellDepends = [ + base exceptions hset mmorph monad-control mtl tagged transformers + transformers-base + ]; + testHaskellDepends = [ base hset transformers-base ]; + description = "Generalization of MonadReader and ReaderT using hset"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hreader-lens" = callPackage ({ mkDerivation, base, comonad, hreader, hset, lens, lens-action , profunctors @@ -154825,19 +155276,20 @@ self: { "hs-samtools" = callPackage ({ mkDerivation, ascii, attoparsec, base, bitvec, bytestring - , containers, crypton, generic-deriving, hspec, pcre-heavy - , regex-tdfa, streamly, streamly-bytestring, streamly-core + , containers, crypton, generic-deriving, hspec, parser-combinators + , pcre-heavy, regex-tdfa, streamly, streamly-bytestring + , streamly-core }: mkDerivation { pname = "hs-samtools"; - version = "0.6.0.1"; - sha256 = "0i3klgjjai1ax8nyijb3qrach93d6r2pmsxbf2vq56cg3d8j3ym7"; + version = "0.7.0.0"; + sha256 = "0fkvq2bg8q0ikg8hwb4lmdjss7jis9ghwnykds6rpa3mlkg22m5g"; libraryHaskellDepends = [ ascii attoparsec base bitvec bytestring containers crypton - generic-deriving pcre-heavy regex-tdfa streamly streamly-bytestring - streamly-core + generic-deriving parser-combinators pcre-heavy regex-tdfa streamly + streamly-bytestring streamly-core ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base bytestring containers hspec ]; description = "Read and write SAM, BAM, and CRAM files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -157745,14 +158197,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_5" = callPackage + "hspec_2_11_6" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.5"; - sha256 = "1jk5pfjx8g3dd8sz0bzkbx6klhg644vsmwh6kjdlsr5p757mczpy"; + version = "2.11.6"; + sha256 = "0czsm39vizhm8fjr09sb8652haxb0f81zprr8k7yjpk1kyq5582p"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -157767,8 +158219,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.5"; - sha256 = "1r8mz2awqk3l3i8cwrqhs0pr919sqxvng4lr8lc33w1lwixlp41x"; + version = "2.11.6"; + sha256 = "0il6vaxkw7d6shjvhj0dp6fhrixwh4aspcqpa0myf8m4vmlp9alb"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -157894,7 +158346,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_5" = callPackage + "hspec-core_2_11_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -157903,8 +158355,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.5"; - sha256 = "1hr9fvl21pfgy534qwj7xld7i0zmdg90w9anqif9snlwgjkrwzhw"; + version = "2.11.6"; + sha256 = "1j6pzpmkxrjv7ady2vlf7bx9ayphm2l3bls3fycs9h1lv3k0cni3"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -157987,14 +158439,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_5" = callPackage + "hspec-discover_2_11_6" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.5"; - sha256 = "13c8ibmv72izjy5zi2pqnygk5hgb3cwwnzxf00ndp0gd5w3dpvgd"; + version = "2.11.6"; + sha256 = "0i87w82gfzkl0dzcg1mvw8jr7ccqd25gq55zbqala8fqanplp7xp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -158045,6 +158497,8 @@ self: { pname = "hspec-expectations-json"; version = "1.0.2.0"; sha256 = "0vl5brjbvjdbv2i4zq2ww7l0gg11l0ssmr4m7xqdn7as2798q1q1"; + revision = "2"; + editedCabalFile = "085mc79w056c7jinmldav7d1916y61x3p2ikb2api8symaa377n3"; libraryHaskellDepends = [ aeson aeson-pretty base Diff HUnit scientific text unordered-containers vector @@ -158386,7 +158840,7 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_11_5" = callPackage + "hspec-meta_2_11_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq , directory, filepath, haskell-lexer, hspec-expectations, HUnit , process, QuickCheck, quickcheck-io, random, stm, tf-random, time @@ -158394,8 +158848,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.5"; - sha256 = "12kxv36xwrqnd9h7jrs9sn769zymip9908j9723hphkrqa0sy941"; + version = "2.11.6"; + sha256 = "0vn0q7a2r1j8ixlwls8q55gyihv9398wga9804qy51f33y345zqm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160518,6 +160972,8 @@ self: { pname = "http-api-data"; version = "0.6"; sha256 = "0ihkvjhm1rfgfnr2s5kzsmmqbnxgmyaxi0gqzqs4lxyhvy14743l"; + revision = "1"; + editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -160580,6 +161036,8 @@ self: { pname = "http-client"; version = "0.7.14"; sha256 = "0hgrzy05ynivip7l2lv788y8prma2cb99007jrl6q3hph3w3cbi2"; + revision = "1"; + editedCabalFile = "1w1blf2r8riwibv79rcfxij7j60x0sdiqyf7nr5i5rjqbb0sh2k1"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -161712,6 +162170,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-streams_0_8_9_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson + , base, base64-bytestring, blaze-builder, bytestring + , case-insensitive, directory, filepath, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, random, snap-core + , snap-server, text, transformers, unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.9.9"; + sha256 = "1yvabr0bh7b5pbklhq6aw8pam2zasp77g38fakgjnpgb76s4mwqv"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-aeson base base64-bytestring + blaze-builder bytestring case-insensitive directory filepath + HsOpenSSL http-common io-streams mtl network network-uri + openssl-streams text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams random snap-core snap-server + text transformers unordered-containers + ]; + description = "An HTTP client using io-streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -161851,7 +162339,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_4_2_0" = callPackage + "http2_4_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -161861,8 +162349,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "4.2.0"; - sha256 = "1jlxzlayfzfh0bypalg2p97nvjygychgv28fvwjnvgp0saqj79m3"; + version = "4.2.2"; + sha256 = "0kdd4r52jfh1j8jfjcs1mshfasfk1m2ffrcrxxj6cdi7sgxm2377"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163382,8 +163870,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.1.1"; sha256 = "1ilgqrx8jvgvmns99d74qz8c11ifyrccbvszfzwwhk28fhai0k7s"; - revision = "3"; - editedCabalFile = "129bnprzh8nglbi5x8i5dlc4v5qr7cqg6bajy6id1168r26ciwcq"; + revision = "4"; + editedCabalFile = "0fwdbd7m7b9743y6w1ci3m7m0bgw7w0r0h7pvn2xrhvyjvp9rjqh"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -168316,17 +168804,6 @@ self: { }) {}; "indexed-traversable" = callPackage - ({ mkDerivation, array, base, containers, transformers }: - mkDerivation { - pname = "indexed-traversable"; - version = "0.1.2.1"; - sha256 = "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy"; - libraryHaskellDepends = [ array base containers transformers ]; - description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable_0_1_3" = callPackage ({ mkDerivation, array, base, containers, foldable1-classes-compat , transformers }: @@ -168339,7 +168816,6 @@ self: { ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indexed-traversable-instances" = callPackage @@ -169691,6 +170167,8 @@ self: { pname = "integer-conversion"; version = "0.1.0.1"; sha256 = "0fbgqizla2jdchnii1lqp2yla3lkm04w4qn5laxmhm5n3k7p1b10"; + revision = "1"; + editedCabalFile = "055v4jxls9ajf3jmi04wzra9iapfpg7jn93cbmdh2grj6lkahmqf"; libraryHaskellDepends = [ base bytestring primitive text ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck text @@ -170367,19 +170845,20 @@ self: { }) {}; "interval-patterns" = callPackage - ({ mkDerivation, base, containers, groups, heaps, hspec, lattices - , QuickCheck, semirings, time, time-compat + ({ mkDerivation, base, containers, deepseq, groups, hashable, heaps + , hspec, lattices, QuickCheck, semirings, time, time-compat }: mkDerivation { pname = "interval-patterns"; - version = "0.7.0.3"; - sha256 = "16521q6jb0lxncsy3wav6p5jfp8jv1sw0simlyfjx0nl6gjpbz40"; + version = "0.7.2"; + sha256 = "1cwv7yfc64zffa05mq300bb6zwdkgk85mjh10dzgnj1g1rd5z593"; libraryHaskellDepends = [ - base containers groups heaps lattices semirings time time-compat + base containers deepseq groups hashable heaps lattices semirings + time time-compat ]; testHaskellDepends = [ - base containers groups heaps hspec lattices QuickCheck semirings - time time-compat + base containers deepseq groups hashable heaps hspec lattices + QuickCheck semirings time time-compat ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; @@ -170918,8 +171397,8 @@ self: { pname = "io-streams"; version = "1.5.2.2"; sha256 = "1zn4iyd18g9jc1qdgixp6hi56nj7czy4jdz2xca59hcn2q2xarfk"; - revision = "2"; - editedCabalFile = "12q3nhd4wqyv1m7wvzvs5a8yyarcjdrvdhmb4c5hx3zrs5l7sflw"; + revision = "3"; + editedCabalFile = "1827mfvqdqarkl29jz84slzn2qf6pm7r7fzcn2b4ds1nv77lab2c"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring network primitive process text time @@ -171097,6 +171576,8 @@ self: { pname = "ip"; version = "1.7.7"; sha256 = "0yhhmy51s2sbm1qlbx2z9h6bizswi2ck15fxxl76vc3dzbd7gj27"; + revision = "1"; + editedCabalFile = "17b89zp1qvfk9vyhh7hv5c4n276ciqpap2s2rxd1c11ykb010c0y"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive text text-short @@ -172130,26 +172611,47 @@ self: { "isomorphism-class" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.9"; - sha256 = "1d0vgmabjyiqpkgrn1hq6a77nyf7imi50ki9gq8a528l2k7sifig"; + version = "0.1.0.10"; + sha256 = "1017zzav1s00jsxjv419zcrm5i334n9zz42isz6b85hiixqm848v"; libraryHaskellDepends = [ base bytestring containers hashable primitive text unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers hashable primitive QuickCheck - quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck text - unordered-containers vector + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; }) {}; + "isomorphism-class_0_1_0_11" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, primitive + , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck + , text, unordered-containers, vector + }: + mkDerivation { + pname = "isomorphism-class"; + version = "0.1.0.11"; + sha256 = "1z9p9pgqdqcljdmknvxhh3mmlj28i8186mavfi52fkxz05mc85z3"; + libraryHaskellDepends = [ + base bytestring containers hashable primitive text + unordered-containers vector + ]; + testHaskellDepends = [ + bytestring primitive QuickCheck quickcheck-instances rebase tasty + tasty-quickcheck text vector + ]; + description = "Isomorphism typeclass solving the conversion problem"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "isotope" = callPackage ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck , template-haskell, th-lift @@ -173142,8 +173644,8 @@ self: { }: mkDerivation { pname = "jacobi-elliptic"; - version = "0.1.1.0"; - sha256 = "1vwfs1br5p35zjw58zpziakda48lxmwsmvl554y10djkby25g71k"; + version = "0.1.3.0"; + sha256 = "13inf9szcf4bl81ddd5x2jppkhssydg8szihpnwsl8gs4lml0jdg"; libraryHaskellDepends = [ base elliptic-integrals jacobi-theta ]; testHaskellDepends = [ base elliptic-integrals tasty tasty-hunit ]; description = "Neville Theta Functions and Jacobi Elliptic Functions"; @@ -173168,8 +173670,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.2.0"; - sha256 = "1wc16b61vbvh2bigcva11qbjpqg7kwvzgc0znxzsilywrl3iv1nf"; + version = "0.2.2.1"; + sha256 = "0gpyaqrfajcxlgxqjd1kk30a571ini6ikw6n6l2ryzw2971z127n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -175238,6 +175740,8 @@ self: { pname = "json-query"; version = "0.2.2.0"; sha256 = "1k0rxrki8qa6gx0kqrhn9k98pn8hz3xg4kxn045r920bacfgsvi2"; + revision = "1"; + editedCabalFile = "1h99j6lsjp4dwmyvkav1j25y4glrsk8xny2rsp81bjblhgi5kfci"; libraryHaskellDepends = [ array-chunks base bytebuild bytestring contiguous json-syntax primitive primitive-unlifted profunctors scientific-notation @@ -175537,16 +176041,16 @@ self: { , contiguous, gauge, natural-arithmetic, neat-interpolation , primitive, QuickCheck, run-st, scientific, scientific-notation , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - , text-short, vector, word-compat, zigzag + , text-short, transformers, vector, word-compat, zigzag }: mkDerivation { pname = "json-syntax"; - version = "0.2.6.1"; - sha256 = "0zhmzpxcv4jybw669kaz93am46l4da3v0sa14avmvw7z8yd08mqm"; + version = "0.2.7.0"; + sha256 = "07502z9i8y7z87ps6m0vz0wprrlwkyniwwlgmbr403kjihn1fj3l"; libraryHaskellDepends = [ array-builder array-chunks base bytebuild byteslice bytesmith bytestring contiguous natural-arithmetic primitive run-st - scientific-notation text text-short word-compat zigzag + scientific-notation text text-short transformers word-compat zigzag ]; testHaskellDepends = [ aeson array-chunks base bytebuild byteslice bytestring containers @@ -176881,10 +177385,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4.1"; - sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; - revision = "9"; - editedCabalFile = "036whnk5gqw3pgzld7hjdam12ffbhqpwcxlbbgy58hlnajgmfa7a"; + version = "0.4.2"; + sha256 = "01g30ck1nhj8qwz475mvwvmd8nc1yqxl5qi84c957gp116kig2v7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -178587,7 +179089,7 @@ self: { "keystore" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools , array, asn1-encoding, asn1-types, base, base64-bytestring - , byteable, bytestring, containers, crypto-pubkey-types, cryptonite + , byteable, bytestring, containers, crypto-pubkey-types, crypton , directory, filepath, lens, memory, mtl, old-locale , optparse-applicative, pbkdf, process, raw-strings-qq, regex , regex-base, regex-tdfa, safe, setenv, text, time @@ -178595,15 +179097,15 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.9.0.0"; - sha256 = "1wv9rsqz80n70z2fn2s7j4scxcx4dsdr54b8l29232vqzjyqnaxr"; + version = "0.9.0.2"; + sha256 = "07mhnd22b4lyhls9criaxw62scbp71qznmpnxpnz64lwnm5iljmb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-wl-pprint api-tools array asn1-encoding asn1-types base base64-bytestring byteable bytestring containers - crypto-pubkey-types cryptonite directory filepath lens memory mtl + crypto-pubkey-types crypton directory filepath lens memory mtl old-locale optparse-applicative pbkdf regex regex-base regex-tdfa safe setenv text time unordered-containers vector ]; @@ -178682,8 +179184,8 @@ self: { ({ mkDerivation, base, containers, stm, tasty, tasty-hunit }: mkDerivation { pname = "ki"; - version = "1.0.1.0"; - sha256 = "0jwm1f26c89715vm8z5mwr8dzrgj7vjp4b0drhrivzcp381v28jb"; + version = "1.0.1.1"; + sha256 = "1rvjwq765wy99j60x7d5v7zyq8hf52gfjiypc37a9r7gx1y4hir9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base stm tasty tasty-hunit ]; description = "A lightweight structured concurrency library"; @@ -178707,12 +179209,10 @@ self: { ({ mkDerivation, base, ki, unliftio-core }: mkDerivation { pname = "ki-unlifted"; - version = "1.0.0.1"; - sha256 = "1nfa6g2qi791aqg0whdf02pzng01wvbcxvzy6yf5sa20c6fsqn4b"; - revision = "1"; - editedCabalFile = "0va6m6hpj1hqhlfrfy6n4gipgcq9m03193xq5pbq61fr8ixn64l7"; + version = "1.0.0.2"; + sha256 = "11b4jm161znazwf2pn3qdn4dbz1g5a12dvhm03ddx6lrha7yv1xv"; libraryHaskellDepends = [ base ki unliftio-core ]; - description = "A lightweight structured-concurrency library"; + description = "A lightweight structured concurrency library"; license = lib.licenses.bsd3; }) {}; @@ -179050,20 +179550,23 @@ self: { }) {}; "kmonad" = callPackage - ({ mkDerivation, base, cereal, lens, megaparsec, mtl - , optparse-applicative, resourcet, rio, time, unix, unliftio + ({ mkDerivation, base, cereal, hspec, hspec-discover, lens + , megaparsec, mtl, optparse-applicative, resourcet, rio + , template-haskell, time, unix, unliftio }: mkDerivation { pname = "kmonad"; - version = "0.4.1"; - sha256 = "1l9980q74q98x9z8xj37bsnc6ywv362cap27n2nwjyc8wsihhc8c"; + version = "0.4.2"; + sha256 = "1d9l16b9srxkkpj61fbz06gxz3y200yn146sdv7h2bbxnjdswia2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cereal lens megaparsec mtl optparse-applicative resourcet rio - time unix unliftio + template-haskell time unix unliftio ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -179094,6 +179597,8 @@ self: { pname = "knead"; version = "1.0.1"; sha256 = "0bga3kg1dridagd1ysvb4qk2gsjmacqm1z6qr1fhfcd59259acfz"; + revision = "1"; + editedCabalFile = "1h7w7y5s5mx7pxgmff45pfhh7cnxg9w2bv8787s80cfnnypwv3as"; libraryHaskellDepends = [ base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf prelude-compat storable-enum storable-record tagged tfp @@ -179261,8 +179766,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "1.1"; - sha256 = "0xm6qxfxfl9qf8mmsns783mvwhx3p81h2iwak6kww8j5lsdv2n6w"; + version = "1.1.1"; + sha256 = "0hrvbcsc15q9ks5zb7s1fhb3skfcsf11ihhni6baszxkw27jqspi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183018,6 +183523,8 @@ self: { pname = "lattices"; version = "2.2"; sha256 = "1hwm290bzmiv83hms5lkmgsx64lflr1jp49mz61gg4xnw2sp9v7y"; + revision = "1"; + editedCabalFile = "1q7kl6lxk47lchbmgx15690akggdshvjjhdvmwzfj3hqgwgzjjyi"; libraryHaskellDepends = [ base base-compat containers deepseq foldable1-classes-compat hashable integer-logarithms QuickCheck tagged transformers @@ -186702,6 +187209,8 @@ self: { pname = "lifted-async"; version = "0.10.2.4"; sha256 = "0pdy7q508n7gvy338xsv9a8fg7saksi8qb9av6j3a37l2pp4vvcv"; + revision = "2"; + editedCabalFile = "0bg2qmg6lav4zizki1cvqpvd3wqjhfjff7zz17wg5hzlm5318gky"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -187326,8 +187835,8 @@ self: { pname = "linear-base"; version = "0.3.1"; sha256 = "1gm8bwyi39x5x29xb6nq13x9x9p30vm29s11k4pkcql70sj4pv0h"; - revision = "1"; - editedCabalFile = "153nkw2i7n22xzfj8q2xmzsh77pr7pay8v3gc1xli491qmsc0fcd"; + revision = "2"; + editedCabalFile = "0bfpjjr2y16h2x3gphsljgzcqrlwbmrxxqsikgn2idwy73pvd32l"; libraryHaskellDepends = [ base containers ghc-prim hashable linear-generics primitive storable-tuple text transformers vector @@ -187345,6 +187854,35 @@ self: { license = lib.licenses.mit; }) {}; + "linear-base_0_4_0" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, hashable + , hashtables, hedgehog, inspection-testing, linear-generics, mmorph + , MonadRandom, primitive, random, random-shuffle, storable-tuple + , tasty, tasty-bench, tasty-hedgehog, tasty-inspection-testing + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.4.0"; + sha256 = "092xnbn29829zz1nq96h2fcw3qpkanzrhw09cjs90f19xhcs1vxw"; + libraryHaskellDepends = [ + base containers ghc-prim hashable linear-generics primitive + storable-tuple text transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog inspection-testing linear-generics mmorph + storable-tuple tasty tasty-hedgehog tasty-inspection-testing text + vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq hashable hashtables MonadRandom random + random-shuffle tasty-bench unordered-containers vector + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -188379,14 +188917,15 @@ self: { , containers, deepseq, directory, fgl, filepath, git, hashable , intern, lens-family, megaparsec, mtl, nettools , optparse-applicative, parallel, parser-combinators, pretty - , process, rest-rewrite, stm, store, syb, tagged, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-rerun, text - , transformers, unordered-containers, vector, z3 + , process, rest-rewrite, smtlib-backends, smtlib-backends-process + , stm, store, syb, tagged, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, transformers, typed-process + , unordered-containers, vector, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.9.0.2.1"; - sha256 = "1gq867m9b48381zi3m5xari9j34xva4gchajahbpi4fvy54gp6h3"; + version = "0.9.2.5"; + sha256 = "0i9487xz1cfmn3nv58wlm685ljvqq1iqfyz1rkx549wa5h4zmdjq"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -188394,15 +188933,16 @@ self: { aeson ansi-terminal array ascii-progress async attoparsec base binary boxes bytestring cereal cmdargs containers deepseq directory fgl filepath hashable intern lens-family megaparsec mtl parallel - parser-combinators pretty process rest-rewrite stm store syb text - transformers unordered-containers vector + parser-combinators pretty process rest-rewrite smtlib-backends + smtlib-backends-process stm store syb text transformers + typed-process unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base containers directory filepath hashable mtl optparse-applicative process stm tagged tasty tasty-ant-xml tasty-hunit tasty-quickcheck tasty-rerun text transformers - unordered-containers + typed-process unordered-containers ]; testSystemDepends = [ git nettools z3 ]; doCheck = false; @@ -188429,34 +188969,34 @@ self: { }) {}; "liquid-parallel" = callPackage - ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, parallel + ({ mkDerivation, base, Cabal, liquidhaskell, liquidhaskell-boot + , parallel }: mkDerivation { pname = "liquid-parallel"; - version = "3.2.2.0.1"; - sha256 = "0c9qf1achk9n6l6rlncsm7harmdxph90by61lmjk3fw251c9ib03"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; + version = "3.2.2.0.2"; + sha256 = "0a1frfdklhhfwlzrpxcrx1jnqanhzs2qrqm6xlyahnknbwhhc51g"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "liquid-platform" = callPackage - ({ mkDerivation, cmdargs, filepath, liquid-base, liquid-bytestring - , liquid-containers, liquid-prelude, liquid-vector, liquidhaskell + ({ mkDerivation, base, cmdargs, containers, filepath + , liquid-prelude, liquid-vector, liquidhaskell, liquidhaskell-boot , process }: mkDerivation { pname = "liquid-platform"; - version = "0.9.0.2"; - sha256 = "1y2vwjs00k786diwmzljrzwaj3nnmsm4kysq49hdzl9vkfx8nvca"; + version = "0.9.2.5"; + sha256 = "149bbnyhqmhcdpxbhs1h5hypc2xg4yjlj8j9wxcjwfdfq5bw8h7w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - cmdargs filepath liquid-base liquid-bytestring liquid-containers - liquid-prelude liquid-vector liquidhaskell process + base cmdargs containers filepath liquid-prelude liquid-vector + liquidhaskell liquidhaskell-boot process ]; description = "A battery-included platform for LiquidHaskell"; license = lib.licenses.bsd3; @@ -188465,16 +189005,16 @@ self: { }) {}; "liquid-prelude" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, liquid-base - , liquidhaskell + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim + , liquidhaskell, liquidhaskell-boot }: mkDerivation { pname = "liquid-prelude"; - version = "0.9.0.2"; - sha256 = "176iwwsnx80x716qym2i6hjyq7v38lq2nkwnmhdb1v3c5wrp4z67"; - setupHaskellDepends = [ base Cabal liquidhaskell ]; + version = "0.9.2.5"; + sha256 = "1333z82xycs4mzbayj7n1ah4bd6mdz7pasw7g8gvcq0gqakqlxzd"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - bytestring containers liquid-base liquidhaskell + base bytestring containers ghc-prim liquidhaskell ]; description = "General utility modules for LiquidHaskell"; license = lib.licenses.bsd3; @@ -188482,60 +189022,70 @@ self: { }) {}; "liquid-vector" = callPackage - ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: + ({ mkDerivation, base, Cabal, liquidhaskell, liquidhaskell-boot + , vector + }: mkDerivation { pname = "liquid-vector"; - version = "0.12.3.1"; - sha256 = "15v4prdf35b11iym05dmr3n58i260zk69yzf31cha7rqbgr5lhd7"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; + version = "0.12.3.1.2"; + sha256 = "1pc05sr1w827k7sv7x3kdrvssy4zbq4k0dn3fhd9jp62sciyf5ia"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; + libraryHaskellDepends = [ base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; "liquidhaskell" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal - , cmdargs, containers, data-default, data-fix, deepseq, Diff - , directory, exceptions, extra, filepath, fingertree, free, ghc - , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable - , hscolour, liquid-fixpoint, megaparsec, mtl, optics - , optparse-applicative, pretty, process, recursion-schemes, split - , syb, tasty, tasty-ant-xml, tasty-hunit, template-haskell - , temporary, text, th-compat, time, transformers - , unordered-containers, vector, z3 + ({ mkDerivation, base, bytestring, Cabal, containers, ghc-prim + , liquidhaskell-boot, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.9.0.2.1"; - sha256 = "174bazw76hrn3rlvcmsag87rv66r9vwm6008hw540gjvj2g1w0z4"; - revision = "1"; - editedCabalFile = "1ycl8vg7nzslkvsiimfv67fa095cgkzpzxila6wpnnsmf6d9m06z"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; + version = "0.9.2.5.0"; + sha256 = "1a508khibgy94z9fk91z22wl7qqdw8l4wcfcjxk0z7z7f05llrim"; + setupHaskellDepends = [ base Cabal liquidhaskell-boot ]; libraryHaskellDepends = [ - aeson base binary bytestring Cabal cereal cmdargs containers - data-default data-fix deepseq Diff directory exceptions extra - filepath fingertree free ghc ghc-boot ghc-paths ghc-prim githash - gitrev hashable hscolour liquid-fixpoint megaparsec mtl optics - optparse-applicative pretty recursion-schemes split syb - template-haskell temporary text th-compat time transformers - unordered-containers vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory extra filepath ghc liquid-fixpoint megaparsec - process syb tasty tasty-ant-xml tasty-hunit text + base bytestring containers ghc-prim liquidhaskell-boot ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "liquid"; }) {inherit (pkgs) z3;}; + "liquidhaskell-boot" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal + , cmdargs, containers, data-default, data-fix, deepseq, Diff + , directory, exceptions, extra, filepath, fingertree, free, ghc + , ghc-boot, ghc-paths, ghc-prim, githash, gitrev, hashable + , hscolour, liquid-fixpoint, megaparsec, mtl, optparse-applicative + , pretty, recursion-schemes, split, syb, tasty, tasty-ant-xml + , tasty-hunit, template-haskell, temporary, text, th-compat, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "liquidhaskell-boot"; + version = "0.9.2.5.0"; + sha256 = "10k8pisygfdy23i2zb538rl7yf3gac4wxa550dsqnzkmkfcr82yz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring Cabal cereal cmdargs containers + data-default data-fix deepseq Diff directory exceptions extra + filepath fingertree free ghc ghc-boot ghc-paths ghc-prim githash + gitrev hashable hscolour liquid-fixpoint megaparsec mtl + optparse-applicative pretty recursion-schemes split syb + template-haskell temporary text th-compat time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base directory filepath ghc ghc-paths liquid-fixpoint megaparsec + syb tasty tasty-ant-xml tasty-hunit time + ]; + description = "Liquid Types for Haskell"; + license = lib.licenses.bsd3; + }) {}; + "liquidhaskell-cabal" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -188729,8 +189279,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.5.6"; - sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg"; + version = "1.0.5.7"; + sha256 = "0ikbgml3ky1pzahqxisi17g2j5ya2ps75cq96cv9cz4cf9kqk4j0"; libraryHaskellDepends = [ base foldl logict mmorph monad-control mtl transformers transformers-base @@ -189109,8 +189659,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "4"; - editedCabalFile = "04pqdsvjznw5kbnmka2xq32qfc6qlsq7g6a9gi3k0fbg8zj5s057"; + revision = "5"; + editedCabalFile = "16vs060sfdbkmrl8p9cvmn0rl7zwr4l7lvm9lwvmnl0vww1f41r1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189398,6 +189948,8 @@ self: { pname = "llvm-dsl"; version = "0.1.1"; sha256 = "15ad2kv7d4hr732zlxk6f2faw76xavaynpi2d18kch41x1giivxv"; + revision = "1"; + editedCabalFile = "0iq6v0z6g7lzg8pnijanphcj51fhbvishs5vzylhjvhjikfcv9lc"; libraryHaskellDepends = [ base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat storable-enum storable-record tfp transformers unsafe utility-ht @@ -189435,8 +189987,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.11"; - sha256 = "1ck6cama0l89rgjcqhnasvzzy1pacr9h2z6v32pi7xci3h7ijhy2"; + version = "0.12"; + sha256 = "0syd18037lg1g1yg4nk5pmmwwzgxzrlgg9jzli47q5v346dk0mv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189458,8 +190010,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "14.0"; - sha256 = "13x27wm4zhiwi1khb4iyp2fj5rmdfzcb4bk9m1r975adpmnwk537"; + version = "16.0"; + sha256 = "14cf6qhdq69ggx41259ih55g6z1vn0694wrh3s8m6f7adq990ra9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -189749,8 +190301,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.1.1"; - sha256 = "1qvxib55k0bw6rykl4c9551k50jia6m9pyhpshfs6lasvy4rs1gb"; + version = "16.0"; + sha256 = "1nscccmk0nf52p9r0af354p4n4vr1fbaym4x164wwwid7xc1x65g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191301,6 +191853,8 @@ self: { pname = "longboi"; version = "1.0.0"; sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977"; + revision = "1"; + editedCabalFile = "08ij5rlcj7c6w4gaqixd080v2j4p979r83irbdyma6djimfyvnb7"; libraryHaskellDepends = [ base ]; description = "Dependently-typed linked list implementation"; license = lib.licenses.mit; @@ -192651,8 +193205,8 @@ self: { pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; - revision = "4"; - editedCabalFile = "0ij1wcciiplk381xzxr7xcnywfbh5caflffnvlzqmg8bz3j4xdcs"; + revision = "5"; + editedCabalFile = "01szqdkxgk00anqifx1xvnyim6j9lv02aqdshdbls376vi2nay0p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -195798,6 +196352,30 @@ self: { license = lib.licenses.bsd2; }) {}; + "math-functions_0_3_4_3" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.4.3"; + sha256 = "0ri9vf9bcs4q8bj9451sjc4q5cfxc8bcjjx6wqgsdk3yx2sxb1jd"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector + ]; + testHaskellDepends = [ + base data-default-class deepseq erf primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector vector-th-unbox + ]; + benchmarkHaskellDepends = [ + base data-default-class random tasty-bench vector + ]; + description = "Collection of tools for numeric computations"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "math-grads" = callPackage ({ mkDerivation, aeson, array, base, bimap, containers, hspec , ilist, lens, linear, matrix, mtl, random, vector @@ -197311,6 +197889,8 @@ self: { pname = "megaparsec"; version = "9.5.0"; sha256 = "0lnsqdphr3fnxvn87z2ni110wzq60pq6fl407ihddpyavpb0hw38"; + revision = "4"; + editedCabalFile = "0f6g05w18kn34rcjkxfdsg4sibxsz41p2xac7wfc9wqpr0l9kg55"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -197357,6 +197937,8 @@ self: { pname = "megaparsec-tests"; version = "9.5.0"; sha256 = "18ishnklylaiphkz6dd9rfbxnqlrb4fqqd8pr5mk9qb5j0fkbv13"; + revision = "2"; + editedCabalFile = "1zh7ggvc1453b734mmc7yyd8f6qrr34bnvab0507l1nflml7w9bb"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -198065,25 +198647,26 @@ self: { }) {}; "mergeful-persistent" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , genvalidity-mergeful, genvalidity-persistent, hspec, mergeful - , microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity, validity-persistent + ({ mkDerivation, base, containers, genvalidity + , genvalidity-mergeful, genvalidity-persistent, genvalidity-sydtest + , mergeful, microlens, monad-logger, mtl, path, path-io, persistent + , persistent-sqlite, persistent-template, QuickCheck, sydtest + , sydtest-discover, text, validity, validity-persistent }: mkDerivation { pname = "mergeful-persistent"; - version = "0.1.0.0"; - sha256 = "13i2bajgxwmyr5w8qfswlpizhsajnnhgs96hav74sj5m5i6z0dpi"; + version = "0.3.0.1"; + sha256 = "1cbxikv2amab82fkqr78pwax9z8bh04ybjanif6nlfyrq598annc"; libraryHaskellDepends = [ base containers mergeful microlens mtl persistent ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-mergeful - genvalidity-persistent hspec mergeful monad-logger mtl path path-io - persistent persistent-sqlite persistent-template QuickCheck text - validity validity-persistent + base containers genvalidity genvalidity-mergeful + genvalidity-persistent genvalidity-sydtest mergeful monad-logger + mtl path path-io persistent persistent-sqlite persistent-template + QuickCheck sydtest text validity validity-persistent ]; + testToolDepends = [ sydtest-discover ]; description = "Support for using mergeful from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -198106,25 +198689,26 @@ self: { }) {}; "mergeless-persistent" = callPackage - ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec - , genvalidity-mergeless, genvalidity-persistent, hspec, mergeless - , microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity + ({ mkDerivation, base, containers, genvalidity + , genvalidity-mergeless, genvalidity-persistent + , genvalidity-sydtest, mergeless, microlens, monad-logger, mtl + , path, path-io, persistent, persistent-sqlite, persistent-template + , QuickCheck, sydtest, sydtest-discover, text, validity }: mkDerivation { pname = "mergeless-persistent"; - version = "0.1.0.0"; - sha256 = "05fazha6q5lmpagfazlrly7ms0p1jag9n6llwmr0zspx0raq35mb"; + version = "0.1.0.1"; + sha256 = "1m6nbkc43vjjavg9wqimb6ql98m70qy5nagz6l8gjc3icz8dmc00"; libraryHaskellDepends = [ base containers mergeless microlens persistent ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec genvalidity-mergeless - genvalidity-persistent hspec mergeless monad-logger mtl path - path-io persistent persistent-sqlite persistent-template QuickCheck - text validity + base containers genvalidity genvalidity-mergeless + genvalidity-persistent genvalidity-sydtest mergeless monad-logger + mtl path path-io persistent persistent-sqlite persistent-template + QuickCheck sydtest text validity ]; + testToolDepends = [ sydtest-discover ]; description = "Support for using mergeless from persistent-based databases"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -198784,8 +199368,8 @@ self: { pname = "microaeson"; version = "0.1.0.1"; sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; - revision = "7"; - editedCabalFile = "01skh5580zxf1032b25wm410jr52kaxq822jz6n568sfx90hmfl7"; + revision = "8"; + editedCabalFile = "1w9pm69vm0r3zkmcls3zd6b0vc3ifvsjmwj2wk7gc23pj4bwzwlb"; libraryHaskellDepends = [ array base bytestring containers deepseq fail text ]; @@ -198908,6 +199492,8 @@ self: { pname = "microlens"; version = "0.4.13.1"; sha256 = "1z6ph89sgdhgdf8sqaw9g978mlnvlc4k8y50pssaxxplizpanm0a"; + revision = "1"; + editedCabalFile = "07d5lm0p98aly7wfm1ishm8dy6ccgg2mklrxkgry9s3qblmnw9gw"; libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = lib.licenses.bsd3; @@ -198939,6 +199525,8 @@ self: { pname = "microlens-contra"; version = "0.1.0.3"; sha256 = "1jxm6shmvacbic6i6hask0kv89kramnk77pcxpv4gv4xydjsr88n"; + revision = "1"; + editedCabalFile = "086z6n3c606zmv1fxc9j2jhsvh1v7nszawklg1xddyzk9jgcyzpv"; libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = lib.licenses.bsd3; @@ -198963,8 +199551,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.14.1"; - sha256 = "1h6wcgv50mxqz09wkamqjgw90382a4m31mq7q57vmzmkl489nw2n"; + version = "0.4.14.2"; + sha256 = "17fdc5jpqlq3q61mf6qia7a18kqq4nfpbrv2j2n4a4cx62kcbraq"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -198980,6 +199568,8 @@ self: { pname = "microlens-mtl"; version = "0.2.0.3"; sha256 = "1ilz0zyyk9f6h97gjsaqq65njfs23fk3wxhigvj4z0brf7rnlssd"; + revision = "1"; + editedCabalFile = "0xw3hjsfdg0hz12bk9yh2zqs2xi4jxaspwkd968ajxq13rmygxlj"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -198993,8 +199583,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.4.3.3"; - sha256 = "13s6m07whp3h05vqm2hz3qv5ai51ll6q4s3kf8nr3pif6wxqbisy"; + version = "0.4.3.4"; + sha256 = "01j7z0637wirp6y0a4zfzqaky0dmpn1c3y9vdq5hf5igycc1v6yh"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -199097,8 +199687,8 @@ self: { pname = "microstache"; version = "1.0.2.3"; sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz"; - revision = "2"; - editedCabalFile = "0rafypnzzxmxhbc3lyd8ylyfrygijipbgh267slzkwfa8hikd0nz"; + revision = "3"; + editedCabalFile = "0bl84aym5p31wlyqwh5vicyrdw3nvig65xxdlx4ql8hjr71l7mvi"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -199681,6 +200271,18 @@ self: { license = lib.licenses.mit; }) {}; + "mime-types_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.2.0"; + sha256 = "0qagjx5mxzl62ajlvhdqsjkh7f8zzvrq5s343bws89hp9j5f8fh1"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "min-max-pqueue" = callPackage ({ mkDerivation, base, containers, criterion, hedgehog , integer-logarithms, random @@ -201420,6 +202022,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; + revision = "1"; + editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged template-haskell text @@ -201816,8 +202420,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.1.1"; - sha256 = "13y8s9dargzd5vy6m36dq2pnr23fibnx6r19iz414qsdbizp3196"; + version = "1.2.0"; + sha256 = "0v65asbmndgp5ljzdizgrrhwwbf6ajqaaaky5v51ivic8csb1dfy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201906,8 +202510,8 @@ self: { pname = "monad-chronicle"; version = "1.0.1"; sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; - revision = "2"; - editedCabalFile = "1f0plhhr8n5bcki3fn0nbbsjb4jwydk6fhqqnmwrb0g0n3cvj1gz"; + revision = "3"; + editedCabalFile = "1piiyqm671grd7kwn9l1ks92sdr62kbf8jxq9w05d72s3m050ygi"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -203255,19 +203859,17 @@ self: { }) {}; "monadic-bang" = callPackage - ({ mkDerivation, base, containers, exceptions, fused-effects, ghc - , ghc-boot, ghc-paths, transformers + ({ mkDerivation, base, containers, fused-effects, ghc, ghc-boot + , ghc-paths, transformers }: mkDerivation { pname = "monadic-bang"; - version = "0.1.1.0"; - sha256 = "143xi2yav13n28zppfrlk8xllm56ciw0lghbbdnafkf208szv91c"; + version = "0.2.1.0"; + sha256 = "1kridaswa219y6gchfg50q0chm8gngk7clyjxnpz3hhls2v45pj6"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; - testHaskellDepends = [ - base exceptions ghc ghc-boot ghc-paths transformers - ]; + testHaskellDepends = [ base ghc ghc-boot ghc-paths transformers ]; description = "GHC plugin to desugar ! into do-notation"; license = lib.licenses.mit; }) {}; @@ -203817,8 +204419,8 @@ self: { pname = "monoid-extras"; version = "0.6.2"; sha256 = "1qaxp0cf2cvzvfpk7x9mjz1zmlpjfzxij8v2n45w89s7bq9ckvlw"; - revision = "1"; - editedCabalFile = "1xl89p6qcir69qg0kn4443swl4kcgl3vm8dbfi86dgr5z6zvpxhc"; + revision = "2"; + editedCabalFile = "08ydfb0n886qzy940lfvyv1pcj51yhpa0kz6pwn7lm22fh1hb5pf"; libraryHaskellDepends = [ base groups semigroupoids ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -203876,8 +204478,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.4"; - sha256 = "1hg0vpm6nhdqxxpx9329gj135fqrfsw0kdlxd1ycfini69jsbxn6"; + version = "1.1.5"; + sha256 = "1knxn3qxn630lpc7nq6v4z5mysahs8w6hk29dnfkhgf7bc80ilrb"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -203913,6 +204515,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_2_4_1" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, primes, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.2.4.1"; + sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; + libraryHaskellDepends = [ + base bytestring commutative-semigroups containers primes text + vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -204074,26 +204698,29 @@ self: { }) {inherit (pkgs) glew;}; "monomer-flatpak-example" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , dbus, desktop-portal, directory, modern-uri, monomer - , monomer-hagrid, random, text + ({ mkDerivation, async, base, bytestring, c2hs, containers + , data-default-class, dbus, desktop-portal, directory, libpipewire + , libspa, modern-uri, monomer, monomer-hagrid, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.12.0"; - sha256 = "185vv9ihrjssncpkhfh7gchw6whx0ll951y7j4pznnn6s0b3k2yk"; + version = "0.0.13.2"; + sha256 = "1lklf9n1ck1yyyc73f36i495rgq2anxm33ghcmlssy8allpv1k8w"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base bytestring containers data-default-class dbus desktop-portal - directory modern-uri monomer monomer-hagrid random text + async base bytestring containers data-default-class dbus + desktop-portal directory modern-uri monomer monomer-hagrid random + text ]; + executablePkgconfigDepends = [ libpipewire libspa ]; + executableToolDepends = [ c2hs ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "monomer-flatpak-example"; - }) {}; + }) {libpipewire = null; libspa = null;}; "monomer-hagrid" = callPackage ({ mkDerivation, base, bytestring, containers, data-default @@ -207601,6 +208228,8 @@ self: { pname = "murmur-hash"; version = "0.1.0.10"; sha256 = "145z91zkx8jdd3y181pi8z9imqjgpk99cl55pbda4fl201hasbz9"; + revision = "1"; + editedCabalFile = "18wlx3hsba3kvpa1z95dz0xglr97lf62irlr6wg6i0613br58sh3"; libraryHaskellDepends = [ base bytestring ]; description = "MurmurHash2 implementation for Haskell"; license = lib.licenses.bsd3; @@ -208763,6 +209392,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mysql-json-table" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, mysql + , mysql-simple + }: + mkDerivation { + pname = "mysql-json-table"; + version = "0.1.0.0"; + sha256 = "1mc4xjgvwj1h687f4rh8sy5q102rg17ppszfyph8h0hkahy6nqxc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit mysql mysql-simple + ]; + executableHaskellDepends = [ base conduit mysql-simple ]; + description = "Using MySQL to store id-to-json tables"; + license = lib.licenses.mit; + mainProgram = "mysql-json-table-test"; + }) {}; + "mysql-pure" = callPackage ({ mkDerivation, attoparsec, base, binary, binary-ieee754 , blaze-textual, bytestring, bytestring-lexing, case-insensitive @@ -210076,20 +210724,16 @@ self: { }) {}; "neat-interpolation" = callPackage - ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances - , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text + ({ mkDerivation, base, megaparsec, rerebase, tasty, tasty-hunit + , template-haskell, text }: mkDerivation { pname = "neat-interpolation"; - version = "0.5.1.3"; - sha256 = "01v5ccv16gw13mjxdxcxnbs6ggzmqh4vwzybzkzqzm40la163aqz"; + version = "0.5.1.4"; + sha256 = "1drs0aghqxr960sciwjqsnpkhphlp3s4idpqrzh8f3frn7ik7dwf"; libraryHaskellDepends = [ base megaparsec template-haskell text ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "A quasiquoter for neat and simple multiline text interpolation"; + testHaskellDepends = [ rerebase tasty tasty-hunit ]; + description = "Quasiquoter for neat and simple multiline text interpolation"; license = lib.licenses.mit; }) {}; @@ -211458,15 +212102,12 @@ self: { }) {}; "network-byte-order" = callPackage - ({ mkDerivation, base, bytestring, doctest }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "network-byte-order"; - version = "0.1.6"; - sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; - revision = "1"; - editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; + version = "0.1.7"; + sha256 = "0yc6s2zdxkr2awmf56vqwds417ix8rgq33ffsk44wdk7gyny0328"; libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = lib.licenses.bsd3; }) {}; @@ -212323,6 +212964,8 @@ self: { pname = "network-uri"; version = "2.6.4.2"; sha256 = "0a3jg6aykwm1yw32nh137hi6r86w2640xwl1p18352bf29rqj64w"; + revision = "1"; + editedCabalFile = "12350bi5sqamk1mdgkm757q3p2q96bvhm2yvl98mcawnfdrvbzvg"; libraryHaskellDepends = [ base deepseq parsec template-haskell th-compat ]; @@ -213052,8 +213695,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.0"; - sha256 = "0kn0h7c13zvsav93gn8bhmhx1nhdnp9vg2kgscw248f4l4czf2fp"; + version = "1.2.2"; + sha256 = "18jbvjziy3dakp59bhz4gx9b6w74g1y7mwcmlgmy5wc0snqx22j8"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -214268,8 +214911,10 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.4"; - sha256 = "0x88vi1llky86fdrzgvfilgl724jp3kfj8mn8zf9vwjbilap5qy1"; + version = "0.3.5"; + sha256 = "0xnxisshns862l5khb70i6pkzc9l95j33vkqlk046xl6galcxdvd"; + revision = "1"; + editedCabalFile = "15rjy9al76b001qd5nyzfpadxwhhsla02q50pm8d5p1a9y4z0vzp"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -214432,8 +215077,8 @@ self: { }: mkDerivation { pname = "nonempty-vector"; - version = "0.2.2.0"; - sha256 = "0nfvqp59jk8j0r4mj1v8q87hfznhkrscbgz2z7i7cva8fgqjrivg"; + version = "0.2.3"; + sha256 = "18xcsw2c9gy03dvrlanh799j1ab6dkpd6wwgj8b681r12ha04dqa"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck vector @@ -215720,6 +216365,8 @@ self: { pname = "numeric-prelude"; version = "0.4.4"; sha256 = "04x6ry2sxr5hsiz4098dn2gqyjqywiq2xk0anf6wc4xrvasgccjs"; + revision = "1"; + editedCabalFile = "0w5an2w06vpi75qj9972qbsiz4n72mr6mkib4ivlrrirndsyda79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216426,6 +217073,18 @@ self: { mainProgram = "play-o-clock"; }) {}; + "oalg-base" = callPackage + ({ mkDerivation, array, base, deepseq, random, time }: + mkDerivation { + pname = "oalg-base"; + version = "1.0.0.0"; + sha256 = "1x5k59wj08fr7h1ycwwalf669xia9573hhykl0x09zz50zfjzl41"; + libraryHaskellDepends = [ array base deepseq random time ]; + testHaskellDepends = [ array base deepseq random time ]; + description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems"; + license = lib.licenses.bsd3; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -218181,7 +218840,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_10_1_1" = callPackage + "opaleye_0_10_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -218191,8 +218850,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.1.1"; - sha256 = "0788dvmzpw51fwb3flpvmacky3qvh7kd0h8lv4nwjzqlj7l1n2dq"; + version = "0.10.2.0"; + sha256 = "0an98lspk77zxg4phvll5zjxviq3q4iwc75p9k7aqqa1hvm4wrdj"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -219145,8 +219804,8 @@ self: { pname = "openssl-streams"; version = "1.2.3.0"; sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; - revision = "1"; - editedCabalFile = "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp"; + revision = "2"; + editedCabalFile = "0xxbx82ksjnphi7vl93ymm3wp8kib5svqcnd6xamqmywrny08qfq"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -221496,8 +222155,8 @@ self: { }: mkDerivation { pname = "pa-field-parser"; - version = "0.2.0.1"; - sha256 = "1dkyi4gzsp2d0hfl8plmmirz6hlgy6ncd8nvxb34ax9nxi880c6v"; + version = "0.3.0.0"; + sha256 = "0myd5zcxz7cx731a9ymqnny34k2gjav7x7053f358r5dymmjp32j"; libraryHaskellDepends = [ aeson aeson-better-errors attoparsec base case-insensitive containers pa-error-tree pa-prelude scientific semigroupoids @@ -221509,18 +222168,18 @@ self: { "pa-json" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty, base - , base64-bytestring, bytestring, containers, hspec-core - , hspec-expectations, pa-error-tree, pa-label, pa-prelude - , scientific, text, time, vector + , base64-bytestring, bytestring, containers, pa-error-tree + , pa-field-parser, pa-label, pa-prelude, scientific, text, time + , vector }: mkDerivation { pname = "pa-json"; - version = "0.2.1.0"; - sha256 = "1j260q8mfd46fg4iijfva2b3db7k9zfyjpn1qblkhpf073x79hnh"; + version = "0.3.0.0"; + sha256 = "0fwjv244kbbc9zixf64654fwdykk8h4qc7iv7w7l08bywmjrgrs5"; libraryHaskellDepends = [ aeson aeson-better-errors aeson-pretty base base64-bytestring - bytestring containers hspec-core hspec-expectations pa-error-tree - pa-label pa-prelude scientific text time vector + bytestring containers pa-error-tree pa-field-parser pa-label + pa-prelude scientific text time vector ]; description = "Our JSON parsers/encoders"; license = lib.licenses.bsd3; @@ -221539,16 +222198,17 @@ self: { "pa-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, error, exceptions - , mtl, profunctors, PyF, semigroupoids, text, these - , validation-selective + , mtl, profunctors, PyF, scientific, semigroupoids + , template-haskell, text, these, validation-selective, vector }: mkDerivation { pname = "pa-prelude"; - version = "0.1.0.0"; - sha256 = "1as9kj351ph10nqzqxfnqyhnm7d10gc0jlnh3q9m8wdzmkimciam"; + version = "0.2.0.0"; + sha256 = "00gkyypa17ic2s019jmrxwjaylnfryn6nlg20ky1iip935y5y0b8"; libraryHaskellDepends = [ base bytestring containers error exceptions mtl profunctors PyF - semigroupoids text these validation-selective + scientific semigroupoids template-haskell text these + validation-selective vector ]; description = "The Possehl Analytics Prelude"; license = lib.licenses.bsd3; @@ -224447,14 +225107,12 @@ self: { }) {}; "park-bench" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, array, base, bytestring, ghc-prim, text }: mkDerivation { pname = "park-bench"; - version = "0.1.0.1"; - sha256 = "0ricvj3q4y8xdb47py9q6j23xw6fcy6l1000qm5naqkqkfz6rp35"; - revision = "2"; - editedCabalFile = "15lczl28f4cyldsx0rhg9kwi5xxykh8yw1la9s9gn28dx35809bz"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.0"; + sha256 = "15vbhljsnqjm3hjqxlzifvkbcysmwz3fqw2hmdlwkzsyncz4p6j9"; + libraryHaskellDepends = [ array base bytestring ghc-prim text ]; description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback"; license = lib.licenses.bsd3; }) {}; @@ -225301,6 +225959,18 @@ self: { license = "unknown"; }) {}; + "partialord" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "partialord"; + version = "0.0.2"; + sha256 = "1cnsjn3s154ar439gcphblm1pwvqn6w88c1hyvin7xapnssrg32g"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + description = "Data structure supporting partial orders"; + license = lib.licenses.bsd3; + }) {}; + "partly" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, bytestring, optparse-applicative, QuickCheck, vector @@ -225593,27 +226263,27 @@ self: { ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , pandoc-types, process, QuickCheck, skylighting, tasty + , pandoc-types, process, QuickCheck, random, skylighting, tasty , tasty-hunit, tasty-quickcheck, terminal-size, text, time - , unordered-containers, wcwidth, yaml + , unordered-containers, vector, wcwidth, yaml }: mkDerivation { pname = "patat"; - version = "0.9.2.0"; - sha256 = "0qhgb8lmmbxdjwim0z1dc6jyzlcg01p9y8cbz8dn8pdzbjbaj8m5"; + version = "0.10.1.1"; + sha256 = "0ndfqrnrl94rw4lnc3jmyijgpxj9xgl3m3f4iz8ilc4w36j96vpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc pandoc-types process - skylighting terminal-size text time unordered-containers wcwidth - yaml + network-uri optparse-applicative pandoc pandoc-types process random + skylighting terminal-size text time unordered-containers vector + wcwidth yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory pandoc QuickCheck tasty tasty-hunit tasty-quickcheck - text + ansi-terminal base directory pandoc QuickCheck tasty tasty-hunit + tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; @@ -225669,8 +226339,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "1"; - editedCabalFile = "0lkzfa4509id7xbnwmxb55p5dh5blz33dp3kv3c5j7yr6mdd10hs"; + revision = "2"; + editedCabalFile = "098xpd9x8cm6w4b8azg4cl039whyh3mjimvhqmazhcn4hp4y4rr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225751,6 +226421,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "path_0_9_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, genvalidity, genvalidity-hspec, genvalidity-property + , hashable, hspec, mtl, QuickCheck, template-haskell, text + , validity + }: + mkDerivation { + pname = "path"; + version = "0.9.5"; + sha256 = "0cy4vilmhzhi5nfh4v2kyvizhjzjpjib3bvgm1sgmvjzj40dfgrd"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + text + ]; + testHaskellDepends = [ + aeson base bytestring filepath genvalidity genvalidity-hspec + genvalidity-property hspec mtl QuickCheck template-haskell validity + ]; + description = "Support for well-typed paths"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-binary-instance" = callPackage ({ mkDerivation, base, binary, path }: mkDerivation { @@ -226011,6 +226704,8 @@ self: { pname = "pathtype"; version = "0.8.1.2"; sha256 = "1ikbl1yzlimf5yjvi6agliraqdi6mf6m7ig5rx97wh03vrx58hfk"; + revision = "1"; + editedCabalFile = "0iy54kvjh9nf7n870pqggw82rmx8w5hz8hv96dq9swn7dvpq52wj"; libraryHaskellDepends = [ base deepseq directory doctest-exitcode-stdio QuickCheck semigroups tagged time transformers utility-ht @@ -227860,44 +228555,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base - , base64-bytestring, blaze-html, bytestring, conduit, containers - , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data - , lift-type, monad-logger, mtl, path-pieces, QuickCheck - , quickcheck-instances, resource-pool, resourcet, scientific - , shakespeare, silently, template-haskell, text, th-lift-instances - , time, transformers, unliftio, unliftio-core, unordered-containers - , vault, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.14.5.2"; - sha256 = "13j9aawkdiy5wqx8q4xbnskjr35g0pgx1l0iv3ir0z60xfl717gz"; - libraryHaskellDepends = [ - aeson attoparsec attoparsec-aeson base base64-bytestring blaze-html - bytestring conduit containers deepseq fast-logger http-api-data - lift-type monad-logger mtl path-pieces resource-pool resourcet - scientific silently template-haskell text th-lift-instances time - transformers unliftio unliftio-core unordered-containers vault - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers deepseq fast-logger hspec http-api-data - monad-logger mtl path-pieces QuickCheck quickcheck-instances - resource-pool resourcet scientific shakespeare silently - template-haskell text th-lift-instances time transformers unliftio - unliftio-core unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq file-embed template-haskell text - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.psibi ]; - }) {}; - - "persistent_2_14_6_0" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base , base64-bytestring, blaze-html, bytestring, conduit, containers , criterion, deepseq, fast-logger, file-embed, hspec, http-api-data @@ -227932,7 +228589,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {}; @@ -228002,35 +228658,6 @@ self: { }) {}; "persistent-discover" = callPackage - ({ mkDerivation, base, directory, discover-instances, dlist - , file-embed, filepath, hspec, hspec-discover, mtl, persistent - , some-dict-of, template-haskell, text - }: - mkDerivation { - pname = "persistent-discover"; - version = "0.1.0.6"; - sha256 = "1p4qvyjrf142192g9chxpdawpb55vk3dxrb1w0clwrhbz2w1q6q9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory discover-instances dlist file-embed filepath mtl - persistent some-dict-of template-haskell text - ]; - executableHaskellDepends = [ - base directory discover-instances dlist file-embed filepath mtl - persistent some-dict-of template-haskell text - ]; - testHaskellDepends = [ - base directory discover-instances dlist file-embed filepath hspec - hspec-discover mtl persistent some-dict-of template-haskell text - ]; - testToolDepends = [ hspec-discover ]; - description = "Persistent module discover utilities"; - license = lib.licenses.bsd3; - mainProgram = "persistent-discover"; - }) {}; - - "persistent-discover_0_1_0_7" = callPackage ({ mkDerivation, base, directory, discover-instances, dlist , file-embed, filepath, hspec, hspec-discover, mtl, persistent , some-dict-of, template-haskell, text @@ -228056,7 +228683,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Persistent module discover utilities"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "persistent-discover"; }) {}; @@ -228525,27 +229151,6 @@ self: { }) {}; "persistent-qq" = callPackage - ({ mkDerivation, aeson, base, bytestring, fast-logger - , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent - , persistent-sqlite, resourcet, template-haskell, text, unliftio - }: - mkDerivation { - pname = "persistent-qq"; - version = "2.12.0.5"; - sha256 = "1mkgrczllayf8mq773rqp11d677fqjxcblmb3l97m0k1qyvpjq1h"; - libraryHaskellDepends = [ - base haskell-src-meta mtl persistent template-haskell text - ]; - testHaskellDepends = [ - aeson base bytestring fast-logger haskell-src-meta hspec HUnit - monad-logger mtl persistent persistent-sqlite resourcet - template-haskell text unliftio - ]; - description = "Provides a quasi-quoter for raw SQL for persistent"; - license = lib.licenses.mit; - }) {}; - - "persistent-qq_2_12_0_6" = callPackage ({ mkDerivation, aeson, base, bytestring, fast-logger , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent , persistent-sqlite, resourcet, template-haskell, text, unliftio @@ -228564,7 +229169,6 @@ self: { ]; description = "Provides a quasi-quoter for raw SQL for persistent"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-ratelimit" = callPackage @@ -228662,38 +229266,6 @@ self: { }) {}; "persistent-sqlite" = 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; - maintainers = [ lib.maintainers.psibi ]; - }) {inherit (pkgs) sqlite;}; - - "persistent-sqlite_2_13_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th , monad-logger, mtl, persistent, persistent-test, QuickCheck @@ -228722,7 +229294,6 @@ self: { ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.psibi ]; }) {inherit (pkgs) sqlite;}; @@ -231186,8 +231757,8 @@ self: { }: mkDerivation { pname = "pipes-binary"; - version = "0.4.3"; - sha256 = "1r3byrp8z99rkz2z7pjrz88i4y8qy1qy38ih363ky65r87hbw6d3"; + version = "0.4.4"; + sha256 = "1grylcr2iiqa9wlki821lgabll4d53lmrzxw5nycpva546z8v13b"; libraryHaskellDepends = [ base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse transformers @@ -232212,6 +232783,8 @@ self: { pname = "pipes-zlib"; version = "0.4.4.2"; sha256 = "0s42dnack5yasbx958dshhlhq58qd41vw2plwr9c20d6lkd95wh5"; + revision = "1"; + editedCabalFile = "1xkan9nazclmnsvqqdzxz2y83hddhwbypkw0vvmcs3h3kai5mgga"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -233599,8 +234172,8 @@ self: { pname = "pointfree-fancy"; version = "1.1.1.15"; sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd"; - revision = "2"; - editedCabalFile = "1m23ll2r9aizgp21jssyxxqa20lg93carpn7gwdfzafakwjzdg26"; + revision = "3"; + editedCabalFile = "0vw7i9p71bvvnawn2xdxvbyk17n92wlqndq8w2y3nlj3g7ivwmrd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233967,6 +234540,8 @@ self: { pname = "poly"; version = "0.5.1.0"; sha256 = "0ycjdan9l92glnqr0lms2kdjfs5dg9c2ky2w2rdmrc6nzzxajd9k"; + revision = "1"; + editedCabalFile = "1fhq09zg8fiz8k8ijv13vxdzy8rq8bn5nm370pbjz60kg40lymwc"; libraryHaskellDepends = [ base deepseq finite-typelits primitive semirings vector vector-algorithms vector-sized @@ -234209,8 +234784,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.2"; - sha256 = "0b1mlv4ny7kga8a9bk2gj9y39kjlf5vwbnp6zkx6i6wfjg1z1i4c"; + version = "1.9.1.3"; + sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -235435,6 +236010,8 @@ self: { pname = "pooled-io"; version = "0.0.2.3"; sha256 = "0ysgfwlppilj21sqhbcq7xbyc5hnc26mzb58y7mm9rd5piw3v7mc"; + revision = "1"; + editedCabalFile = "1c2ggwlgr22zwc15x175hl08ql3fls278nwzdb3igqggdv5kx6cz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236300,8 +236877,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.11.1.0"; - sha256 = "1q7pgklgc0d93hwacv3akx1vi29hvanj7lpyl29nzzwwk2y2pird"; + version = "0.11.2.1"; + sha256 = "0zlm0gk4sxm84kx205n5z0r0nw13kajk7400zbi9v2xslwjpgxnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236349,6 +236926,32 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_13_1_1" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, criterion, network-ip + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.13.1.1"; + sha256 = "16s9j1c9kkkcxq1s8jnb2w5y14s9a25hmghbsd827d1qyvxxglwb"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -236551,6 +237154,8 @@ self: { pname = "postgresql-migration"; version = "0.2.1.7"; sha256 = "0r8pmy9905549vavbmps4627d2a5agz7hq0wv9663xdibvqsaf78"; + revision = "1"; + editedCabalFile = "1s5kcfnbsh5y1jsybvpl92j32wp43n8pd56981wynnrhh3kinlbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239010,8 +239615,8 @@ self: { pname = "prettyprinter-interp"; version = "0.2.0.0"; sha256 = "0ml068y49n0s6p0nq0qfv5dmpkpkbd9p06hkj582yn2a1h32x0ff"; - revision = "2"; - editedCabalFile = "0fyb4rgxgavh1fwdc54fh5vl9wqynsqgf72dq1a0v6gmqb2aaqys"; + revision = "3"; + editedCabalFile = "079c6ri9aahi4whnxzyh5d3nnawmjvn1kjkq6jdsnp96bflkkhv9"; libraryHaskellDepends = [ base prettyprinter string-interpolate template-haskell text ]; @@ -239289,14 +239894,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive_0_9_0_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, tagged, tasty, tasty-bench + , tasty-quickcheck, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.9.0.0"; + sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers + ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + tagged tasty tasty-quickcheck transformers transformers-compat + ]; + benchmarkHaskellDepends = [ + base deepseq tasty-bench transformers + ]; + description = "Primitive memory-related operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-addr"; version = "0.1.0.2"; sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; - revision = "1"; - editedCabalFile = "14pawzzip9528qizhrpai00h27z9dfin4kw8vqkb6576pi8g1y2f"; + revision = "2"; + editedCabalFile = "1s18b6xm6906ldj8wd2b2j885xbgvf5mzabd4mpl1ic7a9205qgn"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = lib.licenses.bsd3; @@ -239373,25 +240003,48 @@ self: { "primitive-extras" = callPackage ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit - , tasty-quickcheck, vector + , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck + , vector }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.7"; - sha256 = "0z3l1hcnqbzz14k3j4ylfh48v048l0y9waa6k447x8vqrkbrzm56"; + version = "0.10.1.8"; + sha256 = "1c91izq58s0v9z4p2kb91af179n4dagvwkqqp46fzvam6n2xcrw3"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector ]; testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + cereal deferred-folds focus primitive QuickCheck rerebase tasty + tasty-hunit tasty-quickcheck ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; }) {}; + "primitive-extras_0_10_1_10" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.10.1.10"; + sha256 = "1b83m53dwd2wagqzf0sy6wzsh3kj8prwdkkh6xbm6x0sqmr5ky8l"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -239546,8 +240199,8 @@ self: { pname = "primitive-unaligned"; version = "0.1.1.2"; sha256 = "1ksl2gib15inbd80rf0bl3baj8fmk740liv4fdg9493dlhr3a4pa"; - revision = "1"; - editedCabalFile = "1kndcxl120bl0wzjjd8s2nxcw4qw5y3q6vzdqxn8p4xblk1vxajk"; + revision = "4"; + editedCabalFile = "0ya85xy2zs5fr3hb3hhhps34nrncj3ski7h2zc9d68i5zlhiacmf"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive ]; description = "Unaligned access to primitive arrays"; @@ -240399,8 +241052,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; - revision = "2"; - editedCabalFile = "0v595d8b2lv89nxyhgmzyp90i1h9vzlhbp6ry9gf99n7rdp525fw"; + revision = "3"; + editedCabalFile = "0a9i5gxa5ls17vj6blymfl63zndk887mylc4k7bzj014xl177hsg"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell th-abstraction @@ -243141,8 +243794,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.11"; - sha256 = "1zapnx6d7h4xas2mn6p2mq81gq7wr1zx9vd94xplmyghb1db1gcs"; + version = "0.15.12"; + sha256 = "0rsllqg7k7xkgda1j2vk6sfb9k18vp6d16xwkz4bhjsakrl28dqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244283,8 +244936,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.8"; - sha256 = "1f8ydz1s07p5817l746vxvsh8xprbkrffhmgv2wkqx61s05rc5ch"; + version = "0.9.9"; + sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -244899,8 +245552,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.6"; - sha256 = "0cxgwd3flwc2kyw4gj4ak6c12j89agka3z8mb8nllr5vi4ll4xi5"; + version = "0.1.7"; + sha256 = "09pdlp49ix56cnshscq1knmakwcgwjq1p24i2rf4yyfc8hkj3bfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245187,34 +245840,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, data-fix, hashable, integer-logarithms, old-time - , OneTuple, primitive, QuickCheck, scientific, splitmix, strict - , tagged, text, text-short, these, time, time-compat, transformers - , transformers-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.29.1"; - sha256 = "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"; - revision = "2"; - editedCabalFile = "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip"; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers data-fix hashable - integer-logarithms old-time OneTuple primitive QuickCheck - scientific splitmix strict tagged text text-short these time - time-compat transformers transformers-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - base containers primitive QuickCheck tagged uuid-types - ]; - benchmarkHaskellDepends = [ base bytestring QuickCheck ]; - description = "Common quickcheck instances"; - license = lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_30" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time , OneTuple, primitive, QuickCheck, scientific, splitmix, strict @@ -245225,6 +245850,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.30"; sha256 = "07c4ipssd4q823x2biry43h182y3rg26yqsv14z4yiajmz9rlvmx"; + revision = "1"; + editedCabalFile = "0khr8jyxb0kxqmpi8sn7f0i89cwj4fq2chsygl4f02kflkji53dp"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -245238,7 +245865,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -246269,8 +246895,8 @@ self: { pname = "quotet"; version = "0.0.1.1"; sha256 = "16fwbf9q2ivpi3j7y26lsbqvwwk7vidjn6q9iz4x6sq8adhy45rz"; - revision = "2"; - editedCabalFile = "1czfh5jrrllpy9kgd2i2d5dx5rljz7k0ik9gdc3gw6qnlxkdnzni"; + revision = "3"; + editedCabalFile = "1k5lh7nk1yircafndxh4i4wl0jiblivlqrrqv5npc8r9d0sw3kf0"; libraryHaskellDepends = [ base mtl template-haskell th-compat ]; description = "Monad transformer for Quote from template-haskell"; license = lib.licenses.cc0; @@ -246353,8 +246979,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.7"; - sha256 = "1sx2p1xqash0737z0s5hg2848j9zf02941ksmwd7dlmfaz35x57h"; + version = "0.3.8"; + sha256 = "1l4lxha5c73855h19wpjk5l3vkkqz63rr4iicwilil92r4wrav51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -247479,8 +248105,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.2"; - sha256 = "1qhb6ijziq3g58qs3b22k1cg8601a4vd4vaka6cq0ny5x8x54b8v"; + version = "1.5.3"; + sha256 = "1smcplhgh1xmgdp4i5d7sbmvm80s05z5p1vhyywsq4x2hpz20a7g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base data-functor-logistic distributive template-haskell @@ -249302,7 +249928,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_20" = callPackage + "rebase_1_20_1_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -249311,8 +249937,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.20"; - sha256 = "17r3h5gvr9q6dp8h0vvgm60rn2yjikbrzb8q20xxymhynxh7s74x"; + version = "1.20.1.1"; + sha256 = "1fwshqfshqxdjfxb9flbch40mjdjqfc3vl7q1j9b1dcv7jfyjv0h"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -249686,6 +250312,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "recursion-schemes_5_2_2_5" = callPackage + ({ mkDerivation, base, comonad, containers, data-fix, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.2.2.5"; + sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; + libraryHaskellDepends = [ + base comonad containers data-fix free template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq , hspec, lens, recursion-schemes @@ -251799,8 +252443,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; - revision = "5"; - editedCabalFile = "0lsciwi4akvk6s6h69ga359lj7cnn6p2i6dmqsy5nvar8m22i0cn"; + revision = "6"; + editedCabalFile = "1rn3649yqqrbd177mbyk12gdpbm3kdzjgnjqxfv68crah237y08j"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -253007,31 +253651,6 @@ self: { }) {}; "relude" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty-bench, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "relude"; - version = "1.2.0.0"; - sha256 = "0wqj5ipsm3wwl401q5c5w6q6q07qd825y2d10j3q9gqsvyrpgqfb"; - revision = "1"; - editedCabalFile = "1vbmqnahjkvv6wla19vd8pl2k8i0di54c1q37ahx02i4zmnwv6zr"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers doctest Glob hedgehog text - ]; - benchmarkHaskellDepends = [ - base tasty-bench unordered-containers - ]; - description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; - license = lib.licenses.mit; - }) {}; - - "relude_1_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty-bench, text , transformers, unordered-containers @@ -253052,7 +253671,6 @@ self: { ]; description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "remark" = callPackage @@ -254193,12 +254811,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_20" = callPackage + "rerebase_1_20_1_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.20"; - sha256 = "1p4sbhsyz251w7m9iq4wvqh4xbwcc7pm6q97wrh6h77zrj1yq1zj"; + version = "1.20.1.1"; + sha256 = "1rwqk72y0ky8xc3r5j1f04f8a7g37l8j5ybcadxf0wsbnhnz0lli"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -256969,8 +257587,8 @@ self: { }: mkDerivation { pname = "rock"; - version = "0.3.1.1"; - sha256 = "0r6z9all4ynsam4z3ln0ad0zycfk6pxvwavfzr4icfwg5ifj01hi"; + version = "0.3.1.2"; + sha256 = "0zcqff2k3fnq1243lmznwvdrqy942i84q1xknwqqs9d060pyfsvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258163,8 +258781,8 @@ self: { }: mkDerivation { pname = "rrb-vector"; - version = "0.2.0.0"; - sha256 = "17lmf79dzynpw43ibs7xzq31bvim5wj7a91k5h3bdzwjwwh1sy0x"; + version = "0.2.0.1"; + sha256 = "05wg7nz9p3ipn9az37yvaw48gmhchfc9hnqrfbsrbr9jghvm536v"; libraryHaskellDepends = [ base deepseq indexed-traversable primitive ]; @@ -258914,8 +259532,8 @@ self: { }: mkDerivation { pname = "rzk"; - version = "0.6.5"; - sha256 = "04xvh3yymqhn3kr4h5q8cysww5f5bw0zr6n0m8wrp428s211iw0a"; + version = "0.6.7"; + sha256 = "1k7ngvdsn59q7b7j9q1cfm1r6vwxqhbaal7qnxy0r9y6vcc6ggxf"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -259192,6 +259810,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.4"; sha256 = "1xhyljfvf1zpr7gpi9xgqmi9xsiv5vcjz52gz65zyq4v1kaxhl9w"; + revision = "1"; + editedCabalFile = "1laifqnsvli7x74asal5l4qhsvgvc6hycjqmrg7qmmabsldjddwb"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec transformers void ]; description = "Safe, consistent, and easy exception handling"; @@ -259573,8 +260193,8 @@ self: { pname = "safecopy"; version = "0.10.4.2"; sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; - revision = "7"; - editedCabalFile = "1haylxnkj7if9q2kmhp5cvb7xi68fk00q0nqjvfc0giih9mjr1ck"; + revision = "8"; + editedCabalFile = "03w9x2p5cnwngwl698p12vm62gbbd5n3ckw6p9hm0j177jdhsynr"; libraryHaskellDepends = [ array base bytestring cereal containers generic-data old-time template-haskell text time transformers vector @@ -260546,6 +261166,18 @@ self: { mainProgram = "sat-micro"; }) {}; + "sat-simple" = callPackage + ({ mkDerivation, base, containers, minisat, unliftio-core }: + mkDerivation { + pname = "sat-simple"; + version = "0.1.0.0"; + sha256 = "0w80zfhlh4w506iajkan09vi71q7rbxfl65vsglnwhxsk2kdk3nw"; + libraryHaskellDepends = [ base containers minisat unliftio-core ]; + testHaskellDepends = [ base containers ]; + description = "A high-level wrapper over minisat"; + license = lib.licenses.bsd3; + }) {}; + "satchmo" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, hashable, lens, minisat, mtl, process @@ -260785,8 +261417,8 @@ self: { }: mkDerivation { pname = "sayable"; - version = "1.2.0.0"; - sha256 = "1fdwhpmksqzhlhsk0i4nq7ng20j6b9pbq01fwpbnb5jsyw9wa9m5"; + version = "1.2.2.0"; + sha256 = "0dmvdf8zs8sf4lwyjzryb2bszfzwgi0wbh232s41g35070sdhy5q"; libraryHaskellDepends = [ base bytestring exceptions prettyprinter text ]; @@ -261819,8 +262451,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "6"; - editedCabalFile = "1clrcp8a20zg7iqrrg4agk5sblmz87fr4wq45v54n1inbf2ls508"; + revision = "7"; + editedCabalFile = "1wkf63yiklpxgagvsq13ddvhg128l4yk50ajz2giclxl36mmb5wh"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -265055,8 +265687,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.1.0"; - sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; + version = "0.3.1.1"; + sha256 = "037if4mgccbbi2n52dfvkn63sbcymvsj3a6njz1wk4gjb7rgsgrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266644,6 +267276,8 @@ self: { pname = "servant-lucid"; version = "0.9.0.6"; sha256 = "1z894w9hfcnsdwivy2qvwa254l9d9bsbdjvzlvksxy92aw1p6fd0"; + revision = "1"; + editedCabalFile = "1b76mpiicbx9n062q7br0da6hbmwrbkkc881rh87l0snl03rzpmp"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -273180,10 +273814,8 @@ self: { ({ mkDerivation, base, singletons, singletons-base }: mkDerivation { pname = "singleton-nats"; - version = "0.4.6"; - sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r"; - revision = "2"; - editedCabalFile = "044gxxa9j076p1g4vca4j8w5brx2qg5yqdvqjvmz6fv5kms4b8jd"; + version = "0.4.7"; + sha256 = "18n2p5cl75rl2afvq4qy3vilcvbyx8wz0qh4w4m9aqakk3lyv87i"; libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; @@ -273208,8 +273840,8 @@ self: { pname = "singletons"; version = "3.0.2"; sha256 = "10jy9phwx3gnl5dx6by7chsln1x3lizz2igi4m1qlhznkq9fws7m"; - revision = "1"; - editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy"; + revision = "2"; + editedCabalFile = "040hwa1r4vx64v62ffw2nfn29h91ns082zqc47jsp5ciwl69821p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; @@ -273238,15 +273870,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-base_3_2" = callPackage + "singletons-base_3_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty , tasty-golden, template-haskell, text, th-desugar, turtle }: mkDerivation { pname = "singletons-base"; - version = "3.2"; - sha256 = "0m96dz9k5wls5m3vls65clws1yfd73skblv878yj06lw9nmwshy9"; + version = "3.3"; + sha256 = "1h879yy50g6pldnshjh3syvw8qvqzkm8vxsrj237fk76n56x0iq8"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -273295,14 +273927,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-th_3_2" = callPackage + "singletons-th_3_3" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.2"; - sha256 = "1r4m9h9wwq86lww3aq7jxzias78ix79kgnj24slaps848d7hhpkp"; + version = "3.3"; + sha256 = "131v6gfx43mwxaqxx4m1lkyb1cxybwpd02m91r83i1phkxmla2qv"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -273590,6 +274222,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "size-based_0_1_3_2" = callPackage + ({ mkDerivation, base, dictionary-sharing, template-haskell + , testing-type-modifiers + }: + mkDerivation { + pname = "size-based"; + version = "0.1.3.2"; + sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; + libraryHaskellDepends = [ + base dictionary-sharing template-haskell testing-type-modifiers + ]; + description = "Sized functors, for size-based enumerations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sized" = callPackage ({ mkDerivation, base, constraints, containers, deepseq , equational-reasoning, ghc-typelits-knownnat @@ -274482,6 +275130,23 @@ self: { license = lib.licenses.mit; }) {}; + "slave-thread_1_1_0_3" = callPackage + ({ mkDerivation, base, deferred-folds, focus, foldl, rerebase + , SafeSemaphore, stm-containers, tasty, tasty-hunit + }: + mkDerivation { + pname = "slave-thread"; + version = "1.1.0.3"; + sha256 = "02ydjlm87z75h44ci8iamidf63yjxrpal5bqaim6iy0ixdg13c5r"; + libraryHaskellDepends = [ + base deferred-folds focus foldl stm-containers + ]; + testHaskellDepends = [ rerebase SafeSemaphore tasty tasty-hunit ]; + description = "A fundamental solution to ghost threads and silent exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "sleep" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -274626,6 +275291,8 @@ self: { pname = "slist"; version = "0.2.1.0"; sha256 = "1j52gvq42x03y7jq0pxzab98qnrsjg6qnw4ysq6cd89cx6gg04ab"; + revision = "1"; + editedCabalFile = "0a3m4y2jy40xz7j4zgxj409nmhscz63yzikcqjgz1l9yl39i7437"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest Glob hedgehog hspec hspec-hedgehog @@ -275909,8 +276576,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "2"; - editedCabalFile = "0gpnjqvcgpbvv72m94q1qghs7dzrc10s0qdr71yar0zmv2j06pnj"; + revision = "3"; + editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -277940,6 +278607,8 @@ self: { pname = "some"; version = "1.0.5"; sha256 = "0pwivkyhdndh9f79gsz5gx51if8wm3r8mvbkysz2pq5m77g7kpmh"; + revision = "1"; + editedCabalFile = "060vrbwlc4xrwkh92q3jkgdy7zjzrzlg2k0ll0wklxaph9siphzr"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -277988,8 +278657,8 @@ self: { pname = "sop-core"; version = "0.5.0.2"; sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; - revision = "2"; - editedCabalFile = "0db36xhswrsc30cw5c5s7h6g1ykcb3bkjjnixaqqshxln6cwfsig"; + revision = "3"; + editedCabalFile = "0rlrf4whfkqf200916d02r0s4zqlimb3d4z6gd3f5czayncp31cx"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = lib.licenses.bsd3; @@ -278067,6 +278736,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "sorted-list_0_2_2_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, QuickCheck }: + mkDerivation { + pname = "sorted-list"; + version = "0.2.2.0"; + sha256 = "0dqgk1fxmk9z97wc5lii5rhalbjhfq6i9db95scj7g91lrv0zrrr"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Type-enforced sorted lists and related functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sortee" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck }: mkDerivation { @@ -278171,6 +278854,24 @@ self: { broken = true; }) {}; + "sound-change" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , megaparsec, mtl, parser-combinators, syb, template-haskell + }: + mkDerivation { + pname = "sound-change"; + version = "0.1.0.0"; + sha256 = "1xg9drlf5kaqkx3fyyvz386cwpdk7ynyypkalr7fxax0q0cmcs08"; + libraryHaskellDepends = [ + base containers megaparsec mtl parser-combinators syb + template-haskell + ]; + testHaskellDepends = [ base containers hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Apply sound changes to words"; + license = lib.licenses.mit; + }) {}; + "sound-collage" = callPackage ({ mkDerivation, base, comfort-array, comfort-fftw, containers , filepath, numeric-prelude, optparse-applicative, pathtype @@ -279557,6 +280258,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "split_0_2_4" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "split"; + version = "0.2.4"; + sha256 = "1crixdmpjzahfiwkkm995rj5ymnm60rknqy252dv23pks00f77vl"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Combinator library for splitting lists"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "split-channel" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -279614,32 +280328,6 @@ self: { }) {}; "splitmix" = callPackage - ({ mkDerivation, async, base, base-compat, base-compat-batteries - , bytestring, clock, containers, criterion, deepseq, HUnit - , math-functions, process, random, test-framework - , test-framework-hunit, testu01, tf-random, vector - }: - mkDerivation { - pname = "splitmix"; - version = "0.1.0.4"; - sha256 = "1apck3nzzl58r0b9al7cwaqwjhhkl8q4bfrx14br2yjf741581kd"; - revision = "2"; - editedCabalFile = "13ixb8qfll9x26v0zdk2kajlqd1zpab1p2xb8rh6pak7g7hw49fv"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - async base base-compat base-compat-batteries bytestring containers - deepseq HUnit math-functions process random test-framework - test-framework-hunit tf-random vector - ]; - testSystemDepends = [ testu01 ]; - benchmarkHaskellDepends = [ - base clock containers criterion random tf-random - ]; - description = "Fast Splittable PRNG"; - license = lib.licenses.bsd3; - }) {testu01 = null;}; - - "splitmix_0_1_0_5" = callPackage ({ mkDerivation, async, base, base-compat, base-compat-batteries , bytestring, clock, containers, criterion, deepseq, HUnit , math-functions, process, random, test-framework @@ -279661,7 +280349,6 @@ self: { ]; description = "Fast Splittable PRNG"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {testu01 = null;}; "splitmix-distributions" = callPackage @@ -280078,15 +280765,19 @@ self: { }) {}; "sqids" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, split, text - , transformers + ({ mkDerivation, base, bytestring, containers, hspec, mtl, split + , text, transformers }: mkDerivation { pname = "sqids"; - version = "0.1.4.0"; - sha256 = "0nw5g8azgh4mw8nvvrryy8ck37xyv92p36rvpa73ickn5a20bp06"; - libraryHaskellDepends = [ base containers mtl text transformers ]; - testHaskellDepends = [ base containers hspec mtl split text ]; + version = "0.2.0.0"; + sha256 = "0sabrvwhzf9xvj9gwnwxjvg4f2qv7qgaabvl7nhrv12zxfjvh5jm"; + libraryHaskellDepends = [ + base bytestring containers mtl text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec mtl split text transformers + ]; description = "A small library that lets you generate YouTube-looking IDs from numbers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -281924,28 +282615,28 @@ self: { "stackctl" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka , amazonka-cloudformation, amazonka-core, amazonka-ec2 - , amazonka-lambda, amazonka-sso, amazonka-sts, base, Blammo - , bytestring, cfn-flip, conduit, containers, envparse, errors - , exceptions, extra, filepath, Glob, hspec, hspec-golden, lens - , lens-aeson, monad-logger, mtl, optparse-applicative, QuickCheck - , resourcet, rio, semigroups, text, text-metrics, time + , amazonka-lambda, amazonka-mtl, amazonka-sso, amazonka-sts, base + , Blammo, bytestring, cfn-flip, conduit, containers, envparse + , errors, exceptions, extra, filepath, Glob, hspec, hspec-golden + , lens, lens-aeson, monad-logger, mtl, optparse-applicative + , QuickCheck, resourcet, rio, semigroups, text, text-metrics, time , transformers, typed-process, unliftio, unordered-containers, uuid , yaml }: mkDerivation { pname = "stackctl"; - version = "1.5.0.1"; - sha256 = "0ncl4706np8zl739di6f4nyy44cm7pklppkvmjlsxzw6s6hgidsf"; + version = "1.6.0.0"; + sha256 = "0pb7w53zyq8kkczg6q29nkic8i5w2ma2hsvn0x0g8iq4i016c23c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation - amazonka-core amazonka-ec2 amazonka-lambda amazonka-sso - amazonka-sts base Blammo bytestring cfn-flip conduit containers - envparse errors exceptions extra filepath Glob lens lens-aeson - monad-logger mtl optparse-applicative QuickCheck resourcet rio - semigroups text text-metrics time transformers typed-process - unliftio unordered-containers uuid yaml + amazonka-core amazonka-ec2 amazonka-lambda amazonka-mtl + amazonka-sso amazonka-sts base Blammo bytestring cfn-flip conduit + containers envparse errors exceptions extra filepath Glob lens + lens-aeson monad-logger mtl optparse-applicative QuickCheck + resourcet rio semigroups text text-metrics time transformers + typed-process unliftio unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -282040,12 +282731,12 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.0.1.0"; - sha256 = "13q0pf0vjh19w9sshxa45gbfmhv707sizx6mf5s35003654a0bxm"; + version = "0.1.0.1"; + sha256 = "1f4sk6j9dbnjrb3hjjj9gpbzs66mkmij208vqyvb4z284agfhzng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base base64 blaze-html bytestring clay colourista containers + array base base64 blaze-html bytestring clay colourista cryptohash-sha1 dir-traverse directory extensions filepath ghc ghc-boot-th gitrev microaeson optparse-applicative pretty-simple process relude slist text tomland trial trial-optparse-applicative @@ -283222,14 +283913,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "stm_2_5_1_0" = callPackage + "stm_2_5_2_1" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.5.1.0"; - sha256 = "11c84d5qqvw2kfx6arw0vaf9h7pxwnyw8xvaf7fxjmhg4p8x16ib"; - revision = "1"; - editedCabalFile = "0wq35b8f0w577byhv0k1954pcy5bbv22w34qln0nlz62x8sgw1kr"; + version = "2.5.2.1"; + sha256 = "16xis3rj5i0qlr1nc8ybmcrjhhqc2mh4l4lblmi04k2x00aycas1"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = lib.licenses.bsd3; @@ -283336,6 +284025,28 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "stm-containers_1_2_0_3" = callPackage + ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable + , list-t, quickcheck-instances, rerebase, stm-hamt, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-containers"; + version = "1.2.0.3"; + sha256 = "1cchysjykxiq3s85xaafxkz8kg1czygjs17jlk6ic3ihv2ybr34j"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t stm-hamt transformers + ]; + testHaskellDepends = [ + deferred-folds focus foldl free list-t quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Containers for STM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "stm-delay" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -283387,8 +284098,8 @@ self: { }: mkDerivation { pname = "stm-hamt"; - version = "1.2.0.11"; - sha256 = "0dw5vrsc9dwbxnydibwlwhrrg2db2d2frlddw24nfhvydba12p3j"; + version = "1.2.0.13"; + sha256 = "0nbnh7ibdlcp0bw1jzmkdcq8ysdqz3f9143pd3yj635mp0dyxgya"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t primitive primitive-extras transformers @@ -283404,6 +284115,32 @@ self: { license = lib.licenses.mit; }) {}; + "stm-hamt_1_2_0_14" = callPackage + ({ mkDerivation, async, base, criterion, deferred-folds, focus + , free, hashable, list-t, primitive, primitive-extras, QuickCheck + , quickcheck-instances, random, rebase, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-hamt"; + version = "1.2.0.14"; + sha256 = "0rhqndyy3xq3xn408r17zshvjkibjc2562yzxx5qmjq8qsnlnjxd"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t primitive + primitive-extras transformers + ]; + testHaskellDepends = [ + deferred-folds focus QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async criterion focus free random rebase + ]; + description = "STM-specialised Hash Array Mapped Trie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stm-incremental" = callPackage ({ mkDerivation, base, hspec, stm }: mkDerivation { @@ -283814,10 +284551,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.13.1"; - sha256 = "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w"; - revision = "3"; - editedCabalFile = "0iwdlamw4fm49qfawx7xp9alvv94l6q1xqrqav9k1q6486m27q99"; + version = "0.2.13.2"; + sha256 = "03nq5930yjpdvnyh93pjxzh3xjsracnnzcyqc0j3yiwadggbjy35"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck semigroups syb transformers unsafe utility-ht @@ -283863,8 +284598,8 @@ self: { "store" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec + , clock, containers, contravariant, criterion, cryptohash-sha1 + , deepseq, directory, filepath, free, ghc-prim, hashable, hspec , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base , monad-control, mono-traversable, nats, network, primitive , resourcet, safe, smallcheck, store-core, syb, template-haskell @@ -283874,20 +284609,20 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.16"; - sha256 = "125n9jcqjcyk7ypky4i0fydy1msgn8ldrhyhclqp1w0p7s2wazsg"; + version = "0.7.18"; + sha256 = "1qvfh7j1k8gfkllbvln5kfi45n59690yfkzdlazmajji8d8mp8z0"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable nats network primitive - resourcet safe smallcheck store-core syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector void + bytestring containers contravariant cryptohash-sha1 deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void ]; testHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq + bytestring clock containers contravariant cryptohash-sha1 deepseq directory filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable nats network primitive resourcet safe smallcheck store-core syb template-haskell @@ -283898,8 +284633,8 @@ self: { benchmarkHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control + cryptohash-sha1 deepseq directory filepath free ghc-prim hashable + hspec hspec-smallcheck integer-gmp lifted-base monad-control mono-traversable nats network primitive resourcet safe smallcheck store-core syb template-haskell text th-lift th-lift-instances th-orphans th-reify-many th-utilities time transformers @@ -283915,10 +284650,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.4.4.4"; - sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y"; - revision = "1"; - editedCabalFile = "04jv0y5k9iscw8ac72rbycmcscadnjsv2rjgwj6x0r2bymvdq00g"; + version = "0.4.4.6"; + sha256 = "1b4yhznw2xzi6qmbahf6p2sl9l8d1af36687gpwygd12h71qv17d"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -283928,13 +284661,13 @@ self: { "store-streaming" = callPackage ({ mkDerivation, async, base, bytestring, conduit, free, hspec - , hspec-smallcheck, network, resourcet, smallcheck, store - , store-core, streaming-commons, text, transformers, void + , hspec-discover, hspec-smallcheck, network, resourcet, smallcheck + , store, store-core, streaming-commons, text, transformers, void }: mkDerivation { pname = "store-streaming"; - version = "0.2.0.3"; - sha256 = "0b164ixsqgrar4riqlm3ip5rfbinapk6md7hnz32gzcmrgav283q"; + version = "0.2.0.5"; + sha256 = "07xpsa3m7vjlv01gfay23v5ycy8fcddv551vbgs5bkg8vn7a5gvk"; libraryHaskellDepends = [ async base bytestring conduit free resourcet store store-core streaming-commons text transformers @@ -283944,6 +284677,7 @@ self: { resourcet smallcheck store store-core streaming-commons text transformers void ]; + testToolDepends = [ hspec-discover ]; description = "Streaming interfaces for `store`"; license = lib.licenses.mit; }) {}; @@ -284393,6 +285127,8 @@ self: { pname = "streaming-commons"; version = "0.2.2.6"; sha256 = "0ydzkx00akxf2kw5ifdmfia2if5iqa3fhbw15ckgdc1fi259b001"; + revision = "1"; + editedCabalFile = "0jz2g82kzdiy6qwqx6a21y412v71hwnmzmai0gdiprylxyczpinm"; libraryHaskellDepends = [ array async base bytestring directory network process random stm text transformers unix zlib @@ -284901,8 +285637,8 @@ self: { pname = "streamly-fsnotify"; version = "1.1.1.0"; sha256 = "1xcw4rsrysh96d91wjmyzb5s7cls3rf0ilpv8dn525iqzv11fl3l"; - revision = "3"; - editedCabalFile = "14jr2rx2iwyv2ibyyaahgw9xchn14r12ikkrxykc7nw0c4211x3i"; + revision = "4"; + editedCabalFile = "0b7yjszv2xapxqfghhdi7129dvsmgkzgzd361ancmfhmbkxvwlz4"; libraryHaskellDepends = [ base filepath fsnotify semirings streamly text time ]; @@ -285163,6 +285899,8 @@ self: { pname = "strict-base-types"; version = "0.8"; sha256 = "11cv7jbk37mmm3q6rjclw659qv9pav8f0aw8rbp3lj1sgfjyis9q"; + revision = "1"; + editedCabalFile = "1apyy4qi26d3j4chhd4csg1ymhvyajdvpq6hcs6mm9c2n20iw0yk"; libraryHaskellDepends = [ aeson base quickcheck-instances strict strict-lens ]; @@ -285390,6 +286128,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict-tuple_0_1_5_3" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hashable }: + mkDerivation { + pname = "strict-tuple"; + version = "0.1.5.3"; + sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; + libraryHaskellDepends = [ base bifunctors deepseq hashable ]; + testHaskellDepends = [ base ]; + description = "Strict tuples"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-tuple-lens" = callPackage ({ mkDerivation, base, lens, strict-tuple }: mkDerivation { @@ -288378,8 +289129,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.6.0"; - sha256 = "0c3vmlya7cyc5bx6qfrbhmizrpsaww8bn3mrqnn7jyrldnixi77x"; + version = "0.10.7.0"; + sha256 = "0b783gir0zm248skrhjbnxn50wgyp9114lzn1ah5l047yr0cac63"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -288567,34 +289318,6 @@ self: { }) {}; "sydtest" = callPackage - ({ mkDerivation, 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, svg-builder, sydtest-discover - , text, vector - }: - mkDerivation { - pname = "sydtest"; - version = "0.15.1.0"; - sha256 = "0rviw43ks6rnl1m7wf8ffd70cnizz53svnsz2f9k69787xyqn6zb"; - libraryHaskellDepends = [ - 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 svg-builder text - vector - ]; - testHaskellDepends = [ - base bytestring path path-io QuickCheck random safe-coloured-text - stm text vector - ]; - testToolDepends = [ sydtest-discover ]; - description = "A modern testing framework for Haskell with good defaults and advanced testing features"; - license = "unknown"; - }) {}; - - "sydtest_0_15_1_1" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base , bytestring, containers, dlist, envparse, fast-myers-diff , filepath, MonadRandom, mtl, optparse-applicative, path, path-io @@ -288620,7 +289343,6 @@ self: { testToolDepends = [ sydtest-discover ]; description = "A modern testing framework for Haskell with good defaults and advanced testing features"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "sydtest-aeson" = callPackage @@ -288681,25 +289403,6 @@ self: { }) {}; "sydtest-discover" = callPackage - ({ mkDerivation, base, filepath, optparse-applicative, path - , path-io - }: - mkDerivation { - pname = "sydtest-discover"; - version = "0.0.0.3"; - sha256 = "1q0lblsi9shad3kn4vlampfxjl4kq6h04lpf5a2xwwjjbhl40ns2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath optparse-applicative path path-io - ]; - executableHaskellDepends = [ base ]; - description = "Automatic test suite discovery for sydtest"; - license = "unknown"; - mainProgram = "sydtest-discover"; - }) {}; - - "sydtest-discover_0_0_0_4" = callPackage ({ mkDerivation, base, filepath, optparse-applicative, path , path-io }: @@ -288715,7 +289418,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatic test suite discovery for sydtest"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "sydtest-discover"; }) {}; @@ -288761,8 +289463,8 @@ self: { }: mkDerivation { pname = "sydtest-hspec"; - version = "0.4.0.0"; - sha256 = "0li8h3mh2s4ga8cpb0phaqyx6q1lw2w58b6yhs3s16a8cqh58k7x"; + version = "0.4.0.1"; + sha256 = "1bw33c71ra3m1wslmmclqkwnac9vbi871qigir5y4fr1p2arjgrn"; libraryHaskellDepends = [ base hspec-core mtl QuickCheck stm sydtest ]; @@ -288801,8 +289503,8 @@ self: { }: mkDerivation { pname = "sydtest-persistent"; - version = "0.0.0.1"; - sha256 = "19shysqqn4dz33lgmlshnk1aksp8f9rnxmzzag2hmbrywbrjwr1q"; + version = "0.0.0.2"; + sha256 = "09pjw6gd3vhny0irhpi93zy7snklrh2fjalsj8xszjb8j6md7d5p"; libraryHaskellDepends = [ base bytestring mtl persistent sydtest text unliftio ]; @@ -288817,15 +289519,13 @@ self: { }: mkDerivation { pname = "sydtest-persistent-postgresql"; - version = "0.2.0.2"; - sha256 = "1lrps2avkhshipip85gv8v151j3gkwxg6lfbii0085s077f8in1m"; + version = "0.2.0.3"; + sha256 = "1srzasbr9f5gqfzsa4qjd65pk3jlpk0gslphynzzbp4kf6gmsvkj"; libraryHaskellDepends = [ - base monad-logger mtl persistent persistent-postgresql sydtest + base monad-logger mtl persistent-postgresql sydtest sydtest-persistent tmp-postgres ]; - testHaskellDepends = [ - base persistent persistent-postgresql sydtest - ]; + testHaskellDepends = [ base persistent sydtest ]; testToolDepends = [ sydtest-discover ]; description = "An persistent-postgresql companion library for sydtest"; license = "unknown"; @@ -288839,13 +289539,13 @@ self: { }: mkDerivation { pname = "sydtest-persistent-sqlite"; - version = "0.2.0.2"; - sha256 = "17sb4q2lrdbi4d5h7gj5lwxszla5dbzs25ira2ddlgghs68bar3g"; + version = "0.2.0.3"; + sha256 = "1wc4sgfjljwvcb90d3a4ys5m88fd68mbzyl6f2jfjx55yn55rnyw"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-sqlite sydtest sydtest-persistent ]; - testHaskellDepends = [ base persistent persistent-sqlite sydtest ]; + testHaskellDepends = [ base persistent sydtest ]; testToolDepends = [ sydtest-discover ]; description = "A persistent-sqlite companion library for sydtest"; license = "unknown"; @@ -288925,20 +289625,18 @@ self: { "sydtest-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, http-client - , http-types, mtl, network, pretty-show, stm, sydtest - , sydtest-discover, text, time, wai, warp + , http-types, mtl, network, sydtest, sydtest-discover, text, time + , wai, warp }: mkDerivation { pname = "sydtest-wai"; - version = "0.2.0.0"; - sha256 = "1zyhgwi8vhjg7mahp98fjgvkhqvh6zwfw3pmhwk57raavzsg2ksb"; + version = "0.2.0.1"; + sha256 = "0fmgn8g9ka275qkanzrlqr4wqwjcq2a99yvkh4jz53vspyiml78q"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-types mtl network - pretty-show sydtest text time wai warp - ]; - testHaskellDepends = [ - base http-client http-types stm sydtest wai + sydtest text time wai warp ]; + testHaskellDepends = [ base http-client http-types sydtest wai ]; testToolDepends = [ sydtest-discover ]; description = "A wai companion library for sydtest"; license = "unknown"; @@ -288976,8 +289674,8 @@ self: { }: mkDerivation { pname = "sydtest-webdriver-screenshot"; - version = "0.0.0.1"; - sha256 = "0wh481za6x9bq4axazq6zpm0cgi98hsh4xiy02c90fxybzdk4mg9"; + version = "0.0.0.2"; + sha256 = "18qg09cagga87bs2yahb2cv78agg90548w8a6p27nxhyq9jzamd7"; libraryHaskellDepends = [ base bytestring JuicyPixels mtl path path-io sydtest sydtest-webdriver webdriver @@ -289026,8 +289724,8 @@ self: { }: mkDerivation { pname = "sydtest-yesod"; - version = "0.3.0.1"; - sha256 = "1sfq18n25qczhp24hz95spg4ppigajysg0if5ah0k96k1q3p3f51"; + version = "0.3.0.2"; + sha256 = "194qdvsfphc8paq9ap5fijphrin20zpr4g5nza8dpv7qkpb82znr"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers cookie exceptions http-client http-client-tls http-types mtl network @@ -289035,8 +289733,8 @@ self: { yesod-test ]; testHaskellDepends = [ - base bytestring conduit cookie http-client http-types monad-logger - mtl path path-io persistent persistent-sqlite QuickCheck sydtest + base bytestring conduit cookie http-client monad-logger mtl path + path-io persistent persistent-sqlite QuickCheck sydtest sydtest-persistent-sqlite sydtest-wai text yesod yesod-core ]; testToolDepends = [ sydtest-discover ]; @@ -289962,8 +290660,8 @@ self: { pname = "synthesizer-core"; version = "0.8.3"; sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn"; - revision = "3"; - editedCabalFile = "0fgrj8a1cgnhcbdyhj478plaj68mrakk945cbpc9brxzcs835x0y"; + revision = "4"; + editedCabalFile = "0xacplyxilmrly1nxdiz42divjiky7lz5aq5lizn7ax2n0jy1sdg"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -290054,8 +290752,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "1.1"; - sha256 = "118z30dj8w9fbfv5q6i9yfm1d0zhmykavpdcn3sb60z8fpmx7vl1"; + version = "1.1.0.1"; + sha256 = "166551a0g4m48f0mxccwcrgg488i4v8jpj6rjhd39mh6gxb874yr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290086,6 +290784,8 @@ self: { pname = "synthesizer-midi"; version = "0.6.1.2"; sha256 = "1xnpvk0mny8lbx17zdgl55wp86pqhfg9ckv41b3qd5vrki2dj6nc"; + revision = "1"; + editedCabalFile = "061dgdfrv1zrjpih29x50kpl57ghb3ys6wpra5ai9k0wxdpr9zqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -291440,6 +292140,8 @@ self: { pname = "tahoe-directory"; version = "0.1.0.0"; sha256 = "1659q860y776bx39nw3x7afqdazs5b31b5p9asc3g7al697xl6li"; + revision = "1"; + editedCabalFile = "0f7djrfakakc8390qsy9n2c5lwwppjivvia5f0p96nw2279mkyd9"; libraryHaskellDepends = [ base bytestring megaparsec tahoe-capabilities tahoe-chk tahoe-ssk text @@ -291454,44 +292156,51 @@ self: { }) {}; "tahoe-great-black-swamp" = callPackage - ({ mkDerivation, aeson, async, base, base32, base32string - , base64-bytestring, binary, bytestring, cborg, cborg-json - , connection, containers, deriving-aeson, directory, filepath - , foldl, hspec, hspec-expectations, hspec-wai, http-api-data - , http-client, http-client-tls, http-media, http-types, megaparsec - , network-uri, optparse-applicative, primitive, QuickCheck - , quickcheck-instances, safe-exceptions, scientific, serialise - , servant, servant-client, servant-docs, servant-js, servant-server - , tahoe-chk, temporary, text, unordered-containers, utf8-string - , vector, wai, wai-extra, warp, warp-tls + ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base + , base32, base32string, base64, base64-bytestring, binary + , bytestring, cborg, cborg-json, connection, containers, cryptonite + , data-default-class, deriving-aeson, directory, filepath, foldl + , hspec, hspec-expectations, hspec-wai, http-api-data, http-client + , http-client-tls, http-media, http-types, http2, lens, megaparsec + , memory, network, network-simple-tls, network-uri + , optparse-applicative, primitive, QuickCheck, quickcheck-instances + , safe-exceptions, scientific, serialise, servant, servant-client + , servant-docs, servant-js, servant-server, tahoe-chk, temporary + , text, tls, unordered-containers, utf8-string, vector, wai + , wai-extra, warp, warp-tls, x509, x509-store, x509-validation + , yaml }: mkDerivation { pname = "tahoe-great-black-swamp"; - version = "0.3.0.1"; - sha256 = "16n8jv5pb0z8x3dczpcqq29lmn24irinh81p9m75qad88i8p3r57"; + version = "0.3.1.0"; + sha256 = "1317sa6jq4vb5nxd4n6i9h799p3i0ghxl866sfkrppay9pncblzq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base base64-bytestring binary bytestring cborg - cborg-json containers deriving-aeson directory filepath foldl - http-api-data http-media http-types primitive safe-exceptions + aeson asn1-encoding asn1-types async base base64 base64-bytestring + binary bytestring cborg cborg-json connection containers cryptonite + data-default-class deriving-aeson directory filepath foldl + http-api-data http-client http-client-tls http-media http-types + http2 memory network network-uri primitive safe-exceptions scientific serialise servant-client servant-docs servant-server - text unordered-containers utf8-string vector wai warp warp-tls + text tls unordered-containers utf8-string vector wai warp warp-tls + x509 x509-store x509-validation ]; executableHaskellDepends = [ - aeson async base base32 base64-bytestring binary bytestring cborg - connection containers deriving-aeson directory filepath foldl - http-client http-client-tls http-types megaparsec network-uri - optparse-applicative primitive safe-exceptions serialise servant - servant-client servant-js tahoe-chk text unordered-containers - vector warp + aeson async base base32 binary bytestring cborg connection + containers deriving-aeson directory filepath foldl http-client + http-client-tls http-types lens megaparsec optparse-applicative + primitive safe-exceptions serialise servant servant-client + servant-js tahoe-chk text unordered-containers vector warp ]; testHaskellDepends = [ - aeson async base base32string binary bytestring cborg containers - deriving-aeson directory filepath foldl hspec hspec-expectations - hspec-wai http-types primitive QuickCheck quickcheck-instances - safe-exceptions serialise servant temporary text - unordered-containers vector wai-extra + aeson async base base32string base64 binary bytestring cborg + connection containers data-default-class deriving-aeson directory + filepath foldl hspec hspec-expectations hspec-wai http-client + http-types network network-simple-tls primitive QuickCheck + quickcheck-instances safe-exceptions serialise servant + servant-client temporary text tls unordered-containers vector + wai-extra warp warp-tls x509 x509-store yaml ]; description = "An implementation of the \"Great Black Swamp\" LAFS protocol"; license = lib.licenses.bsd3; @@ -291506,8 +292215,8 @@ self: { }: mkDerivation { pname = "tahoe-ssk"; - version = "0.2.1.0"; - sha256 = "1qkzkdqqyjh2qzkl03f3wg4xlpmb8n1hq95bmdqwx1212aap3qxx"; + version = "0.3.0.0"; + sha256 = "0ham4qgdva5md76mv4gy5gfaw55h9a509967r7cxbaxlz1f1gdj3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -292604,8 +293313,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "1"; - editedCabalFile = "1mwg576azkwzv13rk72cnbag4823hwpr8zgcfcrvx8wx5ha2r55p"; + revision = "2"; + editedCabalFile = "0im9603m995svkb3bvdrr7w1k2xz34hlw3dyam1123264ff1ka7x"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -292698,8 +293407,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.4"; sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; - revision = "1"; - editedCabalFile = "1wlaxalc750k1g5iqvkrwi2mfcblr9pk0jfc2qbkhhldajcl2wir"; + revision = "2"; + editedCabalFile = "17q4xwj2glc8d482r33kq472yhkx7nai987x80nw3ilmp942bxzd"; libraryHaskellDepends = [ base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -293064,8 +293773,8 @@ self: { pname = "tasty-rerun"; version = "1.1.19"; sha256 = "0dbj5jyms4rkb241dw2vgkzk442zga58zhg8mmw0ksi4yw0z8gbg"; - revision = "1"; - editedCabalFile = "1qi6rwnyrddk58b5mh9a2zh3af39kdl71f65ajlvbsh6y1n7fbkr"; + revision = "2"; + editedCabalFile = "01gliss91bx2xfpz4f99g82sqahir5g2rnwn531ccn8jp1m917di"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -293084,6 +293793,8 @@ self: { pname = "tasty-silver"; version = "3.3.1.2"; sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; + revision = "1"; + editedCabalFile = "1dzw6hvfxrbnfjb9b5ca6adbg3qbdh1rsbji4b3jm0hhgi40gkxr"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -293097,6 +293808,30 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-silver_3_3_1_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, silently, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.3.1.3"; + sha256 = "1gg4jkcgc3xiw43bw09shylxgd1rkrynyap17zh0yfzd9jrk3i4v"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + silently stm tagged tasty temporary text transformers + ]; + testHaskellDepends = [ + base directory filepath process silently tasty tasty-hunit + temporary transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, base, optparse-applicative, smallcheck, tagged , tasty @@ -293229,8 +293964,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.4"; - sha256 = "08a9zzzwq87p0bnb0x18xgqag2lfni9x6x74i8yrbb0b5pj22ixy"; + version = "0.1.0.5"; + sha256 = "12v1avr74zsaq2dnssbip7pc6qalh8w7ilqb5z8azplg6h83vh93"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -293261,8 +293996,8 @@ self: { pname = "tasty-wai"; version = "0.1.2.0"; sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg"; - revision = "1"; - editedCabalFile = "14pz0mvpy2vwdhapn68pmwrpq7pvky87mkph44bc6vcbqy1jnk5c"; + revision = "2"; + editedCabalFile = "140kajnwrk614hswxyjymgpzy61m6riv5s25p4zkgv8aa1yhbk06"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -294142,12 +294877,12 @@ self: { broken = true; }) {}; - "template-haskell_2_20_0_0" = callPackage + "template-haskell_2_21_0_0" = callPackage ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.20.0.0"; - sha256 = "05r8176xx3bivb473zdvsgndss8lna1g9xy55agkh4cir84mvgp4"; + version = "2.21.0.0"; + sha256 = "0p8f53dscddr513r8p3ljwyc1pa7n520prxb47bz8dj5mvjxm89d"; libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; license = lib.licenses.bsd3; @@ -294165,6 +294900,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_9_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.9.3"; + sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Backward-compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell , th-abstraction @@ -294919,6 +295666,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox_1_1_0_2" = callPackage + ({ mkDerivation, base, termbox-bindings-hs }: + mkDerivation { + pname = "termbox"; + version = "1.1.0.2"; + sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; + libraryHaskellDepends = [ base termbox-bindings-hs ]; + description = "termbox"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-banana" = callPackage ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { @@ -294956,8 +295715,8 @@ self: { pname = "termbox-bindings-c"; version = "0.1.0"; sha256 = "1q7frripz88zgcfmx2lab2vrj19gywnskng07zf7icsj9j6bdwyw"; - revision = "1"; - editedCabalFile = "08qnbv5p0lys69qv0dcq896p47kvj770y4hvpqa7ywfm124fwcs3"; + revision = "2"; + editedCabalFile = "04hnf96p6n9fxczk2hbp53kl3gm06f8zx469nvzl48qjvcxhxc2i"; libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -294969,8 +295728,8 @@ self: { pname = "termbox-bindings-hs"; version = "0.1.0"; sha256 = "07m6lp997skqp04a430ynsrzdpwcczblxawvlcbizffsznkmnl64"; - revision = "1"; - editedCabalFile = "19n2flldk0v6db6fipc4j2an0kyk3rw4229fmqd94kswy898cv6d"; + revision = "2"; + editedCabalFile = "0bpz5drzp1gfncbpsc9jjz6qyvjjn4c9w16ci79nj60zi7b5q9b5"; libraryHaskellDepends = [ base termbox-bindings-c ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -294991,6 +295750,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-tea_0_1_0_1" = callPackage + ({ mkDerivation, base, ki, termbox }: + mkDerivation { + pname = "termbox-tea"; + version = "0.1.0.1"; + sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ki termbox ]; + description = "termbox + The Elm Architecture"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termcolor" = callPackage ({ mkDerivation, base, cli }: mkDerivation { @@ -296195,12 +296968,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-ansi_0_3_0" = callPackage + "text-ansi_0_3_0_1" = callPackage ({ mkDerivation, base, text, text-builder-linear }: mkDerivation { pname = "text-ansi"; - version = "0.3.0"; - sha256 = "0l2539rjhpmiw2is2wcqydql4j5wqmqccg8qdq172fc09fp87crm"; + version = "0.3.0.1"; + sha256 = "0iiq5zlcjh25mf9b4vlhyc1dwglwh8b03qj1wasbngzvmphvcy00"; libraryHaskellDepends = [ base text text-builder-linear ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; @@ -296256,6 +297029,24 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_7_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder-dev + }: + mkDerivation { + pname = "text-builder"; + version = "0.6.7.1"; + sha256 = "1x2k1mwwwjbyc56c9dm454k24imwq17dym5pfbj33iqn9i4n7ki3"; + libraryHaskellDepends = [ base bytestring text text-builder-dev ]; + testHaskellDepends = [ + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Efficient strict text builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-dev" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , isomorphism-class, QuickCheck, quickcheck-instances, rerebase @@ -296278,6 +297069,30 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_4_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, criterion + , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes + , quickcheck-instances, rerebase, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.4.1"; + sha256 = "095kqq7wwnabfyj6380xy94a0v0d76mkwspdw8lj2m4ykq23agw1"; + libraryHaskellDepends = [ + base bytestring deferred-folds isomorphism-class QuickCheck + quickcheck-instances split text time transformers + ]; + testHaskellDepends = [ + base-compat quickcheck-classes quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-linear" = callPackage ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench , tasty-quickcheck, text @@ -296471,8 +297286,8 @@ self: { }: mkDerivation { pname = "text-icu"; - version = "0.8.0.3"; - sha256 = "0mv8pxrc65yrrh2mxksxribd7ihnn0rx2il5kxfxm5zn4fa2nvqc"; + version = "0.8.0.4"; + sha256 = "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; libraryPkgconfigDepends = [ icu ]; @@ -296540,6 +297355,8 @@ self: { pname = "text-iso8601"; version = "0.1"; sha256 = "1kszvadfl2ihmyd1chd6am6qkdvd9zwa5q1954yz3waiz537m3pm"; + revision = "1"; + editedCabalFile = "0xlz7g29bihgn22h1p2rdlvgggi6g1zdsag01lydnld71i8g51mc"; libraryHaskellDepends = [ base integer-conversion text time time-compat ]; @@ -296966,32 +297783,32 @@ self: { "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, uuid-types, vector, xhtml + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , old-locale, old-time, pretty, QuickCheck, quickcheck-instances + , random, scientific, semigroups, tagged, template-haskell + , terminfo, text, text-short, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , uuid-types, vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.9.6"; - sha256 = "1xmifjcx52jpa3qlmd5v11x429kn5qm64k2a7ai1lwpmy3mvpa90"; - revision = "1"; - editedCabalFile = "1bxyiy1x83mc3zmim27plcp4x9i6sg1xgl33q1zgfdd8n1m8jpv5"; + version = "3.9.7"; + sha256 = "1rxsg0i304wanzgd792nj7pgkmw3iq0n7pwsg27h55vi7kp2rmiw"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers unix unordered-containers - uuid-types vector xhtml + ghc-boot-th haskeline hpc nonempty-vector old-locale old-time + pretty random scientific semigroups tagged template-haskell + terminfo text text-short text-show time transformers unix + unordered-containers uuid-types vector xhtml ]; testHaskellDepends = [ aeson base base-compat bifunctors binary containers directory generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml + nonempty-vector old-locale old-time pretty QuickCheck + quickcheck-instances random scientific tagged template-haskell + terminfo text-short text-show th-orphans time transformers + transformers-compat unix unordered-containers uuid-types vector + xhtml ]; testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; @@ -297555,24 +298372,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_15" = callPackage + "th-desugar_1_16" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction , th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.15"; - sha256 = "167ybxp9233xlihmj28hmqmd82liyhjgl17310nn9bximgfjr7hp"; - revision = "1"; - editedCabalFile = "1mpig192p595d3961w1x35w50h8i6c9zp0h4d44mnjy2wd7hb99j"; + version = "1.16"; + sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-orphans transformers-compat ]; testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-abstraction - th-orphans + base containers ghc-prim hspec HUnit mtl syb template-haskell + th-abstraction th-orphans ]; description = "Functions to desugar Template Haskell"; license = lib.licenses.bsd3; @@ -298002,8 +298817,8 @@ self: { pname = "th-test-utils"; version = "1.2.1"; sha256 = "1vk5fj66w7smq4yc614ixh7s78n3djggpzcxmakyxfz01vz20gay"; - revision = "2"; - editedCabalFile = "0sjxy0v6g567n0vs8myi3vx0hbhhmd8k3jgjwsmp7zrvhzbfyw91"; + revision = "3"; + editedCabalFile = "1lacygmbb36ka1bd4kmi6mfjicpdzagf73433kjvqrk1316bayc0"; libraryHaskellDepends = [ base template-haskell th-orphans transformers ]; @@ -298153,6 +298968,22 @@ self: { license = lib.licenses.mit; }) {}; + "theatre-dev" = callPackage + ({ mkDerivation, async, base, contravariant, hspec, rerebase, stm + , unagi-chan, vector + }: + mkDerivation { + pname = "theatre-dev"; + version = "0.0.1"; + sha256 = "0mvgbp5ba23gcjykki8x7wsdmdzqknm82rshf10rk9rc120jg5f6"; + libraryHaskellDepends = [ + async base contravariant stm unagi-chan vector + ]; + testHaskellDepends = [ hspec rerebase ]; + description = "Minimalistic actor library experiments"; + license = lib.licenses.mit; + }) {}; + "themoviedb" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls , http-types, mtl, relude, tasty, tasty-hunit, text, time @@ -298282,6 +299113,8 @@ self: { pname = "these-lens"; version = "1.0.1.3"; sha256 = "1pka56z7nrwapiqihp1d7jcindv9m6njy693561q4km2m3rhs5dq"; + revision = "1"; + editedCabalFile = "0gchaa8b7gynryhm9ddkblbs3mivy6aqlj0digwv271c0qzx9bjg"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; @@ -298918,6 +299751,8 @@ self: { pname = "thyme"; version = "0.4"; sha256 = "098kqmirzcllfpfsxivc42dsvvlih89xfzkmif8gjzcqiw6agx41"; + revision = "1"; + editedCabalFile = "0y7xc8q2n8lbfi0q4isj29w5qdy3bjlb8yywdyajjp9k1kp23vnr"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers deepseq hashable mtl old-locale profunctors QuickCheck random template-haskell text time @@ -299092,6 +299927,8 @@ self: { pname = "tidal"; version = "1.9.4"; sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; + revision = "2"; + editedCabalFile = "12v805xy9nqfyn9ryqxlslqiffb6havpixi23xkmk0annbxcf8k2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -300029,6 +300866,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "timer-wheel_1_0_0" = callPackage + ({ mkDerivation, atomic-primops, base, ki, primitive, random + , tasty-bench + }: + mkDerivation { + pname = "timer-wheel"; + version = "1.0.0"; + sha256 = "1fl2incjl0zsrhk6kzhv1g9wzmsvyambak4z75fw3b5s306hw763"; + libraryHaskellDepends = [ atomic-primops base ki primitive ]; + testHaskellDepends = [ base ki random ]; + benchmarkHaskellDepends = [ base ki random tasty-bench ]; + description = "A timer wheel"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -302608,8 +303461,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.7.1"; - sha256 = "0l48j4f4skzgag07qjcgsckv2xiygf8pghqjn72ah7c0yr9ghx4z"; + version = "2.7.2"; + sha256 = "046pyd7mwhw5csisqvr38z6ipz2fyvajqfxbjl96anwi9g2pxlr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303740,8 +304593,8 @@ self: { pname = "tree-diff"; version = "0.3.0.1"; sha256 = "1bkjsklsqxq8i8p3zx73pck4ca1kv21zjvn9xhbhz191gygprrj0"; - revision = "3"; - editedCabalFile = "1skq2bqfsj1f4hqy5cwm8k0a8bgqbdqspcxccismbgxxqqg60d22"; + revision = "4"; + editedCabalFile = "1m13fy6igixsjg02nx2hhlxmhy2isvx28b1wzmllsdd99lmdasy5"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers deepseq hashable parsec parsers @@ -304912,6 +305765,8 @@ self: { pname = "ttc"; version = "1.3.0.0"; sha256 = "16px3ws0bzkzpf1hy7il40p7shv8w093fjim0rc1c45y40jp7p09"; + revision = "1"; + editedCabalFile = "1mqxayy3nh39lnmsdr7hsz6xlan95m05s49l0349s4724syflscz"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -305278,8 +306133,8 @@ self: { pname = "tuples"; version = "0.1.0.0"; sha256 = "0kq12l0q7d9mdkmcp2sm7pjgfh00vqkhi0id32sny1lqcnavp415"; - revision = "1"; - editedCabalFile = "06ns2npjh487pbzq6f5iwqvl0n9a6d5fywlm032nj3mxdmaynj2j"; + revision = "2"; + editedCabalFile = "08d8f4svxfn6165438dvd4zh61wldrl7gsly8ip6x5svyvj3ygqb"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes tasty tasty-quickcheck @@ -305426,6 +306281,33 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "turtle_1_6_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, directory, doctest, exceptions, filepath, foldl + , hostname, managed, optional-args, optparse-applicative, process + , stm, streaming-commons, tasty, tasty-bench, tasty-hunit + , temporary, text, time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.6.2"; + sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions filepath foldl hostname managed optional-args + optparse-applicative process stm streaming-commons temporary text + time transformers unix unix-compat + ]; + testHaskellDepends = [ + base doctest filepath tasty tasty-hunit temporary + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Shell programming, Haskell-style"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -306397,8 +307279,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "5"; - editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m"; + revision = "6"; + editedCabalFile = "1992xb0qnn7jzc42q9dmkkqw0ddnz0cjl4anmga4dfc172pkxxgb"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = lib.licenses.bsd3; @@ -307150,8 +308032,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.5.2.2"; - sha256 = "17h6ig2phgdr5gq7pdswn50yjdqz7ci1nh4grwpz8m0qykkqj4v4"; + version = "0.5.2.3"; + sha256 = "0043a2nw5413ipixxf77k1c58h9ndrjh79v8cq46jw900qk4268z"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -307187,12 +308069,13 @@ self: { "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core + , hspec-discover, process, stm, temporary, transformers + , unliftio-core }: mkDerivation { pname = "typed-process"; - version = "0.2.11.0"; - sha256 = "09gnj7m3jcl145fhslwzd30kwwc6hvdmqa4yr4smzn3m0ra5k34l"; + version = "0.2.11.1"; + sha256 = "0j21v5ijnxkpwn9hng6achjypr1hnpfxkmjfvqssq6ynj6hdvifm"; libraryHaskellDepends = [ async base bytestring process stm transformers unliftio-core ]; @@ -307200,6 +308083,7 @@ self: { async base base64-bytestring bytestring hspec process stm temporary transformers unliftio-core ]; + testToolDepends = [ hspec-discover ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; }) {}; @@ -307210,15 +308094,15 @@ self: { }: mkDerivation { pname = "typed-process-effectful"; - version = "1.0.0.0"; - sha256 = "08rp0nycr0yp9zplxjdgslg4z8imvdprv10zwn4085n02y7z2bd9"; + version = "1.0.0.1"; + sha256 = "1n3ba3jf48hc3w5y20k987aahz9pdzrqm54w0572x30ng3j8jic4"; libraryHaskellDepends = [ base bytestring effectful effectful-core typed-process ]; testHaskellDepends = [ base effectful effectful-core tasty tasty-hunit ]; - description = "A binding of the @typed-process@ library for the @effectful@ effect system"; + description = "A binding of the typed-process library for the effectful effect system"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -307828,8 +308712,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "4"; - editedCabalFile = "1yfriqm5xfmynx6vszs72h2kic69zx1xp5fl51dys28s0yna9alf"; + revision = "5"; + editedCabalFile = "0r1wbf0c0fpns8vyr2xrrkkclzjcy212zb9ldsrcxx7jyz5nr0jj"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -308430,6 +309314,26 @@ self: { mainProgram = "ulid-exe"; }) {}; + "ulid-tight" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable, hspec + , hspec-discover, primitive, random, template-haskell, text, time + }: + mkDerivation { + pname = "ulid-tight"; + version = "0.1"; + sha256 = "0gbf3xlzms9f3y1bbxmlgaccr1qwh3vypxzx4y0bd5z22d4l7g8h"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable primitive random + template-haskell text time + ]; + testHaskellDepends = [ + base binary hashable hspec primitive random text + ]; + testToolDepends = [ hspec-discover ]; + description = "Another ULID implementation with tight memory representation"; + license = lib.licenses.mit; + }) {}; + "una" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , io-storage, process @@ -310231,6 +311135,8 @@ self: { pname = "universe-base"; version = "1.1.3.1"; sha256 = "0bbkwmvpnfwvgwxvj0j591l984icrpq2js974nm8ribrblqfzrx3"; + revision = "1"; + editedCabalFile = "12mjh2hsqghayxybpvzka7chxds2h342w584n8g7hmld3y7qmjg4"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; @@ -310243,8 +311149,8 @@ self: { pname = "universe-dependent-sum"; version = "1.3"; sha256 = "0fwqx4fzs9s09fwrf715simqb0vxnx3z7q35zbv9mkj1m6nbrsk5"; - revision = "3"; - editedCabalFile = "0v4n1z9zrsxfbr4nc44qq446wzkg5wk490np7vaq8780ygdz50gy"; + revision = "4"; + editedCabalFile = "0jd55qf6is8gi06r1q0a5vg0vgvr994vc7ybd0kfcsp2ybpk8zvg"; libraryHaskellDepends = [ base universe-some ]; description = "Universe instances for types from dependent-sum"; license = lib.licenses.bsd3; @@ -310274,8 +311180,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.3"; sha256 = "02fxra5g76dk2jpbvmj0mj5bylj4400fcp3np3s5d31qgsjh2sn6"; - revision = "2"; - editedCabalFile = "175fxp19cf6m6scy6nxh5kbc6cnv9sqa0i00ly6swjsy5vy986am"; + revision = "3"; + editedCabalFile = "02zv257ga1n4qzb2r97fpzblm28db04ws3d02fy1nlry9hcwk554"; libraryHaskellDepends = [ adjunctions base comonad containers universe-base ]; @@ -310304,8 +311210,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1.1"; sha256 = "0wzvrnccj9hq1x55vy7a8xzppgf0zmbnlm3yz02qx3dglq97w4n4"; - revision = "3"; - editedCabalFile = "1skyr1b7jvlbphlnf373qx78qd41cz643cn7ssyncwbv30ndbs23"; + revision = "4"; + editedCabalFile = "0s6779rs0p0wrarn749rasifiij8x8mihbg8m6cgazs1cxpfykjd"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = lib.licenses.bsd3; @@ -310319,8 +311225,8 @@ self: { pname = "universe-some"; version = "1.2.1"; sha256 = "0pdvk5qi39d0wg8ac936c1fxs7v7qld2ggpqc9v7xc4pk3xq24bp"; - revision = "5"; - editedCabalFile = "0d0xsfjhb9vaama4l4qq41l02y2lv0ri917rzmxskp6zw0dvwa57"; + revision = "6"; + editedCabalFile = "04vj4sp5kk90ncln7mmm52pbwbvx8zpkxfvzzxk1jbf20bc7x83n"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -310381,14 +311287,14 @@ self: { license = lib.licenses.mit; }) {}; - "unix_2_8_2_1" = callPackage + "unix_2_8_3_0" = callPackage ({ mkDerivation, base, bytestring, filepath, tasty, tasty-hunit , tasty-quickcheck, time }: mkDerivation { pname = "unix"; - version = "2.8.2.1"; - sha256 = "0hzffcmz5ga9lcpfw5gh6h5902bpwrh3kjjhm3jha08085a1apmx"; + version = "2.8.3.0"; + sha256 = "1asxibqs77gmgvqxigsf1mch3m4qgznfm1fpqhw0xh9fsil7ip59"; libraryHaskellDepends = [ base bytestring filepath time ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit tasty-quickcheck @@ -310620,22 +311526,43 @@ self: { mainProgram = "unlambda"; }) {}; + "unleash-client-haskell" = callPackage + ({ mkDerivation, aeson, base, containers, http-client-tls + , http-media, mtl, servant, servant-client, text, time + , unleash-client-haskell-core, unliftio + }: + mkDerivation { + pname = "unleash-client-haskell"; + version = "0.6.0"; + sha256 = "1vl31yvcqrsq1j56hqi34qf280ibhv9rk9sfddkiw43qi58gs0v4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers http-client-tls http-media mtl servant + servant-client text time unleash-client-haskell-core + ]; + executableHaskellDepends = [ + base mtl servant-client text unleash-client-haskell-core unliftio + ]; + description = "Unleash feature toggle client"; + license = lib.licenses.mit; + mainProgram = "example"; + }) {}; + "unleash-client-haskell-core" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, hspec, murmur3, random, record-dot-preprocessor - , record-hasfield, text, text-show, time, versions + , containers, hspec, murmur3, random, text, text-show, time + , versions }: mkDerivation { pname = "unleash-client-haskell-core"; - version = "0.8.9"; - sha256 = "0jq1dyzr882jfdykys6kkr2gkxv5gp7xyqdm1p69zlzsi6rrzq40"; + version = "0.10.0"; + sha256 = "0biki24hxvnvzd3zrvlb5f30nwlzzshm0sbajd2q55wpx98008fc"; libraryHaskellDepends = [ - aeson base containers murmur3 random record-dot-preprocessor - record-hasfield text text-show time versions + aeson base containers murmur3 random text text-show time versions ]; testHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring hspec - record-dot-preprocessor record-hasfield text + aeson aeson-pretty attoparsec base bytestring hspec text ]; description = "Unleash feature toggle client core"; license = lib.licenses.mit; @@ -310867,8 +311794,8 @@ self: { pname = "unordered-containers"; version = "0.2.19.1"; sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; - revision = "2"; - editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s"; + revision = "3"; + editedCabalFile = "1p9a2mvfbfz2d4cyr16b03bxvb6c4yj7k1ch601xwq1rkr1cla0w"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -311611,8 +312538,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; - revision = "2"; - editedCabalFile = "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj"; + revision = "3"; + editedCabalFile = "007c8lv0x2p75f7m57c2hvp82i1c7jblwszbxaghba1xwi7jwhqv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312770,29 +313697,6 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder - , hashable, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text - }: - mkDerivation { - pname = "uuid-types"; - version = "1.0.5"; - sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; - revision = "4"; - editedCabalFile = "08anv4hc75n1npjl4b8hrww97imgh6bsm1mfqn33n29ga84jcrp4"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable random template-haskell - text - ]; - testHaskellDepends = [ - base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit - tasty-quickcheck template-haskell - ]; - description = "Type definitions for Universally Unique Identifiers"; - license = lib.licenses.bsd3; - }) {}; - - "uuid-types_1_0_5_1" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, hashable , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text @@ -312811,7 +313715,6 @@ self: { ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uulib" = callPackage @@ -313292,8 +314195,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.12.0.1"; - sha256 = "1j9yswqas9dpb9mv132myfn1rky5vbh5gdvcxbb7p93k5c2y4g0w"; + version = "0.12.0.2"; + sha256 = "1a916c8pwxc89p4zib07hnfiwqvv16k9v1lqggpvc6xbglcqidi9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -313726,8 +314629,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "3"; - editedCabalFile = "0avlxhj4m8sb1b9rh203jsaapw6q55bpgy4jnhjyq6an8dhnsg9i"; + revision = "4"; + editedCabalFile = "0nmy4c95kss381n38by7li9x1ffgxz1bvyw0dh52xklbi7v144bh"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -314113,10 +315016,8 @@ self: { }: mkDerivation { pname = "vector"; - version = "0.13.0.0"; - sha256 = "0ksvs6ldb8bzbjy4gk39wds2lrwill2g7pbr13h54bz12myidly5"; - revision = "5"; - editedCabalFile = "0j239l4jjjyxaly65fpyg8458k8srgnsy5kn8710c7hmqwl222qx"; + version = "0.13.1.0"; + sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -314136,8 +315037,8 @@ self: { pname = "vector-algorithms"; version = "0.9.0.1"; sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "2"; - editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk"; + revision = "3"; + editedCabalFile = "1fixldpkbw3yqj27vh5c8wb6vw8djdjprfjgs1rkvqdrq2j02ar2"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -314559,8 +315460,8 @@ self: { pname = "vector-sized"; version = "1.5.0"; sha256 = "13h4qck1697iswd9f8w17fpjc6yhl2pgrvay7pb22j2h3mgaxpjl"; - revision = "2"; - editedCabalFile = "1xck60sdci3vw39jp6qpbljhv06v43ih8bvxh6p40bwb6mxzn2wh"; + revision = "3"; + editedCabalFile = "1rj53ya87vnglqdnzfvb4w01k3g3wqkcc1i7ip2xryz6pw6vg18w"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector @@ -314704,8 +315605,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "4"; - editedCabalFile = "08pvbwy6cb2hb15wczqp9056rxj86f2kc972py4sj5adkmf9mzrj"; + revision = "5"; + editedCabalFile = "1mw2ssj6a772cvw2mf0r5qvz4blaq8k194p6bj0wnl1plr16r90b"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -315055,17 +315956,18 @@ self: { "versions" = callPackage ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , parser-combinators, tasty, tasty-hunit, text + , parser-combinators, tasty, tasty-hunit, template-haskell, text }: mkDerivation { pname = "versions"; - version = "6.0.1"; - sha256 = "1znrvdq2f1014pq0x16y264km4wbdy634xis2w5rhrdnp8l46ldy"; + version = "6.0.2"; + sha256 = "06wi1ir0h7jzcjgd1fq17ggjqh8zb3i3nyd79l0kdkjy7x39rysg"; libraryHaskellDepends = [ - base deepseq hashable megaparsec parser-combinators text + base deepseq hashable megaparsec parser-combinators + template-haskell text ]; testHaskellDepends = [ - base megaparsec microlens tasty tasty-hunit text + base megaparsec microlens tasty tasty-hunit template-haskell text ]; description = "Types and parsers for software version numbers"; license = lib.licenses.bsd3; @@ -316207,6 +317109,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "vty_5_39" = 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.39"; + sha256 = "0x1j4m9gx8fdw651w6m49f91vjy98qkdxpr614z3nmf4sxzbpzp5"; + 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 @@ -316288,8 +317215,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.24.5"; - sha256 = "0b2r0malnzalz0s59sa4ryyy1qg8ii886g15dhkmzcpz29yzwrc3"; + version = "3.26.1"; + sha256 = "0cfy3zgszbf56hw086fgprd45yh5hidrmbhsa07smy1r3rhynlda"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -316323,8 +317250,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.10.2"; - sha256 = "1qn5k5p83p3lprksmscnb4ylychgfvfryvag9hkin3y2bzr8qwpm"; + version = "0.5.10.6"; + sha256 = "0xr9grpw0l7xhz2rs28kwdazvipghavcn3l6bcr1alb2axayv0rd"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -316871,6 +317798,8 @@ self: { pname = "wai-handler-hal"; version = "0.2.0.0"; sha256 = "1skmwcs048h60nxq2wz2amaj148g1a6zk4vbnl17h6xi28s603lx"; + revision = "1"; + editedCabalFile = "0kdn4iv5fb0l4w4j2v4g9pyr2n56v4531k4xahysd2l034dyf6l7"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -319830,8 +320759,8 @@ self: { }: mkDerivation { pname = "webauthn"; - version = "0.7.0.0"; - sha256 = "18zhmdq53pkcg5c86fgjb7z6kql9f1bs33grgf714299vrl4dfak"; + version = "0.8.0.0"; + sha256 = "1qsywsshgj270zpzw5x5ljdmfy7v8vb8fmdqap118g4sci3ir3b8"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base16-bytestring base64-bytestring binary bytestring cborg containers cryptonite @@ -320818,8 +321747,8 @@ self: { }: mkDerivation { pname = "weierstrass-functions"; - version = "0.1.3.1"; - sha256 = "191bs505r33yhzb07vqk9rq16a5cajsh5rkg9h7k2c15v81mdc8s"; + version = "0.1.6.0"; + sha256 = "1f2vvhvm6r009c30rbb4b7sm57z1kvj9z9j5fwb8xzqqvkkc63hp"; libraryHaskellDepends = [ base elliptic-integrals gamma jacobi-theta ]; @@ -321064,8 +321993,8 @@ self: { }: mkDerivation { pname = "what4"; - version = "1.5"; - sha256 = "02wl88sma18zhn1pav966kgldiwh942mws01qyp6nxgcx0p9i76s"; + version = "1.5.1"; + sha256 = "021i7ypxlz9lv0fkc1zkl4i6lydhy7jbq1w3565i8cdf4q7mlxrm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -321264,8 +322193,8 @@ self: { pname = "wide-word"; version = "0.1.5.0"; sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; - revision = "2"; - editedCabalFile = "1zq74zgh82zcxnn9knha6qn36k4sqm93mcck45h8pd6c7yzfc0jx"; + revision = "3"; + editedCabalFile = "13qxbck4ia474hlj1244awp2awjn3scppif3p1vwa3i92q6cf37g"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -321961,8 +322890,8 @@ self: { pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; - revision = "2"; - editedCabalFile = "19l3d82cpw14ph253xhapvcm1f3pzik2nkrrvpizp3yx6hw049gn"; + revision = "3"; + editedCabalFile = "1g6qbs7lc6ng873ql5gflg62acn3pzy17dvck2hbxj02fdnjxlbr"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq tasty tasty-hunit text @@ -325497,8 +326426,8 @@ self: { pname = "xmlhtml"; version = "0.2.5.4"; sha256 = "11aldkcd3lcxax42f4080127hqs1k95k84h5griwq27ig8gmbxdc"; - revision = "3"; - editedCabalFile = "0qfnwz5hfgzyw4a24jzgsshaipjm5bvybkz0gwpcw6zpid160p6n"; + revision = "4"; + editedCabalFile = "1b0426fb6nfb9rg118xnhn9m8fqayd23r09ybgr5r3sv0jgzjh2b"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-builder containers parsec text unordered-containers @@ -326219,6 +327148,8 @@ self: { pname = "xss-sanitize"; version = "0.3.7.2"; sha256 = "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv"; + revision = "1"; + editedCabalFile = "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0"; libraryHaskellDepends = [ attoparsec base containers css-text network-uri tagsoup text utf8-string @@ -327219,8 +328150,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.4"; - sha256 = "18h94h0pylgn4q6pzkhs3j5qchj9kafw09xh4kgdp2394b7xk4iy"; + version = "0.14.5"; + sha256 = "154k37qydkch91khxd52mfa6jv2k6gcxyiypcsnx3hcp88mfr9pm"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -328232,6 +329163,8 @@ self: { pname = "yesod-auth-oauth2"; version = "0.7.1.1"; sha256 = "1giac751jkygddf09a1h75dd4qv6kjjw5992447k53m1j398dpbn"; + revision = "1"; + editedCabalFile = "10m6k53idxr968595780v29kv9sjrp5irzv4b4bi10n3dxg85lf3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From b779210e3a07b5edaf0f8bc46f86477ea1c91da0 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 22 Oct 2023 12:24:23 +0200 Subject: [PATCH 006/203] haskellPackages.Cabal-syntax: Update overrides --- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 61c2e51b7939..c2f5629198e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -21,7 +21,7 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_18_0; @@ -40,7 +40,7 @@ self: super: { resolv = cself.resolv_0_1_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { Cabal = cself.Cabal_3_10_1_0; - Cabal-syntax = cself.Cabal-syntax_3_10_1_0; + Cabal-syntax = cself.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version # 1.3.8.* is not an option since it causes very annoying dependencies @@ -1393,7 +1393,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; })); # Test suite requires database @@ -2123,7 +2123,7 @@ self: super: { # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; })); large-hashable = lib.pipe (super.large-hashable.override { @@ -2370,7 +2370,7 @@ self: super: { cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. - Cabal-syntax = self.Cabal-syntax_3_10_1_0; + Cabal-syntax = self.Cabal-syntax_3_10_2_0; }); # 2023-07-18: https://github.com/srid/ema/issues/156 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 691f82c09616..58d9b274774d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -117,7 +117,7 @@ in { hls_overlay = lself: lsuper: { ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523; ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2; - Cabal-syntax = lself.Cabal-syntax_3_10_1_0; + Cabal-syntax = lself.Cabal-syntax_3_10_2_0; }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { From a1e8ef46c6e9657f48fbe5f0e0f738fb28fae65a Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 22 Oct 2023 12:37:39 +0200 Subject: [PATCH 007/203] haskellPackages: Eval fixes --- .../haskell-modules/configuration-common.nix | 31 ++++++++----------- .../configuration-ghc-9.6.x.nix | 2 +- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c2f5629198e9..164a19ef623d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -57,15 +57,15 @@ self: super: { # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_11_5; - hspec-discover = cself.hspec-discover_2_11_5; - hspec = cself.hspec_2_11_5; + hspec-core = cself.hspec-core_2_11_6; + hspec-discover = cself.hspec-discover_2_11_6; + hspec = cself.hspec_2_11_6; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_11* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_11_5 = dontCheck csuper.hspec-discover_2_11_5; + hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -194,11 +194,6 @@ self: super: { }) ] super.aeson); - # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6 - aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: { - th-abstraction = hfinal.th-abstraction_0_5_0_0; - }); - # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149 orbits = dontCheck super.orbits; @@ -208,7 +203,7 @@ self: super: { # 2023-08-09: Jailbreak because of vector < 0.13 monad-bayes = doJailbreak (super.monad-bayes.override { - hspec = self.hspec_2_11_5; + hspec = self.hspec_2_11_6; }); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 @@ -1679,19 +1674,19 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give latest hspec correct dependency versions without overrideScope - hspec_2_11_5 = doDistribute (super.hspec_2_11_5.override { - hspec-discover = self.hspec-discover_2_11_5; - hspec-core = self.hspec-core_2_11_5; + hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override { + hspec-discover = self.hspec-discover_2_11_6; + hspec-core = self.hspec-core_2_11_6; }); - hspec-meta_2_11_5 = doDistribute (super.hspec-meta_2_11_5.override { + hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { hspec-expectations = self.hspec-expectations_0_8_4; }); - hspec-discover_2_11_5 = doDistribute (super.hspec-discover_2_11_5.override { - hspec-meta = self.hspec-meta_2_11_5; + hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override { + hspec-meta = self.hspec-meta_2_11_6; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_5 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6 # is overlayed to hspec-core. - hspec-core_2_11_5 = doDistribute (dontCheck (super.hspec-core_2_11_5.override { + hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override { hspec-expectations = self.hspec-expectations_0_8_4; })); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index f6ba21f37574..3557f38989d2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -72,7 +72,7 @@ self: super: { th-desugar = doDistribute self.th-desugar_1_15; semigroupoids = doDistribute self.semigroupoids_6_0_0_1; bifunctors = doDistribute self.bifunctors_5_6_1; - base-compat = doDistribute self.base-compat_0_13_0; + base-compat = doDistribute self.base-compat_0_13_1; base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0; fgl = doDistribute self.fgl_5_8_1_1; From 7bec1b95d185405824272cb3ecd2d73501a8d2b2 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Sun, 15 Oct 2023 21:15:58 +0200 Subject: [PATCH 008/203] haskellPackages.cabal-plan-bounds: Unbreak on 9.6, add nomeata as maintainer --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/main.yaml | 3 ++- pkgs/development/haskell-modules/hackage-packages.nix | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index a23364a73149..981511df48f1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -80,6 +80,10 @@ self: super: { aeson = doJailbreak super.aeson; free = doJailbreak super.free; + # Because we bumped the version of base-compat above.^ + cabal-plan = unmarkBroken super.cabal-plan; + cabal-plan-bounds = unmarkBroken super.cabal-plan-bounds; + # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6 file-io = unmarkBroken super.file-io; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8f6af23747f3..7c327fbf5012 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -325,11 +325,12 @@ package-maintainers: ncfavier: - lambdabot nomeata: + - cabal-plan-bounds - candid - leb128-cereal - - tasty-expected-failure - lhs2tex - rec-def + - tasty-expected-failure peti: - cabal2spec - funcmp diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8d163fd8d22e..ec3e48a41972 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -57233,6 +57233,7 @@ self: { license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; mainProgram = "cabal-plan-bounds"; + maintainers = [ lib.maintainers.nomeata ]; }) {}; "cabal-progdeps" = callPackage From 4a47fc9395f2dc6577a2f637debc1518236592c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 Oct 2023 17:28:00 +0200 Subject: [PATCH 009/203] haskellPackages.vector: remove redundant patch --- .../haskell-modules/configuration-common.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 164a19ef623d..b8daf5dcc796 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -154,16 +154,6 @@ self: super: { "vector-tests-O0" "vector-tests-O2" ]; - patches = [ - # Workaround almost guaranteed floating point errors in test suite with quickcheck 2.14.3 - # https://github.com/haskell/vector/issues/460 - (pkgs.fetchpatch { - name = "vector-quickcheck-2.14.3-float-workaround.patch"; - url = "https://github.com/haskell/vector/commit/df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c.patch"; - sha256 = "040wg8mqlkdnrl5axy9wk0mlpn8rpc4vc4afpxignj9i7yc4pfjj"; - stripLen = 1; - }) - ]; }) super.vector; # Almost guaranteed failure due to floating point imprecision with QuickCheck-2.14.3 From 5ea114083c0362f8d58f967fccb7e4916f02cf06 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 9 Oct 2023 23:10:53 +0200 Subject: [PATCH 010/203] haskell.packages.ghc96.tls: fix missing LLVM tools on aarch64 The original change missed that we used to erroneously provide LLVM on aarch64-linux, but not on aarch64-darwin which was later fixed in #246045. Since the change was tested on aarch64-linux prior to this, tls ended up being broken on both aarch64-linux and aarch64-darwin. This commit resolves the situation by introducing a helper function to achieve the effect of passing -fllvm while ensuring LLVM is provided. Resolves #260013. --- .../haskell-modules/configuration-ghc-9.6.x.nix | 4 +--- .../haskell-modules/make-package-set.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index e14ad08b9263..0c6320e4f77b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -272,7 +272,5 @@ self: super: { # the workaround on 9.6 is to revert to the LLVM backend (which is used # for these sorts of situations even on 9.2 and 9.4). # https://gitlab.haskell.org/ghc/ghc/-/issues/23746#note_525318 - tls = appendConfigureFlags - (lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ "--ghc-option=-fllvm" ]) - super.tls; + tls = if pkgs.stdenv.hostPlatform.isAarch64 then self.forceLlvmCodegenBackend super.tls else super.tls; } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 753945ea6fc1..c39c934bed64 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -625,4 +625,18 @@ in package-set { inherit pkgs lib callPackage; } self // { else pkg ) { }; + /* + Modify given Haskell package to force GHC to employ the LLVM + codegen backend when compiling. Useful when working around bugs + in a native codegen backend GHC defaults to. + + Example: + forceLlvmCodegenBackend tls + + Type: drv -> drv + */ + forceLlvmCodegenBackend = haskellLib.overrideCabal (drv: { + configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ]; + buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ]; + }); } From caf1c4efda9aac9b6b8437d4c8c89c927dcaebee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 23 Oct 2023 12:02:30 +0200 Subject: [PATCH 011/203] haskellPackages: more eval fixes --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b8daf5dcc796..27e5991f0523 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,7 +20,7 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ + Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({ Cabal-syntax = self.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible @@ -39,7 +39,7 @@ self: super: { # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_1_0; + Cabal = cself.Cabal_3_10_2_0; Cabal-syntax = cself.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version @@ -1597,7 +1597,7 @@ self: super: { hspec-contrib = dontCheck super.hspec-contrib; # github.com/ucsd-progsys/liquidhaskell/issues/1729 - liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; + liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; }; Diff_0_3_4 = dontCheck super.Diff_0_3_4; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d55eef8d0412..4da9f03952af 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -487,7 +487,7 @@ let cabal-install = lib.subtractLists [ compilerNames.ghc981 ] released; - Cabal_3_10_1_0 = lib.subtractLists [ + Cabal_3_10_2_0 = lib.subtractLists [ compilerNames.ghc981 ] released; Cabal-syntax_3_10_1_0 = lib.subtractLists [ From 97ba4facba98267a6dd53bc0cfa4b1fc563ae2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 24 Oct 2023 18:27:59 +0200 Subject: [PATCH 012/203] haskell-language-server: fix eval --- .../configuration-ghc-9.4.x.nix | 2 +- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 41 +++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 58d9b274774d..d13e4cfe9cfc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -115,7 +115,7 @@ in { ( let hls_overlay = lself: lsuper: { - ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523; + ghc-lib-parser = lself.ghc-lib-parser_9_6_3_20231014; ghc-lib-parser-ex = doDistribute lself.ghc-lib-parser-ex_9_6_0_2; Cabal-syntax = lself.Cabal-syntax_3_10_2_0; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cdb806c8c634..786a31311813 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -97,9 +97,11 @@ extra-packages: - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib-parser == 9.6.* # 2023-10-24: preserve for GHC 9.6 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib-parser-ex == 9.6.* # 2023-10-24: preserve for GHC 9.6 - gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages) - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c193f5e82d6c..71c8123953f8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -117131,6 +117131,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_6_3_20231014" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.6.3.20231014"; + sha256 = "1k3p7j63cbr4v9cyj5acqbhj16198x7fjc7cpl8pvyv6m4lr571q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_8_1_20231009" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec @@ -117213,6 +117234,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_9_6_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.6.0.2"; + sha256 = "1fr653b4hgwxz12mvbf9wd93r83qk3qdajplrdmw85hk0f9qfq9a"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex_9_8_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate From 6c2b227d34a6d926d8519b9f56565e2f27622956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 Oct 2023 23:51:42 +0200 Subject: [PATCH 013/203] agdaPackages.*: support literate Typst files --- pkgs/build-support/agda/default.nix | 1 + pkgs/build-support/agda/lib.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 63adf2a27651..893383a759ae 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -47,6 +47,7 @@ let "lagda.org" "lagda.rst" "lagda.tex" + "lagda.typ" ]; defaults = diff --git a/pkgs/build-support/agda/lib.nix b/pkgs/build-support/agda/lib.nix index 80a0974192bb..e6e391b2cedd 100644 --- a/pkgs/build-support/agda/lib.nix +++ b/pkgs/build-support/agda/lib.nix @@ -6,7 +6,7 @@ * interfaceFile "Everything.agda" == "Everything.agdai" * interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai" */ - interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai"; + interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai"; /* Takes an arbitrary derivation and says whether it is an agda library package * that is not marked as broken. From e8bf86a523b9f656345f4fb882d39365782a9f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 Oct 2023 23:52:11 +0200 Subject: [PATCH 014/203] agdaPackages.standard-library: 1.7.2 -> 1.7.3 https://github.com/agda/agda-stdlib/releases/tag/v1.7.3 --- pkgs/development/libraries/agda/standard-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 76f69f54d719..10fd1034ebe2 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg="; + hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From ae86b088694959e3092f6009f80ce80972f74f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 Oct 2023 23:52:53 +0200 Subject: [PATCH 015/203] agdaPackages.agda-categories: 0.1.7.1a -> 0.1.7.2 https://github.com/agda/agda-categories/releases/tag/v0.1.7.2 --- pkgs/development/libraries/agda/agda-categories/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index ff520fb85ef3..2b26a9562965 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.1a"; + version = "0.1.7.2"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU="; + sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c="; }; postPatch = '' From 170a9778b4267285115903b6b0320f120b7df4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 Oct 2023 23:53:38 +0200 Subject: [PATCH 016/203] agdaPackages._1lab: unstable-2023-03-07 -> unstable-2023-10-11 --- pkgs/development/libraries/agda/1lab/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 81afbe4886cd..b782dfbe0649 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,14 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-03-07"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - # Last commit that compiles with Agda 2.6.3 - rev = "c6ee57a2da327def241324b4775ec2c67cdab2af"; - hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg="; + rev = "c6e0c3c714486fd6c89ace31443428ba48871685"; + hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc="; }; # We don't need anything in support; avoid installing LICENSE.agda From 8b59b95f25c3d6a10908cf129ffc1020007b0de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 Oct 2023 23:53:59 +0200 Subject: [PATCH 017/203] agdaPackages.{agda-prelude,functional-linear-algebra}: mark as broken --- pkgs/development/libraries/agda/agda-prelude/default.nix | 1 + .../libraries/agda/functional-linear-algebra/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 573b13d3b4f9..adb848dc02b9 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -24,5 +24,6 @@ mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with maintainers; [ mudri alexarice turion ]; + broken = true; }; } diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 083741d58e94..8d039701d97b 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -26,5 +26,6 @@ mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ ryanorendorff ]; + broken = true; }; } From 57eea055839f7caa7b9b55c6d4112ba0bfa71ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 24 Oct 2023 17:11:39 +0200 Subject: [PATCH 018/203] agdaPackages.cubical: 0.5 -> 0.6 https://github.com/agda/cubical/releases/tag/v0.6 --- pkgs/development/libraries/agda/cubical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 1ecf4b843c74..50ca17a10a25 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { repo = pname; owner = "agda"; rev = "v${version}"; - hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k="; + hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8="; }; # The cubical library has several `Everything.agda` files, which are From 4b653bdacf5db1ec183969921f685abc00e2d46e Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Tue, 24 Oct 2023 23:38:37 +0200 Subject: [PATCH 019/203] futhark: mark not broken, add athas as maintainer --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 206f39758090..c496c3d688da 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1733,7 +1733,6 @@ broken-packages: - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 - fusion # failure in job https://hydra.nixos.org/build/233204359 at 2023-09-02 - - futhark # failure in job https://hydra.nixos.org/build/236673091 at 2023-10-04 - futhask # failure in job https://hydra.nixos.org/build/233229281 at 2023-09-02 - futun # failure in job https://hydra.nixos.org/build/233245115 at 2023-09-02 - future # failure in job https://hydra.nixos.org/build/233224844 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 786a31311813..f430633c7657 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -156,6 +156,8 @@ package-maintainers: - hnix-store-remote arturcygan: - hevm + athas: + - futhark berberman: - nvfetcher - arch-web diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 71c8123953f8..d3fcbeb6b38c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -112295,9 +112295,8 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; - broken = true; + maintainers = [ lib.maintainers.athas ]; }) {}; "futhark-data" = callPackage From 1df768573bc2459eb89f5ffdf7edc5bbf8cb042c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 25 Oct 2023 14:08:28 +0200 Subject: [PATCH 020/203] agdaPackages.agda-prelude: unstable-2022-01-14 -> unstable-2023-10-04 --- pkgs/development/libraries/agda/agda-prelude/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index adb848dc02b9..fcc100e7a7bb 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "unstable-2022-01-14"; + version = "unstable-2023-10-04"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = "3d143d6d0a3f75966602480665623e87233ff93e"; - hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8="; + rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4"; + hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I="; }; preConfigure = '' @@ -24,6 +24,5 @@ mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with maintainers; [ mudri alexarice turion ]; - broken = true; }; } From 6a024aab010208995419a9ca69513a7a191bd0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 27 Oct 2023 10:21:18 -0300 Subject: [PATCH 021/203] reversal-icon-theme: init at unstable-2023-05-13 --- .../icons/reversal-icon-theme/default.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/data/icons/reversal-icon-theme/default.nix diff --git a/pkgs/data/icons/reversal-icon-theme/default.nix b/pkgs/data/icons/reversal-icon-theme/default.nix new file mode 100644 index 000000000000..b636bba4a301 --- /dev/null +++ b/pkgs/data/icons/reversal-icon-theme/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, jdupes +, adwaita-icon-theme +, hicolor-icon-theme +, numix-icon-theme-circle +, gitUpdater +, allColorVariants ? false +, colorVariants ? [] +}: + +let + pname = "reversal-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "-blue" "-red" "-pink" "-purple" "-green" "-orange" "-brown" "-grey" "-black" "-cyan" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2023-05-13"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = pname; + rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2"; + hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + adwaita-icon-theme + hicolor-icon-theme + numix-icon-theme-circle + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install many small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + + name= ./install.sh \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} \ + -d $out/share/icons + + rm $out/share/icons/*/{AUTHORS,COPYING} + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A colorful Design Rectangle icon theme"; + homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26fd35bf312c..2edecf8c63b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29996,6 +29996,10 @@ with pkgs; recursive = callPackage ../data/fonts/recursive { }; + reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { + inherit (gnome) adwaita-icon-theme; + }; + rubik = callPackage ../data/fonts/rubik { }; rhodium-libre = callPackage ../data/fonts/rhodium-libre { }; From fe7d494468a8df2432d1c1ff4f1824dfc9af71cf Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 24 Oct 2023 17:15:00 +0200 Subject: [PATCH 022/203] haskellPackages.mpi-hs*: respect pkgs.mpi and make tests pass --- .../configuration-hackage2nix/main.yaml | 5 +++++ .../haskell-modules/configuration-nix.nix | 20 +++++++++++++++++++ .../haskell-modules/hackage-packages.nix | 5 +++++ 3 files changed, 30 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cdb806c8c634..bdbefc534cd5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -379,6 +379,11 @@ package-maintainers: - taffybar - arbtt - lentil + sheepforce: + - mpi-hs + - mpi-hs-store + - mpi-hs-cereal + - mpi-hs-binary shlok: - streamly-archive - streamly-lmdb diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 89a268a09a6e..037019be4de3 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1342,4 +1342,24 @@ self: super: builtins.intersectAttrs super { gi-webkit2 gi-webkit2webextension ; + + # Makes the mpi-hs package respect the choice of mpi implementation in Nixpkgs. + # Also adds required test dependencies for checks to pass + mpi-hs = + let validMpi = [ "openmpi" "mpich" "mvapich" ]; + mpiImpl = pkgs.mpi.pname; + disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); + in lib.pipe + (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] + ++ disableUnused + ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) + ); + inherit (lib.mapAttrs (_: addTestToolDepends + [ pkgs.openssh pkgs.mpiCheckPhaseHook ] + ) super) + mpi-hs-store + mpi-hs-cereal + mpi-hs-binary + ; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c193f5e82d6c..525bf54ac5e7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -205920,6 +205920,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; "mpi-hs_0_7_3_0" = callPackage @@ -205941,6 +205942,7 @@ self: { license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sheepforce ]; }) {ompi = null;}; "mpi-hs-binary" = callPackage @@ -205959,6 +205961,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mpi-hs-cereal" = callPackage @@ -205977,6 +205980,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mpi-hs-store" = callPackage @@ -205995,6 +205999,7 @@ self: { description = "MPI bindings for Haskell"; license = lib.licenses.asl20; badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.sheepforce ]; }) {}; "mplayer-spot" = callPackage From 704aa729f16da77894b98d8fa780732b50d52c66 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Oct 2023 20:45:09 +0100 Subject: [PATCH 023/203] haskell.packages.ghc96: Fix ghc-lib(-parser) eval --- .../configuration-ghc-9.6.x.nix | 6 ++--- .../configuration-hackage2nix/main.yaml | 1 + .../transitive-broken.yaml | 7 ++++-- .../haskell-modules/hackage-packages.nix | 25 ++++++++++++++++++- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 0c6320e4f77b..f94a6a959697 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -65,7 +65,7 @@ self: super: { # Version deviations from Stackage LTS # - doctest = doDistribute super.doctest_0_22_1; + doctest = doDistribute super.doctest_0_22_2; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 some = doDistribute self.some_1_0_5; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; @@ -91,8 +91,8 @@ self: super: { # https://github.com/mokus0/th-extras/pull/21 th-extras = doJailbreak super.th-extras; - ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523; + ghc-lib = doDistribute self.ghc-lib_9_6_3_20231014; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_3_20231014; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; # Tests fail due to the newly-build fourmolu not being in PATH diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 25f92596be66..0f78f66bb4f5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -94,6 +94,7 @@ extra-packages: - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib == 9.4.* # 2023-03-17: preserve for GHC 9.4 + - ghc-lib == 9.6.* # 2023-03-17: preserve for GHC 9.6 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser == 9.4.* # 2023-03-17: preserve for GHC 9.4 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 136aed746efb..0cdcf0f95111 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1486,9 +1486,11 @@ dont-distribute-packages: - ghc-dump-util - ghc-imported-from - ghc-instances + - ghc-lib_9_8_1_20231009 - ghc-mod - ghc-plugs-out - ghc-session + - ghc_9_8_1 - ghci-pretty - ghcide-bench - ghcjs-dom-hello @@ -2035,7 +2037,7 @@ dont-distribute-packages: - hesql - heterolist - hetzner - - hetzner_0_4_0_1 + - hetzner_0_5_0_0 - hevolisa - hevolisa-dph - hexpat-conduit @@ -2547,6 +2549,7 @@ dont-distribute-packages: - liquid-prelude - liquid-vector - liquidhaskell + - liquidhaskell-boot - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser @@ -3569,7 +3572,6 @@ dont-distribute-packages: - shady-gen - shady-graphics - shake-bindist - - shake-futhark - shake-minify-css - shakebook - shaker @@ -4034,6 +4036,7 @@ dont-distribute-packages: - universe-dependent-sum - universe-th - unix-fcntl + - unleash-client-haskell - unpacked-these - unpacked-validation - unparse-attoparsec diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a1b8758af604..e695b079b37a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -117045,6 +117045,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_6_3_20231014" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.6.3.20231014"; + sha256 = "0ax6g4vvwv2913dl2l1jisf7v3c28p4h0mc0z45g6iap6gkndnf7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts stm time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib_9_8_1_20231009" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser @@ -189125,6 +189147,7 @@ self: { ]; description = "Liquid Types for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "liquidhaskell-cabal" = callPackage @@ -270452,7 +270475,6 @@ self: { ]; description = "Dependency tracking for Futhark"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shake-google-closure-compiler" = callPackage @@ -311592,6 +311614,7 @@ self: { ]; description = "Unleash feature toggle client"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; }) {}; From be603676d827216d01c2263355332730db6f712d Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Oct 2023 20:59:27 +0100 Subject: [PATCH 024/203] haskell.packages.ghc96: Fix base-compat-batteries eval --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index f94a6a959697..d25cb1e9488f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -73,7 +73,7 @@ self: super: { semigroupoids = doDistribute self.semigroupoids_6_0_0_1; bifunctors = doDistribute self.bifunctors_5_6_1; base-compat = doDistribute self.base-compat_0_13_1; - base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0; + base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1; fgl = doDistribute self.fgl_5_8_1_1; # Because we bumped the version of th-abstraction above.^ From 7a0d89ed56f58c3abed892a2f763c4dfb44cf1e4 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 29 Oct 2023 21:11:16 +0100 Subject: [PATCH 025/203] haskell.packages.ghc96.haskell-language-server: Fix eval --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index d25cb1e9488f..24e722a9913e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -200,8 +200,8 @@ self: super: { hw-prim = dontCheck (doJailbreak super.hw-prim); stm-containers = dontCheck super.stm-containers; regex-tdfa = dontCheck super.regex-tdfa; - rebase = doJailbreak super.rebase_1_20; - rerebase = doJailbreak super.rerebase_1_20; + rebase = doJailbreak super.rebase_1_20_1_1; + rerebase = doJailbreak super.rerebase_1_20_1_1; hiedb = dontCheck super.hiedb; retrie = dontCheck super.retrie; # https://github.com/kowainik/relude/issues/436 From f9ee2b7bf836552b6b8b558f7c428197966b26c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Oct 2023 12:55:58 +0000 Subject: [PATCH 026/203] mergerfs: 2.37.1 -> 2.38.0 --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index e2e6e28e3b62..6ee1d96eaf49 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.37.1"; + version = "2.38.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-4WowGrmFDDpmZlAVH73oiKBdgQeqEkbwZCaDSd1rAEc="; + sha256 = "sha256-eENtsN9OqPpUQM+O8tPTBzDk26/F/zc2hZ4ZiXiDp2I="; }; nativeBuildInputs = [ From 27dfebc7f80c2c4fc798a5771b629f679bff3810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?= Date: Mon, 30 Oct 2023 20:08:02 +0100 Subject: [PATCH 027/203] pandoc: remove GHC & haskell deps from closure, 5.2G => 250M The Haskell dependencies were leaking through a haskellPackages.pandoc stray references: $ strings ./result/bin/pandoc | grep /nix/store (...) /nix/store/xk2acjd6587wyskg85xg54lj89mrvrv0-pandoc-3.1.8/etc /nix/store/xk2acjd6587wyskg85xg54lj89mrvrv0-pandoc-3.1.8/libexec/x86_64-linux-ghc-9.4.7/pandoc-3.1.8 /nix/store/l9mzh2nlq5qs50yfvb3ymphfpas0j7pd-pandoc-3.1.8-data/share/ghc-9.4.7/x86_64-linux-ghc-9.4.7/pandoc-3.1.8 /nix/store/xk2acjd6587wyskg85xg54lj89mrvrv0-pandoc-3.1.8/lib/ghc-9.4.7/x86_64-linux-ghc-9.4.7 /nix/store/xk2acjd6587wyskg85xg54lj89mrvrv0-pandoc-3.1.8/lib/ghc-9.4.7/x86_64-linux-ghc-9.4.7/pandoc-3.1.8-DUwbvTsa4nj3Hikhs5AQGF /nix/store/xk2acjd6587wyskg85xg54lj89mrvrv0-pandoc-3.1.8/bin Removing these references using "remove-reference-to". Before: $ nix path-info --closure-size -h $(nix-build -A pandoc) /nix/store/np2f5g1x25fgkp6q10n5p14352899km7-pandoc-cli-0.1.1.1 5.2G After: $ nix path-info --closure-size -h $(nix-build -A pandoc) /nix/store/fpl2h3qs6vm0vb5cibb7cswzm90hc4yx-pandoc-cli-0.1.1.1 250.5M Fixes https://github.com/NixOS/nixpkgs/issues/264399 --- pkgs/development/tools/pandoc/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 1e9eec3f804c..7df96859a748 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -24,6 +24,9 @@ in remove-references-to \ -t ${haskellPackages.warp} \ $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.pandoc_3_1_8} \ + $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc @@ -36,5 +39,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ]; }) From d9cc84954de4ea676e32cbc6ae2a7c129616ff89 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 31 Oct 2023 13:31:23 +0900 Subject: [PATCH 028/203] git-brunch: mark unbroken --- .../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 c496c3d688da..18f3c34a3353 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1869,7 +1869,6 @@ broken-packages: - GiST # failure in job https://hydra.nixos.org/build/233199759 at 2023-09-02 - gist # failure in job https://hydra.nixos.org/build/233221381 at 2023-09-02 - git-all # failure in job https://hydra.nixos.org/build/233252935 at 2023-09-02 - - git-brunch # failure in job https://hydra.nixos.org/build/233250960 at 2023-09-02 - git-checklist # failure in job https://hydra.nixos.org/build/233203228 at 2023-09-02 - git-cuk # failure in job https://hydra.nixos.org/build/233211733 at 2023-09-02 - git-date # failure in job https://hydra.nixos.org/build/233259193 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e695b079b37a..169b51560503 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -120642,9 +120642,7 @@ self: { ]; description = "git checkout command-line tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "git-brunch"; - broken = true; }) {}; "git-checklist" = callPackage From 2238cc1ed9c0a61507167444799f516dda46af3d Mon Sep 17 00:00:00 2001 From: Deniz Alp Durmaz Date: Tue, 3 Oct 2023 08:33:45 +0300 Subject: [PATCH 029/203] haskellPackages.dhall-lsp-server: Apply patch relaxing lens bound --- .../haskell-modules/configuration-common.nix | 21 ++++++++++++------- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 2 -- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 27e5991f0523..ce0ff69bdf75 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1423,13 +1423,20 @@ self: super: { # upstream: https://github.com/obsidiansystems/which/pull/6 which = doJailbreak super.which; - # 2022-09-20: We have overridden lsp to not be the stackage version. - # dhall-lsp-server needs the older 1.4.0.0 lsp - dhall-lsp-server = super.dhall-lsp-server.override { - lsp = dontCheck (super.lsp_1_4_0_0.override { - lsp-types = super.lsp-types_1_4_0_1; - }); - }; + dhall-lsp-server = + # 2022-09-20: We have overridden lsp to not be the stackage version. + # dhall-lsp-server needs the older 1.4.0.0 lsp + let overridden-dhall-lsp-server = super.dhall-lsp-server.override { + lsp = dontCheck (super.lsp_1_4_0_0.override { + lsp-types = super.lsp-types_1_4_0_1; + }); + }; + in appendPatch (fetchpatch { + # This patch can be removed once the change question is in a tracked release. + url = "https://github.com/dhall-lang/dhall-haskell/pull/2539/commits/5dd0f0ba2d836fea3ef499c7aed04e83269c203f.patch"; + sha256 = "sha256-xjVuLDBptDGfTf7MVmPb0WuuFWRLpgDYX2ybbgjAjzs="; + relative = "dhall-lsp-server"; + }) overridden-dhall-lsp-server; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 18f3c34a3353..cd3ed4de6d2b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1183,7 +1183,6 @@ broken-packages: - dhall-check # failure in job https://hydra.nixos.org/build/233206425 at 2023-09-02 - dhall-csv # failure in job https://hydra.nixos.org/build/233256049 at 2023-09-02 - dhall-fly # failure in job https://hydra.nixos.org/build/233220306 at 2023-09-02 - - dhall-lsp-server # failure in job https://hydra.nixos.org/build/233216852 at 2023-09-02 - dhall-recursive-adt # failure in job https://hydra.nixos.org/build/233210665 at 2023-09-02 - dhall-text # failure in job https://hydra.nixos.org/build/233253809 at 2023-09-02 - dhall-to-cabal # failure in job https://hydra.nixos.org/build/233193270 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 0f78f66bb4f5..8620970cae98 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -174,6 +174,7 @@ package-maintainers: centromere: - nfc dalpd: + - dhall-lsp-server - espial - ghc-vis - patat diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 169b51560503..3dafc25b8870 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -85676,10 +85676,8 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "dhall-lsp-server"; maintainers = [ lib.maintainers.Gabriella439 ]; - broken = true; }) {}; "dhall-nix" = callPackage From e5440111301c432989471f96df0ed4416cf7185a Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 31 Oct 2023 21:43:17 +0100 Subject: [PATCH 030/203] trurl: 0.8 -> 0.9 Signed-off-by: Christoph Heiss --- pkgs/tools/networking/trurl/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index 3b5139873209..50b70e3f574b 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -2,15 +2,22 @@ stdenv.mkDerivation rec { pname = "trurl"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "curl"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-KHJMxzHqHW8WbeD6jxyuzZhuHc5x4B7fP/rYAK687ac="; + hash = "sha256-R/7Saea84iqUICAAQz9zcfDLDud4uFedY2752xyg+oE="; }; + # The version number was forgotten to be updated for the release, + # so do it manually in the meantime. + # See https://github.com/curl/trurl/discussions/244#discussioncomment-7436369 + postPatch = '' + substituteInPlace version.h --replace 0.8 0.9 + ''; + outputs = [ "out" "dev" "man" ]; separateDebugInfo = stdenv.isLinux; From 054f67065e41950264f972bad2ab90645386f224 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 31 Oct 2023 18:01:14 +0100 Subject: [PATCH 031/203] haskellPackages.changelog-d: init --- .../haskell-modules/non-hackage-packages.nix | 3 ++ .../misc/haskell/changelog-d/changelog-d.nix | 30 +++++++++++++++++++ .../misc/haskell/changelog-d/default.nix | 26 ++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/development/misc/haskell/changelog-d/changelog-d.nix create mode 100644 pkgs/development/misc/haskell/changelog-d/default.nix diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index fa0446148b46..f78e333ae1d7 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -7,6 +7,8 @@ # files. self: super: { + changelog-d = self.callPackage ../misc/haskell/changelog-d {}; + dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated @@ -36,4 +38,5 @@ self: super: { # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {}; + } diff --git a/pkgs/development/misc/haskell/changelog-d/changelog-d.nix b/pkgs/development/misc/haskell/changelog-d/changelog-d.nix new file mode 100644 index 000000000000..7abc707540ce --- /dev/null +++ b/pkgs/development/misc/haskell/changelog-d/changelog-d.nix @@ -0,0 +1,30 @@ +{ mkDerivation, base, bytestring, cabal-install-parsers +, Cabal-syntax, containers, directory, fetchgit, filepath +, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty +, regex-applicative +}: +mkDerivation { + pname = "changelog-d"; + version = "0.1"; + src = fetchgit { + url = "https://codeberg.org/fgaz/changelog-d"; + sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; + rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cabal-install-parsers Cabal-syntax containers + directory filepath generic-lens-lite mtl parsec pretty + regex-applicative + ]; + executableHaskellDepends = [ + base bytestring Cabal-syntax directory filepath + optparse-applicative + ]; + doHaddock = false; + description = "Concatenate changelog entries into a single one"; + license = lib.licenses.gpl3Plus; + mainProgram = "changelog-d"; +} diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix new file mode 100644 index 000000000000..ffdeb843b3fd --- /dev/null +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -0,0 +1,26 @@ +{ callPackage +, lib +, pkgs +}: + +(callPackage ./changelog-d.nix { }).overrideAttrs (oldAttrs: { + + version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; + + passthru.updateScript = lib.getExe (pkgs.writeShellApplication { + name = "update-changelog-d"; + runtimeInputs = [ + pkgs.cabal2nix + ]; + text = '' + cd pkgs/development/misc/haskell/changelog-d + cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix + ''; + }); + + meta = oldAttrs.meta // { + homepage = "https://codeberg.org/fgaz/changelog-d"; + maintainers = [ lib.maintainers.roberth ]; + }; + +}) From 662c0011576e46b2b35c398b655e970afc3f4195 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 31 Oct 2023 23:59:14 +0100 Subject: [PATCH 032/203] haskellPackages.changelog-d: Add basic test --- .../misc/haskell/changelog-d/default.nix | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index ffdeb843b3fd..e4ba565808cf 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -3,7 +3,7 @@ , pkgs }: -(callPackage ./changelog-d.nix { }).overrideAttrs (oldAttrs: { +(callPackage ./changelog-d.nix { }).overrideAttrs (finalAttrs: oldAttrs: { version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; @@ -17,6 +17,31 @@ cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix ''; }); + passthru.tests = { + basic = pkgs.runCommand "changelog-d-basic-test" { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } '' + mkdir changelogs + cat > changelogs/config < changelogs/a <$out + cat -n $out + echo Checking the generated output + set -x + grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null + grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null + set +x + ''; + }; meta = oldAttrs.meta // { homepage = "https://codeberg.org/fgaz/changelog-d"; From a9d6c649ddd6ef260894f8ed4a90c0c26e8a2a24 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 1 Nov 2023 12:01:00 +0900 Subject: [PATCH 033/203] 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3dafc25b8870..932556b4715b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -85677,7 +85677,9 @@ self: { description = "Language Server Protocol (LSP) server for Dhall"; license = lib.licenses.mit; mainProgram = "dhall-lsp-server"; - maintainers = [ lib.maintainers.Gabriella439 ]; + maintainers = [ + lib.maintainers.dalpd lib.maintainers.Gabriella439 + ]; }) {}; "dhall-nix" = callPackage From f754973d145da2e9b5c43e4dda38721a0aaf3145 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 2 Nov 2023 10:27:03 +0900 Subject: [PATCH 034/203] haskell hydra-report: bump timeout for all requests to Hydra In practice, almost all requests to Hydra take longer than the default timeout of 30 seconds. This commit bumps all requests to the max timeout of 15 minutes. This should hopefully make the hdyra-report.hs script more reliable and fail less. --- maintainers/scripts/haskell/hydra-report.hs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 5573e5e5afc6..2ce3ecb2ae70 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -187,7 +187,7 @@ getBuildReports opt = runReq defaultHttpConfig do getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) getEvalBuilds NoHydraSlownessWorkaround id = - hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"] + hydraJSONQuery mempty ["eval", showT id, "builds"] getEvalBuilds HydraSlownessWorkaround id = do Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] forM builds $ \buildId -> do @@ -195,14 +195,15 @@ getEvalBuilds HydraSlownessWorkaround id = do hydraJSONQuery mempty [ "build", showT buildId ] hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) -hydraQuery responseType option query = - responseBody - <$> req - GET - (foldl' (/:) (https "hydra.nixos.org") query) - NoReqBody - responseType - (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option) +hydraQuery responseType option query = do + let customHeaderOpt = + header + "User-Agent" + "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" + customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes + opts = customHeaderOpt <> customTimeoutOpt <> option + url = foldl' (/:) (https "hydra.nixos.org") query + responseBody <$> req GET url NoReqBody responseType opts hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a hydraJSONQuery = hydraQuery jsonResponse From a6dfad13f4db51c44e237c1888a694f376bb0f30 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 3 Nov 2023 09:43:23 +0900 Subject: [PATCH 035/203] haskellPackages.cabal2nix-unstable: bump to latest commit --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 3fa9c44e7cd7..d329664dddfa 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-08-15"; + version = "unstable-2023-11-02"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/0365d9b77086d26ca5197fb48019cedbb0dce5d2.tar.gz"; - sha256 = "15aia2v05cmblabhb287cf1yqy4dlzw0g905h79fcvkgygnn2ib8"; + url = "https://github.com/NixOS/cabal2nix/archive/2099a1f4594f621bb1a2879b793b860aefe4c027.tar.gz"; + sha256 = "11j1lzjanhmdkqwnb7hni3wxiixl7fzxk6d633cn7ybr7b8wra9s"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; From 9cbe3360fbbb57e54d922fec7e5a80f9453a91d6 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 3 Nov 2023 09:46:31 +0900 Subject: [PATCH 036/203] 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 932556b4715b..0bc7436d3a6b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -119361,7 +119361,7 @@ self: { "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , gi-gobject, graphene, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { @@ -119373,12 +119373,12 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ graphene-gobject ]; + libraryPkgconfigDepends = [ graphene ]; description = "Graphene bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {graphene-gobject = null;}; + }) {inherit (pkgs) graphene;}; "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo From 8a8ec371fe6bd092d180e12a0112a37448b4cb30 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 3 Nov 2023 09:58:33 +0900 Subject: [PATCH 037/203] haskellPackages.gi-graphene: mark unbroken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 3 --- 3 files changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index cd3ed4de6d2b..d2ad1b3d80cb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1855,7 +1855,6 @@ broken-packages: - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 - - gi-graphene # failure in job https://hydra.nixos.org/build/233205231 at 2023-09-02 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 0cdcf0f95111..8939090da07c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1500,10 +1500,8 @@ dont-distribute-packages: - ght - gi-cairo-again - gi-ges - - gi-gsk - gi-gstpbutils - gi-gtk-declarative-app-simple - - gi-gtk_4_0_8 - git-config - git-fmt - git-gpush diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0bc7436d3a6b..0bdcbbee9393 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -119376,8 +119376,6 @@ self: { libraryPkgconfigDepends = [ graphene ]; description = "Graphene bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) graphene;}; "gi-gsk" = callPackage @@ -119402,7 +119400,6 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage From 83df023f3b1d8b20d9162b24e3ab8fd986ec8bec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 07:47:15 +0000 Subject: [PATCH 038/203] fcitx5-configtool: 5.1.1 -> 5.1.2 --- pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 264587f3e7bc..c0bfdc61b3d9 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-5f75UTGCWsuMdZKhssSpUiVaRR05YY0bumVUNq2wJtY="; + sha256 = "sha256-DtMskuPpiL1GshoUH1dDazvwHDhmr9gb93V3TRIMxxg="; }; cmakeFlags = [ From 1edc113c871babfbdb4b5dc89317f954c76bb123 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 07:54:37 +0000 Subject: [PATCH 039/203] fcitx5-hangul: 5.1.0 -> 5.1.1 --- pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 84d9c398cdda..9a1a2c8eca24 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-3cJLF80oAqGSJvPPyKcHxaWysA9RtWYGgptailYd4dk="; + sha256 = "sha256-3gkZh+ZzgTdpTbQe92gxJlG0x6Yhl7LfMiFEq5mb92o="; }; nativeBuildInputs = [ From 889833cf06d76b9cbb55d1a7a171fe00650117f8 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 2 Nov 2023 22:03:31 +0100 Subject: [PATCH 040/203] cosmic-settings: wrap program with cosmic-icons --- .../window-managers/cosmic/settings/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/cosmic/settings/default.nix b/pkgs/applications/window-managers/cosmic/settings/default.nix index 6767f9638462..dcb454b3f82c 100644 --- a/pkgs/applications/window-managers/cosmic/settings/default.nix +++ b/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -3,8 +3,9 @@ , fetchFromGitHub , rust , rustPlatform -, cargo , cmake +, makeWrapper +, cosmic-icons , just , pkg-config , libxkbcommon @@ -19,13 +20,13 @@ , util-linuxMinimal }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "cosmic-settings"; version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "pop-os"; - repo = "cosmic-settings"; + repo = pname; rev = "d15ebbd340dee7adf184831311b5da73faaa80f5"; hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI="; }; @@ -50,7 +51,7 @@ rustPlatform.buildRustPackage { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal ]; + nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ]; dontUseJustBuild = true; @@ -64,6 +65,11 @@ rustPlatform.buildRustPackage { "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-settings" ]; + postInstall = '' + wrapProgram "$out/bin/cosmic-settings" \ + --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" + ''; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-settings"; description = "Settings for the COSMIC Desktop Environment"; From 3fd47fc9770a58caeb34f8d6fef9408b2459bdd4 Mon Sep 17 00:00:00 2001 From: nephalemsec Date: Fri, 3 Nov 2023 19:05:24 +1000 Subject: [PATCH 041/203] feishin: 0.4.1 -> 0.5.1 --- pkgs/applications/audio/feishin/darwin.nix | 2 +- pkgs/applications/audio/feishin/default.nix | 2 +- pkgs/applications/audio/feishin/linux.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix index ee1100f2161f..5da2fa6ee025 100644 --- a/pkgs/applications/audio/feishin/darwin.nix +++ b/pkgs/applications/audio/feishin/darwin.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-6GYp9uzlR1eVRYhNU3kOmcUOPFY3J9eJPqN+TucNavA="; + hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index 3801d31e0a56..c89d5163c2a6 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -8,7 +8,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; pname = "feishin"; - version = "0.4.1"; + version = "0.5.1"; appname = "Feishin"; meta = with lib; { diff --git a/pkgs/applications/audio/feishin/linux.nix b/pkgs/applications/audio/feishin/linux.nix index 8c5890524c35..d503492adfc9 100644 --- a/pkgs/applications/audio/feishin/linux.nix +++ b/pkgs/applications/audio/feishin/linux.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-Y8r329rO7z8V2xP/uRsjTFJfvTn+zyeAYzq6fKDxXs4="; + hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ="; }; From 09cc8b216e97a4ec0ff982856ffd3d1edc12f9db Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 21:03:56 +0900 Subject: [PATCH 042/203] python311Packages.lazr-config: rename from lazr_config --- pkgs/development/python-modules/lazr/config.nix | 5 +++-- pkgs/servers/mail/mailman/package.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index b10ad25972b5..061a34820caf 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -1,13 +1,14 @@ { buildPythonPackage, fetchPypi, lazr_delegates }: buildPythonPackage rec { - pname = "lazr.config"; + pname = "lazr-config"; version = "2.2.3"; propagatedBuildInputs = [ lazr_delegates ]; src = fetchPypi { - inherit pname version; + pname = "lazr.config"; + inherit version; sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; }; } diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 47d09bff6717..955c553d8a74 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flufl_i18n flufl_lock gunicorn - lazr_config + lazr-config passlib requests sqlalchemy diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..f13451b38d86 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -216,6 +216,7 @@ mapAliases ({ Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + lazr_config = lazr-config; # added 2023-11-03 lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baf3d17e8991..75312f0425c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6038,7 +6038,7 @@ self: super: with self; { layoutparser = callPackage ../development/python-modules/layoutparser { }; - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; From d2922cc787be40f453570d8213d8e727db7982de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 12:39:06 +0000 Subject: [PATCH 043/203] media-downloader: 3.4.0 -> 4.0.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index b3c7fd7c8d0b..61f59854debd 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "3.4.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-FTfkVD2uBfCBbP7fjjfG21bOGDVd2j6bhPLHGPm3xh4="; + hash = "sha256-ucANfu28Co88btr4YEBENuxkOOTL/9V5JdN8cRq944Q="; }; nativeBuildInputs = [ From 99e6bb855320407b90e344e66eae221b36e5809b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 12:47:53 +0000 Subject: [PATCH 044/203] moonlight-embedded: 2.6.1 -> 2.6.2 --- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 5f870d51a5ba..aad0de40bf0f 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-/gRm3fViTpoTOkIEu6+mrGTVTAFTmwdWV0MKoFF5vkc="; + sha256 = "sha256-57gD8vyUk4+eJB+QkD+hZzyzM+Lhvue1mY7xSApYWn8="; fetchSubmodules = true; }; From 5d0f3d602595cb23f1e0901049b298926534df7e Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 22:46:01 +0900 Subject: [PATCH 045/203] python311Packages.lazr-config: refactor --- .../python-modules/lazr/config.nix | 48 +++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index 061a34820caf..a27ae1f82fd4 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -1,14 +1,54 @@ -{ buildPythonPackage, fetchPypi, lazr_delegates }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, lazr_delegates +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { pname = "lazr-config"; version = "2.2.3"; - - propagatedBuildInputs = [ lazr_delegates ]; + pyproject = true; src = fetchPypi { pname = "lazr.config"; inherit version; - sha256 = "b74a73f8b63e6dc6732fc1f3d88e2f236596ddf089ef6e1794ece060e8cfabe1"; + hash = "sha256-t0pz+LY+bcZzL8Hz2I4vI2WW3fCJ724XlOzgYOjPq+E="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + lazr_delegates + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.config" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # change the directory to avoid a namespace-related problem + # ModuleNotFoundError: No module named 'lazr.delegates' + preCheck = '' + cd $out + ''; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Create configuration schemas, and process and validate configurations"; + homepage = "https://launchpad.net/lazr.config"; + changelog = "https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } From 375e6a3c1dd6611fd5ea221d3a600ee8ae52db5b Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 22:48:20 +0900 Subject: [PATCH 046/203] python311Packages.lazr-config: 2.2.3 -> 3.0 Changelog: https://git.launchpad.net/lazr.config/tree/NEWS.rst?h=3.0 --- pkgs/development/python-modules/lazr/config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index a27ae1f82fd4..38b0ed3e02c0 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "lazr-config"; - version = "2.2.3"; + version = "3.0"; pyproject = true; src = fetchPypi { pname = "lazr.config"; inherit version; - hash = "sha256-t0pz+LY+bcZzL8Hz2I4vI2WW3fCJ724XlOzgYOjPq+E="; + hash = "sha256-oU5PbMCa68HUCxdhWK6g7uIlLBQAO40O8LMcfFFMNkQ="; }; nativeBuildInputs = [ From 067e014f772c9bb486ba43dc0626001207304af3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 23:26:19 +0900 Subject: [PATCH 047/203] python311Packages.lazr-delegates: rename from lazr_delegates --- pkgs/development/python-modules/lazr/config.nix | 4 ++-- pkgs/development/python-modules/lazr/delegates.nix | 5 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lazr/config.nix b/pkgs/development/python-modules/lazr/config.nix index 38b0ed3e02c0..bc369705e265 100644 --- a/pkgs/development/python-modules/lazr/config.nix +++ b/pkgs/development/python-modules/lazr/config.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, lazr_delegates +, lazr-delegates , zope_interface , pytestCheckHook }: @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lazr_delegates + lazr-delegates zope_interface ]; diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 40e2e47d517d..61646cd8bc2a 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -1,7 +1,7 @@ { buildPythonPackage, fetchPypi, nose, zope_interface }: buildPythonPackage rec { - pname = "lazr.delegates"; + pname = "lazr-delegates"; version = "2.0.4"; propagatedBuildInputs = [ nose zope_interface ]; @@ -9,7 +9,8 @@ buildPythonPackage rec { doCheck = false; # cannot import name 'ClassType' from 'types' src = fetchPypi { - inherit pname version; + pname = "lazr.delegates"; + inherit version; sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f13451b38d86..9e5ec5b3810a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -217,6 +217,7 @@ mapAliases ({ ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 lazr_config = lazr-config; # added 2023-11-03 + lazr_delegates = lazr-delegates; # added 2023-11-03 lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75312f0425c7..da44a8efb570 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6040,7 +6040,7 @@ self: super: with self; { lazr-config = callPackage ../development/python-modules/lazr/config.nix { }; - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + lazr-delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; From c8396e38c10d9a01bbe600bc64da4593f6071bfb Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 23:36:08 +0900 Subject: [PATCH 048/203] python311Packages.lazr-delegates: refactor --- .../python-modules/lazr/delegates.nix | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index 61646cd8bc2a..d13640f9c116 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -1,16 +1,46 @@ -{ buildPythonPackage, fetchPypi, nose, zope_interface }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, zope_interface +, pytestCheckHook +}: buildPythonPackage rec { pname = "lazr-delegates"; version = "2.0.4"; - - propagatedBuildInputs = [ nose zope_interface ]; - - doCheck = false; # cannot import name 'ClassType' from 'types' + pyproject = true; src = fetchPypi { pname = "lazr.delegates"; inherit version; - sha256 = "1rdnl85j9ayp8n85l0ciip621j9dcziz5qnmv2m7krgwgcn31vfx"; + hash = "sha256-3e0wLHv85Xmq2NXi8uNnLckgzI2RAVqQRderJAuituU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + zope_interface + ]; + + pythonImportsCheck = [ + "lazr.delegates" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonNamespaces = [ + "lazr" + ]; + + meta = with lib; { + description = "Easily write objects that delegate behavior"; + homepage = "https://launchpad.net/lazr.delegates"; + changelog = "https://git.launchpad.net/lazr.delegates/tree/lazr/delegates/docs/NEWS.rst?h=${version}"; + license = licenses.lgpl3Only; }; } From 62ea868312bac1f6cc01a9996bc35bb658bea879 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Nov 2023 23:36:36 +0900 Subject: [PATCH 049/203] python311Packages.lazr-delegates: 2.0.4 -> 2.1.0 Changelog: https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=2.1.0 --- pkgs/development/python-modules/lazr/delegates.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lazr/delegates.nix b/pkgs/development/python-modules/lazr/delegates.nix index d13640f9c116..e0b03e693194 100644 --- a/pkgs/development/python-modules/lazr/delegates.nix +++ b/pkgs/development/python-modules/lazr/delegates.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lazr-delegates"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; src = fetchPypi { pname = "lazr.delegates"; inherit version; - hash = "sha256-3e0wLHv85Xmq2NXi8uNnLckgzI2RAVqQRderJAuituU="; + hash = "sha256-UNT7iHK5UuV6SOEmEOVQ+jBm7rV8bGx1tqUUJBi6wZw="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easily write objects that delegate behavior"; homepage = "https://launchpad.net/lazr.delegates"; - changelog = "https://git.launchpad.net/lazr.delegates/tree/lazr/delegates/docs/NEWS.rst?h=${version}"; + changelog = "https://git.launchpad.net/lazr.delegates/tree/NEWS.rst?h=${version}"; license = licenses.lgpl3Only; }; } From d06c52373af97865f670f3c06c1d744be145f959 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 15:26:04 +0000 Subject: [PATCH 050/203] clickhouse-backup: 2.4.1 -> 2.4.2 --- .../tools/database/clickhouse-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 2495e09bba51..8ac28618b422 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NX2687jG0TAt3rOV5XEmgHYiNhuBoWbnUEFnf3w5k6A="; + sha256 = "sha256-KJBg64GaWXUV6go8IO9cI82NUeD0j59ySZTTzINo8So="; }; - vendorHash = "sha256-NOQV7c930kutXmgi1eaETu1JMJerKNK2Ns4YBRaoBUw="; + vendorHash = "sha256-u3UtrsHohuQrSk4ypMXasLPYwkcRYMvOdpBpO8PpwZg="; ldflags = [ "-X main.version=${version}" From f9665bb173b81515ad2f421e5482a091af8b8bc8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 01:21:39 +0900 Subject: [PATCH 051/203] python311Packages.pymaging_png: remove pymaging_png has been removed because it has not been maintained for 10 years and has been archived. --- .../python-modules/pymaging_png/default.nix | 27 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/pymaging_png/default.nix diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix deleted file mode 100644 index 6d12ddd40062..000000000000 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pymaging -}: - -buildPythonPackage { - pname = "pymaging-png"; - version = "unstable-2016-11-16"; - - src = fetchFromGitHub { - owner = "ojii"; - repo = "pymaging-png"; - rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; - sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; - }; - - propagatedBuildInputs = [ pymaging ]; - - meta = with lib; { - description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = "https://github.com/ojii/pymaging-png/"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..bfb1dabc5784 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -289,6 +289,7 @@ mapAliases ({ pyjson5 = json5; # added 2022-08-28 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 + pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20 pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d1..69cfe4888d10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10388,8 +10388,6 @@ self: super: with self; { pymaging = callPackage ../development/python-modules/pymaging { }; - pymaging_png = callPackage ../development/python-modules/pymaging_png { }; - pymailgunner = callPackage ../development/python-modules/pymailgunner { }; pymanopt = callPackage ../development/python-modules/pymanopt { }; From 069e1ee048316d310310f3b673b4b51484d02f7a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 01:23:54 +0900 Subject: [PATCH 052/203] python311Packages.pymaging: remove pymaging has been removed because it has not been maintained for 10 years and has been archived. --- .../python-modules/pymaging/default.nix | 24 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/pymaging/default.nix diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix deleted file mode 100644 index 8869924bddba..000000000000 --- a/pkgs/development/python-modules/pymaging/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -}: - -buildPythonPackage { - pname = "pymaging"; - version = "unstable-2016-11-16"; - - src = fetchFromGitHub { - owner = "ojii"; - repo = "pymaging"; - rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; - sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; - }; - - meta = with lib; { - description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = "http://pymaging.rtfd.org"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bfb1dabc5784..42bbbe3f69f2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -289,6 +289,7 @@ mapAliases ({ pyjson5 = json5; # added 2022-08-28 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 + pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20 pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69cfe4888d10..d1eedea6d8ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10386,8 +10386,6 @@ self: super: with self; { pymacaroons = callPackage ../development/python-modules/pymacaroons { }; - pymaging = callPackage ../development/python-modules/pymaging { }; - pymailgunner = callPackage ../development/python-modules/pymailgunner { }; pymanopt = callPackage ../development/python-modules/pymanopt { }; From 79621bf80400134843c7303bb8953554e748057b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 20:01:04 +0000 Subject: [PATCH 053/203] praat: 6.3.17 -> 6.3.20 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 9dcafa4eb0b5..1e9e26cb18a4 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.17"; + version = "6.3.20"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-HArWXUYoIjJmvh0GOcdGyBHfqC5r4ZEuvXyQ1x5iOt0="; + hash = "sha256-hVQPLRyDXrqpheAqzC/hQ/ZaFxP1c7ClAJQs3wlEcGc="; }; nativeBuildInputs = [ From c1a28a4ea29b62aa524be9534ba6d4db6da34b7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 20:26:24 +0000 Subject: [PATCH 054/203] prometheus-sql-exporter: 0.4.7 -> 0.5.2 --- pkgs/servers/monitoring/prometheus/sql-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 74bd2f139508..cc87fd0d7633 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.4.7"; + version = "0.5.2"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aSygfs5jVc1CTb+uj16U//99ypP4kixz7gqDvxIxxfM="; + sha256 = "sha256-TkTxmumL7T8stNPWkVrMdB23jjMyQcv2x9F+rK6Vj6E="; }; vendorHash = null; From a1b6d51957639df4b0e15458cd0106c43aa1f6d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 21:14:18 +0000 Subject: [PATCH 055/203] pwsafe: 1.17.0 -> 1.18.0 --- pkgs/applications/misc/pwsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 29f3c0c35b32..d9ae209dda21 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.17.0"; # do NOT update to 3.x Windows releases + version = "1.18.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-C1mt9MklZoQNzs6zhk9CskeA4FfDsBVHNx/LRaqxWiI="; + hash = "sha256-2n3JJ/DPhJpNOyviYpqQQl83IAZnmnH5w7b/pOGU8K8="; }; strictDeps = true; From 64a4d3b4bbe2cfe05d174c8b3b0595dc3f9b98ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Nov 2023 23:23:06 +0000 Subject: [PATCH 056/203] python310Packages.adjusttext: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/adjusttext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index ca9fab212cae..d8d82edb8a31 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; + hash = "sha256-Lhl6ykx5ynf+pBub5tBUaALm1w/88jbuSXPigE216NY="; }; nativeBuildInputs = [ From 8973ad968cfd16a8fabdf28450ce856e6a7edf04 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 13:25:03 +0900 Subject: [PATCH 057/203] python311Packages.torrent-parser: rename from torrent_parser --- .../{torrent_parser => torrent-parser}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{torrent_parser => torrent-parser}/default.nix (95%) diff --git a/pkgs/development/python-modules/torrent_parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix similarity index 95% rename from pkgs/development/python-modules/torrent_parser/default.nix rename to pkgs/development/python-modules/torrent-parser/default.nix index f60300086f2a..42250d0348a1 100644 --- a/pkgs/development/python-modules/torrent_parser/default.nix +++ b/pkgs/development/python-modules/torrent-parser/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, fetchFromGitHub }: buildPythonPackage rec { - pname = "torrent_parser"; + pname = "torrent-parser"; version = "0.4.1"; # No tarballs on Pypi diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc5788..408081feed06 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -410,6 +410,7 @@ mapAliases ({ Theano = theano; # added 2023-02-19 TheanoWithCuda = theanoWithCuda; # added 2023-02-19 TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 + torrent_parser = torrent-parser; # added 2023-11-04 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvdb_api = tvdb-api; # added 2023-10-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d1..5c6e0d453404 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14113,7 +14113,7 @@ self: super: with self; { torpy = callPackage ../development/python-modules/torpy { }; - torrent_parser = callPackage ../development/python-modules/torrent_parser { }; + torrent-parser = callPackage ../development/python-modules/torrent-parser { }; torrequest = callPackage ../development/python-modules/torrequest { }; From 8e7947fa0604dedddc4a2d38837f3b4c47310b3f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 4 Nov 2023 13:34:17 +0900 Subject: [PATCH 058/203] python311Packages.torrent-parser: refactor --- .../python-modules/torrent-parser/default.nix | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix index 42250d0348a1..2e946229747f 100644 --- a/pkgs/development/python-modules/torrent-parser/default.nix +++ b/pkgs/development/python-modules/torrent-parser/default.nix @@ -1,20 +1,38 @@ -{ buildPythonPackage, lib, fetchFromGitHub }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +}: buildPythonPackage rec { pname = "torrent-parser"; version = "0.4.1"; + pyproject = true; - # No tarballs on Pypi src = fetchFromGitHub { owner = "7sDream"; repo = "torrent_parser"; rev = "v${version}"; - sha256 = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; + hash = "sha256-zM738r3o9dGZYoWLN7fM4E06m6YPcAODEkgDS6wU/Sc="; }; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "torrent_parser" + ]; + meta = { description = "A .torrent file parser and creator for both Python 2 and 3"; homepage = "https://github.com/7sDream/torrent_parser"; + changelog = "https://github.com/7sDream/torrent_parser/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; }; From a434c9f37e6517791ff21cd2716d87ad78c7204c Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 4 Nov 2023 10:36:51 +0100 Subject: [PATCH 059/203] pinegrow: 7.05.2 -> 7.8 Signed-off-by: Florian Brandes --- pkgs/applications/editors/pinegrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 446b73dc50c8..b4555bc89878 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -24,10 +24,10 @@ let }; }; "7" = { - version = "7.05.2"; + version = "7.8"; src = fetchurl { url = "https://github.com/Pinegrow/PinegrowReleases/releases/download/pg${builtins.substring 0 4 (versions."7".version)}/PinegrowLinux64.${versions."7".version}.zip"; - hash = "sha256-Cvy4JwnQHMp7K0mKtIH8lk1bZ9hwa8nvtmimBK0UAf8="; + hash = "sha256-tYQfPfzKRwClNwgSoJfMwG3LHhi3O/iFuuwIVHS8OXk="; }; }; }; From fbc5e23ebd2f5717c36bd07c5217f72d752198de Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 4 Nov 2023 11:01:13 +0100 Subject: [PATCH 060/203] sqlite3-to-mysql: 2.0.3 -> 2.1.1 Changelog: https://github.com/techouse/sqlite3-to-mysql/blob/master/CHANGELOG.md Signed-off-by: Florian Brandes --- pkgs/tools/misc/sqlite3-to-mysql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index b8fc4fce50c9..412d29c3307c 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -10,16 +10,16 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.0.3"; + version = "2.1.1"; format = "pyproject"; - disabled = python3Packages.pythonOlder "3.7"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rlKJKthop9BQnqjTUq1hZM/NP69gPdEFTq1rU+CbpWA="; + hash = "sha256-g3W6ts5Mk//l6E4Yg49rf9dmu+yzgH+mCjz+vPW9ZRQ="; }; nativeBuildInputs = with python3Packages; [ From 451b394679a41a3985dc9234df022ec96ae22f98 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 4 Nov 2023 11:05:15 +0100 Subject: [PATCH 061/203] python3Packages.reorder-python-imports: 3.11.0 -> 3.12.0 Signed-off-by: Florian Brandes --- .../python-modules/reorder-python-imports/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 63cdb2fda21d..1c5417c75a19 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.11.0"; + version = "3.12.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-5fv2DSMeCleDxsW+nua2dOOeWZIZfuP+Qo++w2YEf4Q="; + hash = "sha256-bKv9APbraR2359IzzkzXs4sEXrTvGK3J4LO3wFHOti0="; }; propagatedBuildInputs = [ From bb8669712e7e4d1899e26230a0ec878b088379ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 12:37:44 +0000 Subject: [PATCH 062/203] grails: 6.0.0 -> 6.1.0 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 3450c693d454..9990cf4553a4 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-Lh0bfU1A/deQiTunjGbhErd8GXiVwCJCI3cuvClVRTU="; + sha256 = "sha256-v+AAIDWRAgBXmhX2BecEio4s5dVA77K+YycZY1k9uvg="; }; nativeBuildInputs = [ unzip ]; From 772d3f609fe7bcd296c176fce6dc97067201c1ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 13:47:31 +0000 Subject: [PATCH 063/203] intel-cmt-cat: 23.08 -> 23.11 --- pkgs/os-specific/linux/intel-cmt-cat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/os-specific/linux/intel-cmt-cat/default.nix index 9429bd28306d..62e6149b6f13 100644 --- a/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "23.08"; + version = "23.11"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-T97cTJLGSJgOoQFgL/lI+AldqsCEcHilhTTDZy+pmU8="; + sha256 = "sha256-/OSU/7QR8NAjcAIo+unVQfORvCH5VpjfRn5sIrCxwbE="; }; enableParallelBuilding = true; From 575af2335424da9c9c21d709855ccf79c35b6451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 13:58:41 +0000 Subject: [PATCH 064/203] llama-cpp: 1469 -> 1483 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 1c96f5d83a60..e4782d2eed46 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1469"; + version = "1483"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-budBvpX2SnKekGTWHomvhW+4grB8EPd9OJbufNynHsc="; + hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; }; postPatch = '' From 421b4946ab55532db395490a7658ed1262cbc61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 14:59:53 +0000 Subject: [PATCH 065/203] mdhtml: 0.2.2 -> 0.3.0 --- pkgs/tools/text/mdhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/tools/text/mdhtml/default.nix index b5d12e7b3dcf..8882ca5ea192 100644 --- a/pkgs/tools/text/mdhtml/default.nix +++ b/pkgs/tools/text/mdhtml/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "mdhtml"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Tomkoid"; repo = pname; rev = version; - hash = "sha256-893pqrrTftzKqPYZgukV/yx2gkukVZWDTgg7ufx1MsY="; + hash = "sha256-Pzl6Hmc24uWQ02FQM84rsypTJy1GdvYqfLDjN6Ryq4Q="; }; vendorHash = null; From f2c37523ee07ae36c2d1b49b1541686f0766baea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 4 Nov 2023 18:46:27 -0300 Subject: [PATCH 066/203] vopono: 0.10.6 -> 0.10.7 --- pkgs/tools/networking/vopono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index 4607dead4441..b051d5aebed6 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.6"; + version = "0.10.7"; src = fetchCrate { inherit pname version; - hash = "sha256-pxzWhaxihGQ6n6KyliiPK3YyVdUMP8OlJwT9Msna1OE="; + hash = "sha256-LaUoaZhOA/3o5DyKqq17u3Sf+lvkxMXkkwMEf6YLnCI="; }; - cargoHash = "sha256-pfZDnPWDjOaGov8jEdeyQdP9NWWES+9pSM5yGD31YB4="; + cargoHash = "sha256-Aef0A+4de3vWlK2zOmUmcGGO6XD1DNYwcZ1ryIvo7mM="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; From b6b7733e4ac0a4f3b3e0a88a70b41d2442f1e770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Nov 2023 22:00:11 +0000 Subject: [PATCH 067/203] uwsgi: 2.0.22 -> 2.0.23 --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index acf4b0751620..927554fa04ea 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.22"; + version = "2.0.23"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-pfy3EDXq3KVY2mC3BMAp/87IUiP4NhdTWZo+zVBJ+Pc="; + hash = "sha256-gyYsgPF6eGa3D7bjmhhVER+uM0yPLfZiwSUzZ2mGcHg="; }; patches = [ From 02ba6a40405cfd089d1e4705cf3add969ee3bfbf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Nov 2023 23:50:32 +0100 Subject: [PATCH 068/203] evcc: 0.121.5 -> 0.122.0 https://github.com/evcc-io/evcc/releases/tag/0.122.0 --- pkgs/servers/home-automation/evcc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index ac49da29b540..87b60d0682c5 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "evcc"; - version = "0.121.5"; + version = "0.122.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-KEJh/JhTlSrio4JRQwxz8NbmjzaqW4MUlzAXGvanMmo="; + hash = "sha256-CgLMDztU5FRqYndNMsncJmc7B5pcBhoO58cVoLGERJM="; }; - vendorHash = "sha256-dBJsPv3tOWxLvVlkTG0npKalH2RWfwR3vJRjqb4TYQE="; + vendorHash = "sha256-rVzogKzURZWQSc8q9VRUKUe/eeo2R1YGbjUDUKm1fOI="; npmDeps = fetchNpmDeps { inherit src; From c93f913379cf6e8862bd1533f654b2cf6347264a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 01:14:44 +0000 Subject: [PATCH 069/203] ocenaudio: 3.13.1 -> 3.13.2 --- pkgs/applications/audio/ocenaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 37bc49bee2b3..daafc48deb7a 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-h5t5DpZD9zmmyGRueXBG5Pn+vZstm5yCUr6Mx3eyvsc="; + sha256 = "sha256-ITlnOrreZHTH8NDjx/hQzEV3toAwaM2bWFLqMf3btNE="; }; nativeBuildInputs = [ From b1900ad682ce6bad8def4349988ade77a2d37d3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 02:16:20 +0000 Subject: [PATCH 070/203] omniorb: 4.3.0 -> 4.3.1 --- pkgs/development/tools/omniorb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 4acf2264fc9c..28c922f2bd6b 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "omniorb"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; + hash = "sha256-D0K8Prc3yuaA2vqFs645WOn1ajeRLF+2uHWTP4+3OQ0="; }; nativeBuildInputs = [ pkg-config ]; From 42baf8f175a84f9536aa152c910cbe22c01f006a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 12:44:28 +0900 Subject: [PATCH 071/203] python311Packages.accelerate: fix build when torch.distributed is disabled --- pkgs/development/python-modules/accelerate/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index de51ac126950..8aeca4307359 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonAtLeast , pythonOlder , pytestCheckHook @@ -29,6 +30,15 @@ buildPythonPackage rec { hash = "sha256-pFkEgE1NGLPBW1CeGU0RJr+1Nj/y58ZcljyOnJuR47A="; }; + patches = [ + # https://github.com/huggingface/accelerate/pull/2121 + (fetchpatch { + name = "fix-import-error-without-torch_distributed.patch"; + url = "https://github.com/huggingface/accelerate/commit/42048092eabd67a407ea513a62f2acde97079fbc.patch"; + hash = "sha256-9lvnU6z5ZEFc5RVw2bP0cGVyrwAp/pxX4ZgnmCN7qH8="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ From 8ca87f4d76d8090bb8152ef706eff2a9faea188b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 04:28:42 +0000 Subject: [PATCH 072/203] polypane: 15.0.1 -> 16.0.0 --- pkgs/applications/networking/browsers/polypane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index d9c9ed616589..5090d3cf4516 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "15.0.1"; + version = "16.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-CU5PI+9iBcxZdhhs2QjfZTViU2xQ3i+T+4Wzp+yeKEE="; + sha256 = "sha256-bxzLduesbeVhLuPcnIJmZaVi861gv44Oos9VB8m3TCs="; }; appimageContents = appimageTools.extractType2 { From 6e880e55b012712512a10694602643400c35cd91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Nov 2023 04:45:55 +0000 Subject: [PATCH 073/203] publii: 0.43.0 -> 0.43.1 --- pkgs/development/web/publii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index fcf64ae69de9..9fb23dc7fc98 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.43.0"; + version = "0.43.1"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-WZX0OugHFuqXxwq7LLGzEG/H+pz9siBukvgBCu5/isI="; + hash = "sha256-+AhvRHw/u66ziqhlHE4BShgoimInE+vT5/kbMn69VF4="; }; dontConfigure = true; From 2434ed121a8bb656a2fa16920993833bd82c51e9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 14:48:36 +0900 Subject: [PATCH 074/203] python311Packages.multi-key-dict: rename from multi_key_dict --- .../{multi_key_dict => multi-key-dict}/default.nix | 5 +++-- pkgs/development/python-modules/python-jenkins/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{multi_key_dict => multi-key-dict}/default.nix (81%) diff --git a/pkgs/development/python-modules/multi_key_dict/default.nix b/pkgs/development/python-modules/multi-key-dict/default.nix similarity index 81% rename from pkgs/development/python-modules/multi_key_dict/default.nix rename to pkgs/development/python-modules/multi-key-dict/default.nix index cb539e4dd90f..0a53aad3c653 100644 --- a/pkgs/development/python-modules/multi_key_dict/default.nix +++ b/pkgs/development/python-modules/multi-key-dict/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "multi_key_dict"; + pname = "multi-key-dict"; version = "2.0.3"; src = fetchPypi { - inherit pname version; + pname = "multi_key_dict"; + inherit version; sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; }; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index af0671279ab1..674ca539c701 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -7,7 +7,7 @@ , pyyaml , setuptools , six -, multi_key_dict +, multi-key-dict , testscenarios , requests , requests-mock @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; buildInputs = [ mock ]; - propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; + propagatedBuildInputs = [ pbr pyyaml setuptools six multi-key-dict requests ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39577ac30411..f75a8bca043a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -238,6 +238,7 @@ mapAliases ({ mistune_2_0 = mistune; # added 2022-08-12 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 + multi_key_dict = multi-key-dict; # added 2023-11-05 mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02 net2grid = gridnet; # add 2022-04-22 nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bd217ad4ee1..e2473d1fbcbe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7095,7 +7095,7 @@ self: super: with self; { multidict = callPackage ../development/python-modules/multidict { }; - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + multi-key-dict = callPackage ../development/python-modules/multi-key-dict { }; multimethod = callPackage ../development/python-modules/multimethod { }; From 0bd996ce96a2696da9f8c4c9da7690bacad8031e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 5 Nov 2023 14:51:42 +0900 Subject: [PATCH 075/203] python311Packages.multi-key-dict: refactor --- .../python-modules/multi-key-dict/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multi-key-dict/default.nix b/pkgs/development/python-modules/multi-key-dict/default.nix index 0a53aad3c653..c959f2e8f2ec 100644 --- a/pkgs/development/python-modules/multi-key-dict/default.nix +++ b/pkgs/development/python-modules/multi-key-dict/default.nix @@ -1,22 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "multi-key-dict"; version = "2.0.3"; + pyproject = true; src = fetchPypi { pname = "multi_key_dict"; inherit version; - sha256 = "17lkx4rf4waglwbhc31aak0f28c63zl3gx5k5i1iq2m3gb0xxsyy"; + hash = "sha256-3uvewXqjChxDLLP0N+gfhiHhwFQqDAYXp09x4jLpk54="; }; + nativeBuildInputs = [ + setuptools + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "multi_key_dict" + ]; + meta = with lib; { description = "multi_key_dict"; homepage = "https://github.com/formiaczek/multi_key_dict"; license = licenses.mit; }; - } From 0ee702c43936f4fb169b53916b3f3251ffcc5441 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Nov 2023 16:47:56 +0100 Subject: [PATCH 076/203] haskellPackages.sdl2-gfx: work around sdl2 pkg-config issue Ref https://github.com/NixOS/nixpkgs/issues/260863. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce0ff69bdf75..8044cc265679 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2676,4 +2676,8 @@ self: super: { # Too strict bounds on base kewar = doJailbreak super.kewar; + + # Workaround for Cabal failing to find nonexistent SDL2 library?! + # https://github.com/NixOS/nixpkgs/issues/260863 + sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d2ad1b3d80cb..9c56ae663e42 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4800,7 +4800,6 @@ broken-packages: - sdl2-cairo-image # failure in job https://hydra.nixos.org/build/233210135 at 2023-09-02 - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - - sdl2-gfx # failure in job https://hydra.nixos.org/build/233236795 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - sdl2-ttf # failure in job https://hydra.nixos.org/build/233238600 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0bdcbbee9393..58d8683c9dde 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -263572,9 +263572,7 @@ self: { executablePkgconfigDepends = [ SDL2 SDL2_gfx ]; description = "Haskell bindings to SDL2_gfx"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "sdl2-gfx-example"; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage From 73c05bde44613703e901c835132dadec3efe38b4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Nov 2023 16:48:41 +0100 Subject: [PATCH 077/203] harfbuzz: record provided pkg-config modules in meta This is verified using testers.hasPkgConfigModules which leads to a slight refactor of the expression. --- pkgs/development/libraries/harfbuzz/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index b1e09f7b82ed..88f373dd4afa 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -30,14 +30,15 @@ , gtk4 , mapnik , qt5 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; version = "7.3.0"; src = fetchurl { - url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; + url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs="; }; @@ -103,6 +104,9 @@ stdenv.mkDerivation rec { passthru.tests = { inherit gimp gtk3 gtk4 mapnik; inherit (qt5) qtbase; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -112,5 +116,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ + "harfbuzz" + "harfbuzz-gobject" + "harfbuzz-subset" + ]; }; -} +}) From d32cb37277093e405e93e3cd69807a3a07873e80 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Nov 2023 16:51:57 +0100 Subject: [PATCH 078/203] sdl2: record provided pkg-config modules in meta This is verified using testers.hasPkgConfigModules which leads to a slight refactor of the expression. --- pkgs/development/libraries/SDL2/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7b741b803de0..d74ab371bb14 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -49,19 +49,21 @@ , audiofile , libiconv , withStatic ? false +# passthru.tests +, testers }: # NOTE: When editing this expression see if the same change applies to # SDL expression too -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; version = "2.28.3"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; }; dontDisableStatic = if withStatic then 1 else 0; @@ -96,7 +98,7 @@ stdenv.mkDerivation rec { ++ lib.optionals x11Support [ libX11 ]; propagatedBuildInputs = lib.optionals x11Support [ xorgproto ] - ++ dlopenPropagatedBuildInputs; + ++ finalAttrs.dlopenPropagatedBuildInputs; dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ] ++ lib.optional dbusSupport dbus @@ -109,7 +111,7 @@ stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] - ++ dlopenBuildInputs + ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; @@ -156,7 +158,7 @@ stdenv.mkDerivation rec { # list the symbols used in this way. postFixup = let - rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + rpath = lib.makeLibraryPath (finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs); in lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' for lib in $out/lib/*.so* ; do @@ -171,6 +173,9 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; updateScript = nix-update-script { extraArgs = ["--version-regex" "release-(.*)"]; }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -180,5 +185,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; + pkgConfigModules = [ "sdl2" ]; }; -} +}) From e3235021ec0999f11112d86084a15ca7df4bf29e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Nov 2023 16:55:04 +0100 Subject: [PATCH 079/203] SDL2_gfx: record provided pkg-config modules in meta This is verified using testers.hasPkgConfigModules which leads to a slight refactor of the expression. --- pkgs/development/libraries/SDL2_gfx/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 3d599c39c05b..83b57b42c7cd 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }: +{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; @@ -42,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; + pkgConfigModules = [ "SDL2_gfx" ]; }; -} +}) From 4c56be2a7e100a5afe2c4b859740be96f5d5ea62 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Nov 2023 16:55:33 +0100 Subject: [PATCH 080/203] SDL2_ttf: record provided pkg-config modules in meta This is verified using testers.hasPkgConfigModules which leads to a slight refactor of the expression. --- pkgs/development/libraries/SDL2_ttf/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index d2dd8d53929e..e46b9d9c537a 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }: +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_ttf"; version = "2.20.2"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; @@ -18,10 +18,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) libGL ++ lib.optional stdenv.isDarwin darwin.libobjc; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; homepage = "https://github.com/libsdl-org/SDL_ttf"; + pkgConfigModules = [ "SDL2_ttf" ]; }; -} +}) From c31f00657042dcb85e45777be4f3701032a4f2f5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Nov 2023 16:56:21 +0100 Subject: [PATCH 081/203] haskellPackages.sdl2-ttf: work around sdl2 pkg-config issue Ref https://github.com/NixOS/nixpkgs/issues/260863. --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8044cc265679..ba926f59412e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -637,7 +637,6 @@ self: super: { saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56 scp-streams = dontCheck super.scp-streams; sdl2 = dontCheck super.sdl2; # the test suite needs an x server - sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention separated = dontCheck super.separated; shadowsocks = dontCheck super.shadowsocks; shake-language-c = dontCheck super.shake-language-c; @@ -2680,4 +2679,6 @@ self: super: { # Workaround for Cabal failing to find nonexistent SDL2 library?! # https://github.com/NixOS/nixpkgs/issues/260863 sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; + sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9c56ae663e42..24650b195a7d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4802,7 +4802,6 @@ broken-packages: - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - - sdl2-ttf # failure in job https://hydra.nixos.org/build/233238600 at 2023-09-02 - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02 - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02 - seakale # failure in job https://hydra.nixos.org/build/233236200 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 58d8683c9dde..65a47e4045f0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -263666,8 +263666,6 @@ self: { description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage From fd8a8c9160438e002bf471fe2be3411559836060 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 6 Nov 2023 11:19:41 +0100 Subject: [PATCH 082/203] haskellPackages.ema(-note): Drop maintainership --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8620970cae98..a6c79d6a0f53 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -285,8 +285,6 @@ package-maintainers: maralorn: - cabal-fmt - clay - - ema - - emanote - eventlog2html - generic-optics - ghc-debug-brick diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0bdcbbee9393..d984bef47f55 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -96491,7 +96491,6 @@ self: { ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "ema-extra" = callPackage @@ -96817,7 +96816,6 @@ self: { badPlatforms = [ "x86_64-darwin" ]; hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; - maintainers = [ lib.maintainers.maralorn ]; }) {}; "embed-config" = callPackage From 2ec6f635344b634beb6b58137a78df83ab18f95e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 21 Oct 2023 12:35:29 +0200 Subject: [PATCH 083/203] haskell.compiler.ghcHEAD: 9.7.20230527 -> 9.9.20231014 --- .../compilers/ghc/common-hadrian.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 6 +- .../configuration-ghc-9.10.x.nix | 52 ++++++++++++++++ .../configuration-ghc-9.8.x.nix | 7 --- .../tools/haskell/hadrian/ghc-platform.nix | 16 +++++ .../tools/haskell/hadrian/ghc-toolchain.nix | 19 ++++++ .../hadrian/{default.nix => hadrian.nix} | 29 +++++---- .../tools/haskell/hadrian/make-hadrian.nix | 59 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 17 ++---- 9 files changed, 172 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix create mode 100644 pkgs/development/tools/haskell/hadrian/ghc-platform.nix create mode 100644 pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix rename pkgs/development/tools/haskell/hadrian/{default.nix => hadrian.nix} (71%) create mode 100644 pkgs/development/tools/haskell/hadrian/make-hadrian.nix diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index e876c4be0af7..d2d6dade497e 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -150,7 +150,7 @@ # GHC's build system hadrian built from the GHC-to-build's source tree # using our bootstrap GHC. -, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian { +, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } { ghcSrc = ghcSrc; ghcVersion = version; userSettings = hadrianUserSettings; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 951b708381f1..6b8d657f34ec 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.7.20230527"; - rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664"; - sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2"; + version = "9.9.20231014"; + rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695"; + sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9"; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix new file mode 100644 index 000000000000..99f48333323c --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -0,0 +1,52 @@ +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +self: super: { + llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; + + # Disable GHC core libraries + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + Cabal-syntax = null; + containers = null; + deepseq = null; + directory = null; + exceptions = null; + filepath = null; + ghc-bignum = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-experimental = null; + ghc-heap = null; + ghc-internal = null; + ghc-platform = null; + ghc-prim = null; + ghc-toolchain = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + semaphore-compat = null; + stm = null; + system-cxx-std-lib = null; + template-haskell = null; + # GHC only builds terminfo if it is a native compiler + terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 4588933abc13..cab81349733e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -1,10 +1,3 @@ -## -## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes: -## -## 1. "8.7" strings -## 2. llvm 6 -## 3. disabled library update: parallel -## { pkgs, haskellLib }: with haskellLib; diff --git a/pkgs/development/tools/haskell/hadrian/ghc-platform.nix b/pkgs/development/tools/haskell/hadrian/ghc-platform.nix new file mode 100644 index 000000000000..3b1b17fba2c7 --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/ghc-platform.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, lib + # GHC source tree to build ghc-toolchain from +, ghcSrc +, ghcVersion +}: +mkDerivation { + pname = "ghc-platform"; + version = ghcVersion; + src = ghcSrc; + postUnpack = '' + sourceRoot="$sourceRoot/libraries/ghc-platform" + ''; + libraryHaskellDepends = [ base ]; + description = "Platform information used by GHC and friends"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix b/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix new file mode 100644 index 000000000000..035fee7aca80 --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/ghc-toolchain.nix @@ -0,0 +1,19 @@ +{ mkDerivation, base, directory, filepath, ghc-platform, lib +, process, text, transformers + # GHC source tree to build ghc-toolchain from +, ghcVersion +, ghcSrc +}: +mkDerivation { + pname = "ghc-toolchain"; + version = ghcVersion; + src = ghcSrc; + postUnpack = '' + sourceRoot="$sourceRoot/utils/ghc-toolchain" + ''; + libraryHaskellDepends = [ + base directory filepath ghc-platform process text transformers + ]; + description = "Utility for managing GHC target toolchains"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/haskell/hadrian/default.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix similarity index 71% rename from pkgs/development/tools/haskell/hadrian/default.nix rename to pkgs/development/tools/haskell/hadrian/hadrian.nix index 1801d63cf8b9..1be21d6f4519 100644 --- a/pkgs/development/tools/haskell/hadrian/default.nix +++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -1,20 +1,19 @@ -{ # GHC source tree to build hadrian from - ghcSrc ? null, ghcVersion ? null -, mkDerivation, base, bytestring, Cabal, containers, directory +# See also ./make-hadria.nix +{ mkDerivation, base, bytestring, Cabal, containers, directory , extra, filepath, lib, mtl, parsec, shake, text, transformers , unordered-containers, cryptohash-sha256, base16-bytestring -, userSettings ? null -# Whether to pass --hyperlinked-source to haddock or not. This is a custom -# workaround as we wait for this to be configurable via userSettings or similar. -# https://gitlab.haskell.org/ghc/ghc/-/issues/23625 -, enableHyperlinkedSource ? true , writeText + # Dependencies that are not on Hackage and only used in certain Hadrian versions +, ghc-platform ? null +, ghc-toolchain ? null + # GHC source tree to build hadrian from +, ghcSrc +, ghcVersion + # Customization +, userSettings ? null +, enableHyperlinkedSource }: -if ghcSrc == null || ghcVersion == null -then throw "hadrian: need to specify ghcSrc and ghcVersion arguments manually" -else - mkDerivation { pname = "hadrian"; version = ghcVersion; @@ -44,7 +43,13 @@ mkDerivation { parsec shake text transformers unordered-containers ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [ cryptohash-sha256 base16-bytestring + ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.9") [ + ghc-platform ghc-toolchain ]; + passthru = { + # Expose »private« dependencies if any + inherit ghc-platform ghc-toolchain; + }; description = "GHC build system"; license = lib.licenses.bsd3; } diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix new file mode 100644 index 000000000000..6aa30cb9e60c --- /dev/null +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -0,0 +1,59 @@ +# Hadrian is the build system used to (exclusively) build GHC. It can +# (theoretically) be used starting with GHC 9.4 and is required since 9.6. It is +# developed in the GHC source tree and specific to the GHC version it is released +# with, i.e. Hadrian always needs to be built from the same GHC source tree as +# the GHC we want to build. +# +# This fact makes it impossible to integrate Hadrian into our Haskell package +# sets which are also used to bootstrap GHC, since a package set can bootstrap +# multiple GHC versions (usually two major versions). A bootstrap set would need +# knowledge of the GHC it would eventually bootstrap which would make the logic +# unnecessarily complicated. +# +# Luckily Hadrian is, while annoying to bootstrap, relatively simple. Specifically +# all it requires to build is (relative to the GHC we are trying to build) a +# build->build GHC and build->build Haskell packages. We can get all of this +# from bootPkgs which is already passed to the GHC expression. +# +# The solution is the following: The GHC expression passes its source tree and +# version along with some parameters to this function (./make-hadrian.nix) +# which acts as a common expression builder for all Hadrian version as well as +# related packages that are managed in the GHC source tree. Its main job is to +# expose all possible compile time customization in a common interface and +# take care of all differences between Hadrian versions. +{ bootPkgs +, lib +}: + +{ # GHC source tree and version to build hadrian & friends from. + # These are passed on to the actual package expressions. + ghcSrc +, ghcVersion + # Contents of a non-default UserSettings.hs to use when building hadrian, if any. + # Should be a string or null. +, userSettings ? null + # Whether to pass --hyperlinked-source to haddock or not. This is a custom + # workaround as we wait for this to be configurable via userSettings or similar. + # https://gitlab.haskell.org/ghc/ghc/-/issues/23625 +, enableHyperlinkedSource ? false +}: + +let + callPackage' = f: args: bootPkgs.callPackage f ({ + inherit ghcSrc ghcVersion; + } // args); + + ghc-platform = callPackage' ./ghc-platform.nix { }; + ghc-toolchain = callPackage' ./ghc-toolchain.nix { + inherit ghc-platform; + }; +in + +callPackage' ./hadrian.nix ({ + inherit userSettings enableHyperlinkedSource; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.9") { + # Starting with GHC 9.9 development, additional in tree packages are required + # to build hadrian. (Hackage-released conditional dependencies are handled + # in ./hadrian.nix without requiring intervention here.) + inherit ghc-platform ghc-toolchain; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6b129e6aca01..0b970cb44f04 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -415,22 +415,15 @@ in { }; ghc98 = compiler.ghc981; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.hostPlatform.isAarch32 then - packages.ghc924 - else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc924 - else - packages.ghc924Binary; + bootPkgs = packages.ghc963; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - # 2023-01-15: Support range >= 10 && < 15 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_14; - llvmPackages = pkgs.llvmPackages_14; + # 2023-01-15: Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; }; ghcjs = compiler.ghcjs810; @@ -586,7 +579,7 @@ in { ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; }; ghcjs = packages.ghcjs810; From 8fe00261016284eba1449fe9fc410d7e0eaae16e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Nov 2023 12:58:57 +0000 Subject: [PATCH 084/203] yquake2: 8.20 -> 8.30 --- pkgs/games/quake2/yquake2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 522a8e39fd88..9a3597937d8c 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.20"; + version = "8.30"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; + sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE="; }; postPatch = '' From 57db378e4cf47f83afe118945fe25433dce78a7e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 7 Nov 2023 16:14:45 +0100 Subject: [PATCH 085/203] netcdfcxx4: fix build, add patch for cmake The fix in the patch is picked from upstream. Can be removed with next release. (Upstream commit does not apply; contains more changes) --- .../libraries/netcdf-cxx4/cmake-h5free.patch | 13 +++++++++++++ pkgs/development/libraries/netcdf-cxx4/default.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch diff --git a/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch new file mode 100644 index 000000000000..7d1723c3ef98 --- /dev/null +++ b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60c699d..606b972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -402,7 +402,7 @@ ELSE(MSVC) + FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) + ENDIF(MSVC) + +-CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) ++CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARIES} H5free_memory "" HAVE_H5FREE_MEMORY) + IF(NOT HAVE_H5FREE_MEMORY) + MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.") + SET(NC_HAS_DEF_VAR_FILTER "") diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 5f0fade2566e..f7ef563aab57 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; }; + patches = [ + # This fix is included upstream, remove with next upgrade + ./cmake-h5free.patch + ]; + preConfigure = '' cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)" ''; From 11547fea6eb4d81a3cece34d613e530e145b9402 Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Tue, 7 Nov 2023 17:27:31 +0100 Subject: [PATCH 086/203] unleash-client-haskell: Unbreak and add maintainer --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 5 ++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce0ff69bdf75..18295db42600 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2676,4 +2676,7 @@ self: super: { # Too strict bounds on base kewar = doJailbreak super.kewar; + + # Tests rely on (missing) submodule + unleash-client-haskell-core = dontCheck super.unleash-client-haskell-core; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d2ad1b3d80cb..1f6e01bf0f26 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5740,7 +5740,6 @@ broken-packages: - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02 - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02 - unix-recursive # failure in job https://hydra.nixos.org/build/233194742 at 2023-09-02 - - unleash-client-haskell-core # failure in job https://hydra.nixos.org/build/237229757 at 2023-10-21 - unlifted-list # failure in job https://hydra.nixos.org/build/233205239 at 2023-09-02 - unlift # failure in job https://hydra.nixos.org/build/233217875 at 2023-09-02 - unliftio-messagebox # failure in job https://hydra.nixos.org/build/233200633 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index a6c79d6a0f53..703497e16407 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -214,6 +214,9 @@ package-maintainers: - vulkan-utils erictapen: - hakyll + evenbrenden: + - unleash-client-haskell + - unleash-client-haskell-core Gabriella439: - annah - bench diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d984bef47f55..f3492e9811c1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -311607,8 +311607,8 @@ self: { ]; description = "Unleash feature toggle client"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; + maintainers = [ lib.maintainers.evenbrenden ]; }) {}; "unleash-client-haskell-core" = callPackage @@ -311628,8 +311628,7 @@ self: { ]; description = "Unleash feature toggle client core"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.evenbrenden ]; }) {}; "unlift" = callPackage From 20b202b3c809a3b599742a41fdf5a34a261910fc Mon Sep 17 00:00:00 2001 From: Robert Obryk Date: Wed, 16 Aug 2023 11:42:29 +0200 Subject: [PATCH 087/203] nixos/restic: allow timer to be disabled --- nixos/modules/services/backup/restic.nix | 8 +++++--- nixos/tests/restic.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index fcdd3082f5a6..87595f39796d 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -133,13 +133,15 @@ in }; timerConfig = mkOption { - type = types.attrsOf unitOption; + type = types.nullOr (types.attrsOf unitOption); default = { OnCalendar = "daily"; Persistent = true; }; description = lib.mdDoc '' - When to run the backup. See {manpage}`systemd.timer(5)` for details. + When to run the backup. See {manpage}`systemd.timer(5)` for + details. If null no timer is created and the backup will only + run when explicitly started. ''; example = { OnCalendar = "00:05"; @@ -378,7 +380,7 @@ in wantedBy = [ "timers.target" ]; timerConfig = backup.timerConfig; }) - config.services.restic.backups; + (filterAttrs (_: backup: backup.timerConfig != null) config.services.restic.backups); # generate wrapper scripts, as described in the createWrapper option environment.systemPackages = lib.mapAttrsToList (name: backup: let diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 868ccb7efd74..4111720cf6be 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -55,6 +55,7 @@ import ./make-test-python.nix ( inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand; repository = remoteRepository; initialize = true; + timerConfig = null; # has no effect here, just checking that it doesn't break the service }; remote-from-file-backup = { inherit passwordFile exclude pruneOpts; From 4a303b56e72924001288cd627e5baae910ae052a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Nov 2023 23:23:06 +0100 Subject: [PATCH 088/203] websecprobe: init at 0.0.10 Web Security Assessment Tool https://github.com/spyboy-productions/WebSecProbe/ --- pkgs/by-name/we/websecprobe/package.nix | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/we/websecprobe/package.nix diff --git a/pkgs/by-name/we/websecprobe/package.nix b/pkgs/by-name/we/websecprobe/package.nix new file mode 100644 index 000000000000..fb81063526cf --- /dev/null +++ b/pkgs/by-name/we/websecprobe/package.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchPypi +}: + +python3.pkgs.buildPythonApplication rec { + pname = "websecprobe"; + version = "0.0.10"; + pyproject = true; + + src = fetchPypi { + pname = "WebSecProbe"; + inherit version; + hash = "sha256-QvXOyQUptMyim/bgvhihjgGs7vX0qX8MqK2ol8q9ePc="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + requests + tabulate + ]; + + postInstall = '' + mv $out/bin/WebSecProbe $out/bin/$pname + ''; + + pythonImportsCheck = [ + "WebSecProbe" + ]; + + meta = with lib; { + description = "Web Security Assessment Tool"; + homepage = "https://github.com/spyboy-productions/WebSecProbe/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "websecprobe"; + }; +} From 056db6ad9d14447d8c2392c2978d64b12cf9a0d7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 8 Nov 2023 04:20:00 +0000 Subject: [PATCH 089/203] terraform-ls: 0.32.2 -> 0.32.3 Diff: https://github.com/hashicorp/terraform-ls/compare/v0.32.2...v0.32.3 Changelog: https://github.com/hashicorp/terraform-ls/blob/v0.32.3/CHANGELOG.md --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index ca1f6337dbdb..81ef5745c925 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.32.2"; + version = "0.32.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-jMUPRgo/XS5nAq9fmonkFBgwY75AaLaZ+fw/qhgXpqE="; + hash = "sha256-uvSAqk9LE0NbOWn2rcygDu7Hl28Wu3KkM5UhI4aocGo="; }; - vendorHash = "sha256-pUPZvx6og4aZCAvgLK1AdeRHSfnX89h+/6F/4mmUTFI="; + vendorHash = "sha256-xoyassGp//8YXG/B1e3kW96UvltQLa662ZlH9/CMzm0="; ldflags = [ "-s" "-w" ]; From ef42b4bd2f1bfac9a3e95d2c0a3879163857490a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 8 Nov 2023 05:00:37 +0000 Subject: [PATCH 090/203] sd: 0.7.6 -> 1.0.0 --- pkgs/tools/text/sd/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 009150062db2..8dc160cd014d 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,28 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, Security }: rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0c5bsqs6c55x4j640vhzlmbiylhp5agr7lx0jrwcjazfyvxihc01"; + hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA="; }; - cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; + cargoHash = "sha256-IhCuWCaSU7c7Tot4uvxE7oabY69wDLstuBN35OzkQcU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - preFixup = '' - installManPage $releaseDir/build/sd-*/out/sd.1 + postInstall = '' + installManPage gen/sd.1 - installShellCompletion $releaseDir/build/sd-*/out/sd.{bash,fish} - installShellCompletion --zsh $releaseDir/build/sd-*/out/_sd + installShellCompletion gen/completions/sd.{bash,fish} + installShellCompletion --zsh gen/completions/_sd ''; meta = with lib; { From 20c35a7f344c21c96a9b8cf9b96dbcd3b1ffd7a4 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 8 Nov 2023 05:32:40 +0000 Subject: [PATCH 091/203] bingo: pin to go1.20 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b316c559463..7461e67a49d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -356,7 +356,10 @@ with pkgs; binbloom = callPackage ../tools/security/binbloom { }; - bingo = callPackage ../development/tools/bingo { }; + bingo = callPackage ../development/tools/bingo { + # See https://github.com/bwplotka/bingo/issues/143. + buildGoModule = buildGo120Module; + }; bin2c = callPackage ../development/tools/bin2c { }; From e985cd4c3b74dbfaa55bf4d3447ac1bda2c39409 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 22 Jul 2023 04:20:00 +0000 Subject: [PATCH 092/203] ocamlPackages.zarith: 1.12 -> 1.13 Diff: https://github.com/ocaml/Zarith/compare/release-1.12...release-1.13 Changelog: https://github.com/ocaml/Zarith/raw/release-1.13/Changes --- pkgs/development/ocaml-modules/zarith/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 70f0be8c7af8..b260d946ce1e 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -9,12 +9,12 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-zarith"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "ocaml"; repo = "Zarith"; rev = "release-${version}"; - sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; + sha256 = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, arbitrary precision OCaml integers"; - homepage = "http://forge.ocamlcore.org/projects/zarith"; + homepage = "https://github.com/ocaml/Zarith"; + changelog = "https://github.com/ocaml/Zarith/raw/${src.rev}/Changes"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; From dfe6dad0a77faf562ac4d6bcc8985b124935bed7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 8 Nov 2023 06:55:36 +0100 Subject: [PATCH 093/203] ligo: pin zarith to 1.12 --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c03327c9de0a..7a3ca84ab016 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9915,7 +9915,14 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15.overrideScope (self: super: { + zarith = super.zarith.overrideAttrs (o: { + src = fetchzip { + url = "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.12.tar.gz"; + hash = "sha256-SQegsMc1+UIod8XeJDE+H5q1huNDQI8CUh7IsHOoVMs="; + }; + }); + }); in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; From abb7876588ca0bd2619406601ba89ea717df6295 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Nov 2023 06:39:14 +0000 Subject: [PATCH 094/203] glusterfs: 11.0 -> 11.1 --- pkgs/tools/filesystems/glusterfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 431be3b79d77..f7e830f3211d 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "11.0"; + version = "11.1"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2w8YqpoLzkzUuoOuI7itfC81sJPUf6elOL8LCrxKAI="; + sha256 = "sha256-ZClMfozeFO3266fkuCSV04QwpZaYa8B0uq2lTPEN2rQ="; }; inherit buildInputs propagatedBuildInputs; From 39f28a872eba58d9259aee27bd9ff357e407c89c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 8 Nov 2023 05:22:02 +0000 Subject: [PATCH 095/203] starlark: unstable-2023-03-02 -> unstable-2023-11-01 Co-authored-by: Mario Rodas --- pkgs/development/interpreters/starlark/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/starlark/default.nix b/pkgs/development/interpreters/starlark/default.nix index d6f0ffcbcca5..a387765f833d 100644 --- a/pkgs/development/interpreters/starlark/default.nix +++ b/pkgs/development/interpreters/starlark/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "starlark"; - version = "unstable-2023-03-02"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "4b1e35fe22541876eb7aa2d666416d865d905028"; - hash = "sha256-TqR8V9cypTXaXlKrAUpP2qE5gJ9ZanaRRs/LmVt/XEo="; + rev = "556fd59b42f68a2fb1f84957741b72811c714e51"; + hash = "sha256-0IiEtZOQEvE2Qm//lI1eyFFL1q/ZQzO9JzmiGsk0HkQ="; }; - vendorHash = "sha256-mMxRw2VucXwKGQ7f7HM0GiQUExxN38qYZDdmEyxtXDA="; + vendorHash = "sha256-jQE5fSqJeiDV7PW7BY/dzCxG6b/KEVIobcjJsaL2zMw="; ldflags = [ "-s" "-w" ]; From f040365b1ff857284b150c5001e1ba801a1fc2e7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 8 Nov 2023 17:06:40 +0100 Subject: [PATCH 096/203] netcdf-cxx4: mark broken on Darwin --- pkgs/development/libraries/netcdf-cxx4/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index f7ef563aab57..945eb219229f 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } From 0d8297f52140b7ef9f982631e8963e73e2705de4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Nov 2023 18:37:59 +0000 Subject: [PATCH 097/203] python311Packages.spyder-kernels: 2.4.4 -> 2.5.0 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index e68f9db10193..14b935d544f1 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.4"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0="; + hash = "sha256-M2hCbARFfgIRiE6SdPpH61ViUrpMBz3ydeg8Zd97oqE="; }; propagatedBuildInputs = [ From f0586fd50a2e654e5c88808ed2f6446b9887f827 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 8 Nov 2023 16:03:15 -0500 Subject: [PATCH 098/203] kitty: 0.30.1 -> 0.31.0 --- pkgs/applications/terminal-emulators/kitty/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index f120b5290ec1..7e7a3d0d8df4 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -7,6 +7,7 @@ , openssl , installShellFiles , dbus +, sudo , Libsystem , Cocoa , Kernel @@ -29,20 +30,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.30.1"; + version = "0.31.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-zjXwiRo6Jw3K0iDf05f04MCtg1qKABah7x07CwvW0/0="; + hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-KDqzcJbI2f91wlrjVWgUmut4nhXA/rO9q5q3FaDWnfc="; + vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU="; }).goModules; buildInputs = [ @@ -150,6 +151,9 @@ buildPythonApplication rec { bashInteractive zsh fish + ] ++ lib.optionals (!stdenv.isDarwin) [ + # integration tests need sudo + sudo ]; # skip failing tests due to darwin sandbox From c6512bbb46b396c45c9f5f3e7fc8cb691e9a5cbe Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 8 Nov 2023 21:38:40 -0500 Subject: [PATCH 099/203] just: 1.15.0 -> 1.16.0 Changelog: https://github.com/casey/just/blob/1.16.0/CHANGELOG.md --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index f95483c144a2..732bd8d43f2b 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.15.0"; + version = "1.16.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-r1YJ7L98aLAwBd3g+WlW/UijceR7t9z7aXSZZjlMNnM="; + hash = "sha256-lXZCRoTVIguufyhHn7h4vAajG53qIn8AeDBZuha6be8="; }; - cargoHash = "sha256-Fx2BdSHo+W43ZM/SX1ccddXG9QHlftrupT2cbyT4KM0="; + cargoHash = "sha256-+r8fcoG23p7ug3xireAnUvJHiB/PXAUzBAKowGqKN8E="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 5ec3f0d5adf617a826d03cf8693e19de6cbccac9 Mon Sep 17 00:00:00 2001 From: OTABI Tomoya Date: Thu, 9 Nov 2023 12:02:00 +0900 Subject: [PATCH 100/203] python311Packages.spyder-kernels: fix the changelog url --- pkgs/development/python-modules/spyder-kernels/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 14b935d544f1..f62c4d7c9ede 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { description = "Jupyter kernels for Spyder's console"; homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; - changelog = "https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md"; + changelog = "https://github.com/spyder-ide/spyder-kernels/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; From 39404056ed559f690060467932d32fe3bca55350 Mon Sep 17 00:00:00 2001 From: 6t8k <58048945+6t8k@users.noreply.github.com> Date: Wed, 8 Nov 2023 20:26:10 +0100 Subject: [PATCH 101/203] exiv2: 0.28.0 -> 0.28.1 https://github.com/Exiv2/exiv2/blob/v0.28.1/doc/ChangeLog Fixes CVE-2023-44398 (High). https://github.com/Exiv2/exiv2/issues/2762 is now fixed upstream, so make `checkPhase` run unconditionally again. --- pkgs/development/libraries/exiv2/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index bf36c5a9bca0..fb2db6a963e7 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , gettext @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.0"; + version = "0.28.1"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -27,9 +28,16 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-nEoLJWxSJmAonCbW/iZKjLrKMj09mwEaSUXUcUu8GxU="; + hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch"; + hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -67,8 +75,7 @@ stdenv.mkDerivation rec { "doc" ]; - # https://github.com/Exiv2/exiv2/issues/2762 - doCheck = lib.versionOlder brotli.version "1.1.0"; + doCheck = true; preCheck = '' patchShebangs ../test/ From e8d2fce632ef93268b5e3a8f0fe1e1ef24bad3bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 06:28:46 +0000 Subject: [PATCH 102/203] buildpack: 0.31.0 -> 0.32.0 --- pkgs/development/tools/buildpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 0f09d2814068..b768021035cb 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-v46Yfj0gRT84R1vttKkpan28dkeJWHNgzKzI+ZVCiNc="; + hash = "sha256-t4//83DD3hCnxsuuw7nB06SWCY4/GcRcIk8Cr3C4bDw="; }; - vendorHash = "sha256-KZ2nAd+5D5PFgSDhNeHg6Hnp+h7HqZ2CRsKUek0KZhM="; + vendorHash = "sha256-42CrWLwBcv2GE+hEgJJOd7hFQu7rjYrXkPhhUykqIQw="; nativeBuildInputs = [ installShellFiles ]; From abb4058d279465d2aa8f3361ae4f312126418469 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 9 Nov 2023 08:32:58 +0100 Subject: [PATCH 103/203] invidious: unstable-2023-10-20 -> unstable-2023-11-08 --- pkgs/servers/invidious/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 3458da342ead..2168d604c191 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "3b219a4c7f932867f5a12608d8604436c722c1a0", - "sha256": "sha256-+uhq97H5frDbks9U0dQ0TK3VmtM71mlyFQzq0Dd2ZIc=", - "version": "unstable-2023-10-20" + "rev": "c5b87e3b5e5cc7f7f5c8baa7732bd6d81d8f910a", + "sha256": "sha256-aYxVgktwUBVfvUxgQUDUmDAKp1sr0+ZJcyGqcmBB4e0=", + "version": "unstable-2023-11-08" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", From b267f282a06621f0f37511fdc3e5a92630aeba94 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 9 Nov 2023 10:43:30 +0100 Subject: [PATCH 104/203] python3Packages.click-aliases: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/click-aliases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix index 7e2ed9b1bf5a..18a97769b3d8 100644 --- a/pkgs/development/python-modules/click-aliases/default.nix +++ b/pkgs/development/python-modules/click-aliases/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "click-aliases"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = "click-aliases"; rev = "v${version}"; - hash = "sha256-ZrNdxUMLRre0U9xCyyU8HjByNGMSXiuMDVjW9e88eyk="; + hash = "sha256-HTjo6ID27W7D4MZjeAJMSy5yVd6oKg0Ed9/kDtQZ7Vw="; }; nativeBuildInputs = [ From 704a2b7c9d1654516f86f78d5921c603b0068eb5 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 9 Nov 2023 11:37:06 +0100 Subject: [PATCH 105/203] haskellPackages.servant-JuicyPixels: unbreak --- .../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 1f6e01bf0f26..ff0a507ef3b0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4868,7 +4868,6 @@ broken-packages: - servant-http-streams # failure in job https://hydra.nixos.org/build/233242852 at 2023-09-02 - servant-iCalendar # failure in job https://hydra.nixos.org/build/233200493 at 2023-09-02 - servant-jquery # failure in job https://hydra.nixos.org/build/233238796 at 2023-09-02 - - servant-JuicyPixels # failure in job https://hydra.nixos.org/build/233222224 at 2023-09-02 - servant-kotlin # failure in job https://hydra.nixos.org/build/233598190 at 2023-09-02 - servant-namedargs # failure in job https://hydra.nixos.org/build/233258674 at 2023-09-02 - servant-nix # failure in job https://hydra.nixos.org/build/233236159 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f3492e9811c1..8da701f3316c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -265761,9 +265761,7 @@ self: { ]; description = "Servant support for JuicyPixels"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "image-conversion"; - broken = true; }) {}; "servant-aeson-specs" = callPackage From fc80719711451866407cb705b0d2ab456e17b8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 9 Nov 2023 15:28:11 +0100 Subject: [PATCH 106/203] haskellPackages.monad-bayes: don't check https://github.com/tweag/monad-bayes/pull/326 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 18295db42600..72336ba31b85 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -192,9 +192,10 @@ self: super: { aeson-better-errors = doJailbreak super.aeson-better-errors; # 2023-08-09: Jailbreak because of vector < 0.13 - monad-bayes = doJailbreak (super.monad-bayes.override { + # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 + monad-bayes = dontCheck (doJailbreak (super.monad-bayes.override { hspec = self.hspec_2_11_6; - }); + })); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 # https://github.com/haskell/statistics/issues/205 From 142e4cddafa15518d09c5005dc09d0fa833b0ca7 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Wed, 8 Nov 2023 23:06:24 -0800 Subject: [PATCH 107/203] fwts: use absolute path for dtc utility --- pkgs/os-specific/linux/fwts/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d44db7adf159..43f7ed5cb3a1 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" + + substituteInPlace src/lib/src/fwts_devicetree.c \ + src/devicetree/dt_base/dt_base.c \ + --replace "dtc -I" "${dtc}/bin/dtc -I" ''; enableParallelBuilding = true; From e65dd1c01b0ec87ba9e5bff6af409f37c96a8d31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 17:28:38 +0000 Subject: [PATCH 108/203] python311Packages.sphinx-external-toc: 0.3.1 -> 1.0.0 --- .../python-modules/sphinx-external-toc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 0aff8f37caa4..921669d4ca71 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; - version = "0.3.1"; + version = "1.0.0"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "9c8ea9980ea0e57bf3ce98f6a400f9b69eb1df808f7dd796c9c8cc1873d8b355"; + sha256 = "sha256-990JX/OrD7dKMQ1BCwo2GPwd3G8s5DWJfWWayqSj6yQ="; }; nativeBuildInputs = [ flit-core ]; From 1d6b03af9a7c8c4f0656a77cc7c9a4a84f210058 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 9 Nov 2023 20:57:57 +0300 Subject: [PATCH 109/203] nixos/installer: remove nixos-option compat shim It's been two years. --- nixos/modules/installer/tools/nixos-option/default.nix | 1 - 1 file changed, 1 deletion(-) delete mode 100644 nixos/modules/installer/tools/nixos-option/default.nix diff --git a/nixos/modules/installer/tools/nixos-option/default.nix b/nixos/modules/installer/tools/nixos-option/default.nix deleted file mode 100644 index 061460f38a3b..000000000000 --- a/nixos/modules/installer/tools/nixos-option/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ pkgs, ... }: pkgs.nixos-option From c2fb5dcd2f01d3f5d4b38f76fda7090c57f0644d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Nov 2023 19:50:15 +0100 Subject: [PATCH 110/203] python311Packages.evohome-async: 0.4.4 -> 0.4.8 Diff: https://github.com/zxdavb/evohome-async/compare/refs/tags/0.4.4...0.4.8 --- pkgs/development/python-modules/evohome-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 4e861365eab7..78dfe237e100 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.4"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-IXI1Aot0M6VKyiiuyjR+P0WufZO4MMDemC48/kMhvTY="; + hash = "sha256-0qVbHZ8ADyZDb4wLqEb7zgl3MHZz+8DSLGCMGlt0+eE="; }; nativeBuildInputs = [ From f8ba8be54b7277ee284850119dc156297633b6b3 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 19 Sep 2023 23:30:52 -0400 Subject: [PATCH 111/203] testing-instrumentation: Factor backdoor service out to variable --- .../modules/testing/test-instrumentation.nix | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index c91e54f5a4d7..6c4b4f13d04b 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -7,48 +7,51 @@ with lib; let qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; }; + + backdoorService = { + wantedBy = [ "multi-user.target" ]; + requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; + script = + '' + export USER=root + export HOME=/root + export DISPLAY=:0.0 + + source /etc/profile + + # Don't use a pager when executing backdoor + # actions. Because we use a tty, commands like systemctl + # or nix-store get confused into thinking they're running + # interactively. + export PAGER= + + cd /tmp + exec < /dev/hvc0 > /dev/hvc0 + while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done + echo "connecting to host..." >&2 + stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion + # The following line is essential since it signals to + # the test driver that the shell is ready. + # See: the connect method in the Machine class. + echo "Spawning backdoor root shell..." + # Passing the terminal device makes bash run non-interactively. + # Otherwise we get errors on the terminal because bash tries to + # setup things like job control. + # Note: calling bash explicitly here instead of sh makes sure that + # we can also run non-NixOS guests during tests. + PS1= exec /usr/bin/env bash --norc /dev/hvc0 + ''; + serviceConfig.KillSignal = "SIGHUP"; + }; + in { config = { - systemd.services.backdoor = - { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; - after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; - script = - '' - export USER=root - export HOME=/root - export DISPLAY=:0.0 - - source /etc/profile - - # Don't use a pager when executing backdoor - # actions. Because we use a tty, commands like systemctl - # or nix-store get confused into thinking they're running - # interactively. - export PAGER= - - cd /tmp - exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/${qemu-common.qemuSerialDevice}; do sleep 0.1; done - echo "connecting to host..." >&2 - stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion - # The following line is essential since it signals to - # the test driver that the shell is ready. - # See: the connect method in the Machine class. - echo "Spawning backdoor root shell..." - # Passing the terminal device makes bash run non-interactively. - # Otherwise we get errors on the terminal because bash tries to - # setup things like job control. - # Note: calling bash explicitly here instead of sh makes sure that - # we can also run non-NixOS guests during tests. - PS1= exec /usr/bin/env bash --norc /dev/hvc0 - ''; - serviceConfig.KillSignal = "SIGHUP"; - }; + systemd.services.backdoor = backdoorService # Prevent agetty from being instantiated on the serial device, since it # interferes with the backdoor (writes to it will randomly fail From d057a2eec360bf7c618f98a141eea1fa4788a1d6 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 9 Nov 2023 22:33:13 +0100 Subject: [PATCH 112/203] hovercraft: fix build 2.7 with upstream debian patch --- pkgs/applications/misc/hovercraft/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index ccb597db62d0..25e541cf3d48 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -9,6 +9,7 @@ , svg-path , pygments , watchdog +, fetchpatch }: buildPythonApplication rec { @@ -25,6 +26,13 @@ buildPythonApplication rec { nativeCheckInputs = [ manuel ]; propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; + patches = [ + (fetchpatch { + name = "fix tests with pygments 2.14"; + url = "https://sources.debian.org/data/main/h/hovercraft/2.7-5/debian/patches/0003-Fix-tests-with-pygments-2.14.patch"; + sha256 = "sha256-qz4Kp4MxlS3KPKRB5/VESCI++66U9q6cjQ0cHy3QjTc="; + }) + ]; meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; From d3012b9892fb25021f5bca2426a42d610ae3dddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 22:32:10 +0000 Subject: [PATCH 113/203] yq-go: 4.35.2 -> 4.40.1 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 2e870975d339..9dbbd19d4680 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.35.2"; + version = "4.40.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-iQJx++MeyXT7hS4NATvzYq+YErTEKYCajAzcn1QIWDU="; + hash = "sha256-S2hsZkospf1VMH/fDLiALEraOA8dbG62JejGY2T/tRU="; }; - vendorHash = "sha256-nh7boYBNYvNe+uMxV460bkmWQ61VYuvFYQ5CIaNEv98="; + vendorHash = "sha256-ggb8ZX2KBj/oY+vomCme/7KlnfsykMm4l027kwlxpWY="; nativeBuildInputs = [ installShellFiles ]; From 9fc5a391e44358f3342342a05a209114540e2835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Ochotnick=C3=BD?= Date: Sat, 8 Jul 2023 14:37:55 +0200 Subject: [PATCH 114/203] opensnitch-ui: Add wayland support Without this dependency opensnitch needs to be run with QT_QPA_PLATFORM=xcb override in Wayland environments. --- pkgs/tools/networking/opensnitch/ui.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/opensnitch/ui.nix b/pkgs/tools/networking/opensnitch/ui.nix index 3cac87bf55e9..a19020e4322e 100644 --- a/pkgs/tools/networking/opensnitch/ui.nix +++ b/pkgs/tools/networking/opensnitch/ui.nix @@ -1,5 +1,6 @@ { python3Packages , fetchFromGitHub +, qtwayland , wrapQtAppsHook , lib }: @@ -25,6 +26,10 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]; + buildInputs = [ + qtwayland + ]; + propagatedBuildInputs = with python3Packages; [ grpcio-tools pyqt5 From 9a0f523372cf836662421ef2603bfb93f568f399 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 19 Sep 2023 23:39:51 -0400 Subject: [PATCH 115/203] systemd-stage-1: Enable backdoor in nixos tests --- .../manual/release-notes/rl-2311.section.md | 2 + nixos/lib/test-driver/test_driver/machine.py | 16 +++++ .../modules/testing/test-instrumentation.nix | 71 ++++++++++++++++--- nixos/tests/systemd-initrd-simple.nix | 12 ++-- 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 22bc4c31618e..e33f6b337e2d 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -554,3 +554,5 @@ The module update takes care of the new config syntax and the data itself (user - `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14). - The Linux kernel module `msr` (see [`msr(4)`](https://man7.org/linux/man-pages/man4/msr.4.html)), which provides an interface to read and write the model-specific registers (MSRs) of an x86 CPU, can now be configured via `hardware.cpu.x86.msr`. + +- There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2. diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 529de41d892a..f430321bb607 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -1278,3 +1278,19 @@ class Machine: def run_callbacks(self) -> None: for callback in self.callbacks: callback() + + def switch_root(self) -> None: + """ + Transition from stage 1 to stage 2. This requires the + machine to be configured with `testing.initrdBackdoor = true` + and `boot.initrd.systemd.enable = true`. + """ + self.wait_for_unit("initrd.target") + self.execute( + "systemctl isolate --no-block initrd-switch-root.target 2>/dev/null >/dev/null", + check_return=False, + check_output=False, + ) + self.wait_for_console_text(r"systemd\[1\]:.*Switching root\.") + self.connected = False + self.connect() diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 6c4b4f13d04b..abe68dd6eae6 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -6,10 +6,15 @@ with lib; let + cfg = config.testing; + qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; }; backdoorService = { - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + conflicts = [ "shutdown.target" "initrd-switch-root.target" ]; + before = [ "shutdown.target" "initrd-switch-root.target" ]; requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ]; script = @@ -18,7 +23,9 @@ let export HOME=/root export DISPLAY=:0.0 - source /etc/profile + if [[ -e /etc/profile ]]; then + source /etc/profile + fi # Don't use a pager when executing backdoor # actions. Because we use a tty, commands like systemctl @@ -49,9 +56,59 @@ in { + options.testing = { + + initrdBackdoor = lib.mkEnableOption (lib.mdDoc '' + enable backdoor.service in initrd. Requires + boot.initrd.systemd.enable to be enabled. Boot will pause in + stage 1 at initrd.target, and will listen for commands from the + Machine python interface, just like stage 2 normally does. This + enables commands to be sent to test and debug stage 1. Use + machine.switch_root() to leave stage 1 and proceed to stage 2. + ''); + + }; + config = { - systemd.services.backdoor = backdoorService + assertions = [ + { + assertion = cfg.initrdBackdoor -> config.boot.initrd.systemd.enable; + message = '' + testing.initrdBackdoor requires boot.initrd.systemd.enable to be enabled. + ''; + } + ]; + + systemd.services.backdoor = backdoorService; + + boot.initrd.systemd = lib.mkMerge [ + { + contents."/etc/systemd/journald.conf".text = '' + [Journal] + ForwardToConsole=yes + MaxLevelConsole=debug + ''; + + extraConfig = config.systemd.extraConfig; + } + + (lib.mkIf cfg.initrdBackdoor { + # Implemented in machine.switch_root(). Suppress the unit by + # making it a noop without removing it, which would break + # initrd-parse-etc.service + services.initrd-cleanup.serviceConfig.ExecStart = [ + # Reset + "" + # noop + "/bin/true" + ]; + + services.backdoor = backdoorService; + + contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env"; + }) + ]; # Prevent agetty from being instantiated on the serial device, since it # interferes with the backdoor (writes to it will randomly fail @@ -107,12 +164,6 @@ in MaxLevelConsole=debug ''; - boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = '' - [Journal] - ForwardToConsole=yes - MaxLevelConsole=debug - ''; - systemd.extraConfig = '' # Don't clobber the console with duplicate systemd messages. ShowStatus=no @@ -126,8 +177,6 @@ in DefaultDeviceTimeoutSec=300 ''; - boot.initrd.systemd.extraConfig = config.systemd.extraConfig; - boot.consoleLogLevel = 7; # Prevent tests from accessing the Internet. diff --git a/nixos/tests/systemd-initrd-simple.nix b/nixos/tests/systemd-initrd-simple.nix index a6a22e9d48e0..2b7283a82193 100644 --- a/nixos/tests/systemd-initrd-simple.nix +++ b/nixos/tests/systemd-initrd-simple.nix @@ -2,16 +2,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-initrd-simple"; nodes.machine = { pkgs, ... }: { - boot.initrd.systemd = { - enable = true; - emergencyAccess = true; - }; + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; virtualisation.fileSystems."/".autoResize = true; }; testScript = '' import subprocess + with subtest("testing initrd backdoor"): + machine.wait_for_unit("initrd.target") + machine.succeed("systemctl status initrd-fs.target") + machine.switch_root() + with subtest("handover to stage-2 systemd works"): machine.wait_for_unit("multi-user.target") machine.succeed("systemd-analyze | grep -q '(initrd)'") # direct handover @@ -37,6 +40,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) machine.start() + machine.switch_root() newAvail = machine.succeed("df --output=avail / | sed 1d") assert int(oldAvail) < int(newAvail), "File system did not grow" From 90e26586937dc2bb5bb4c1a825ee1d8682a62d94 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 20 Sep 2023 05:58:30 -0400 Subject: [PATCH 116/203] nixos/tests/systemd-initrd-networkd: Separate into different tests --- nixos/tests/systemd-initrd-networkd.nix | 75 +++++++++++++++---------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/nixos/tests/systemd-initrd-networkd.nix b/nixos/tests/systemd-initrd-networkd.nix index 8376276d8f63..22a570520545 100644 --- a/nixos/tests/systemd-initrd-networkd.nix +++ b/nixos/tests/systemd-initrd-networkd.nix @@ -1,9 +1,19 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "systemd-initrd-network"; - meta.maintainers = [ lib.maintainers.elvishjerricco ]; +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib +}: - nodes = let - mkFlushTest = flush: script: { ... }: { +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + inherit (lib.maintainers) elvishjerricco; + + mkFlushTest = flush: script: makeTest { + name = "systemd-initrd-network-${lib.optionalString (!flush) "no-"}flush"; + meta.maintainers = [ elvishjerricco ]; + + nodes.machine = { boot.initrd.systemd.enable = true; boot.initrd.network = { enable = true; @@ -19,8 +29,18 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { inherit script; }; }; - in { - basic = { ... }: { + + testScript = '' + machine.wait_for_unit("multi-user.target") + ''; + }; + +in { + basic = makeTest { + name = "systemd-initrd-network"; + meta.maintainers = [ elvishjerricco ]; + + nodes.machine = { boot.initrd.network.enable = true; boot.initrd.systemd = { @@ -47,29 +67,26 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; }; - doFlush = mkFlushTest true '' - if ip addr | grep 10.0.2.15; then - echo "Network configuration survived switch-root; flushBeforeStage2 failed" - exit 1 - fi - ''; - - dontFlush = mkFlushTest false '' - if ! (ip addr | grep 10.0.2.15); then - echo "Network configuration didn't survive switch-root" - exit 1 - fi + testScript = '' + machine.wait_for_unit("multi-user.target") + # Make sure the systemd-network user was set correctly in initrd + machine.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") + machine.succeed("ip addr show >&2") + machine.succeed("ip route show >&2") ''; }; - testScript = '' - start_all() - basic.wait_for_unit("multi-user.target") - doFlush.wait_for_unit("multi-user.target") - dontFlush.wait_for_unit("multi-user.target") - # Make sure the systemd-network user was set correctly in initrd - basic.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") - basic.succeed("ip addr show >&2") - basic.succeed("ip route show >&2") + doFlush = mkFlushTest true '' + if ip addr | grep 10.0.2.15; then + echo "Network configuration survived switch-root; flushBeforeStage2 failed" + exit 1 + fi ''; -}) + + dontFlush = mkFlushTest false '' + if ! (ip addr | grep 10.0.2.15); then + echo "Network configuration didn't survive switch-root" + exit 1 + fi + ''; +} From 8900b027c73c389e4f3802225a790ef91e7a907f Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 20 Sep 2023 06:20:05 -0400 Subject: [PATCH 117/203] nixos/tests/systemd-initrd-networkd: Use initrdBackdoor --- nixos/tests/systemd-initrd-networkd.nix | 65 +++++++++++++------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/nixos/tests/systemd-initrd-networkd.nix b/nixos/tests/systemd-initrd-networkd.nix index 22a570520545..9c4ddb6e4b36 100644 --- a/nixos/tests/systemd-initrd-networkd.nix +++ b/nixos/tests/systemd-initrd-networkd.nix @@ -9,16 +9,28 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let inherit (lib.maintainers) elvishjerricco; + common = { + boot.initrd.systemd = { + enable = true; + network.wait-online.timeout = 10; + network.wait-online.anyInterface = true; + targets.network-online.requiredBy = [ "initrd.target" ]; + services.systemd-networkd-wait-online.requiredBy = + [ "network-online.target" ]; + initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; + }; + testing.initrdBackdoor = true; + boot.initrd.network.enable = true; + }; + mkFlushTest = flush: script: makeTest { name = "systemd-initrd-network-${lib.optionalString (!flush) "no-"}flush"; meta.maintainers = [ elvishjerricco ]; nodes.machine = { - boot.initrd.systemd.enable = true; - boot.initrd.network = { - enable = true; - flushBeforeStage2 = flush; - }; + imports = [ common ]; + + boot.initrd.network.flushBeforeStage2 = flush; systemd.services.check-flush = { requiredBy = ["multi-user.target"]; before = ["network-pre.target" "multi-user.target"]; @@ -31,6 +43,13 @@ let }; testScript = '' + machine.wait_for_unit("network-online.target") + machine.succeed( + "ip addr | grep 10.0.2.15", + "ping -c1 10.0.2.2", + ) + machine.switch_root() + machine.wait_for_unit("multi-user.target") ''; }; @@ -40,36 +59,18 @@ in { name = "systemd-initrd-network"; meta.maintainers = [ elvishjerricco ]; - nodes.machine = { - boot.initrd.network.enable = true; - - boot.initrd.systemd = { - enable = true; - # Enable network-online to fail the test in case of timeout - network.wait-online.timeout = 10; - network.wait-online.anyInterface = true; - targets.network-online.requiredBy = [ "initrd.target" ]; - services.systemd-networkd-wait-online.requiredBy = - [ "network-online.target" ]; - - initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; - services.check = { - requiredBy = [ "initrd.target" ]; - before = [ "initrd.target" ]; - after = [ "network-online.target" ]; - serviceConfig.Type = "oneshot"; - path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ]; - script = '' - ip addr | grep 10.0.2.15 || exit 1 - ping -c1 10.0.2.2 || exit 1 - ''; - }; - }; - }; + nodes.machine = common; testScript = '' - machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("network-online.target") + machine.succeed( + "ip addr | grep 10.0.2.15", + "ping -c1 10.0.2.2", + ) + machine.switch_root() + # Make sure the systemd-network user was set correctly in initrd + machine.wait_for_unit("multi-user.target") machine.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]") machine.succeed("ip addr show >&2") machine.succeed("ip route show >&2") From b41cbee0fd2531b00369c787b20f5b20f94cfc15 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 20 Sep 2023 18:19:22 -0400 Subject: [PATCH 118/203] nixos/tests/systemd-initrd-networkd-ssh: Test with backdoor not LUKS --- nixos/tests/systemd-initrd-networkd-ssh.nix | 52 ++++++--------------- 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/nixos/tests/systemd-initrd-networkd-ssh.nix b/nixos/tests/systemd-initrd-networkd-ssh.nix index 6aaa6c828f7b..d4c168f40e29 100644 --- a/nixos/tests/systemd-initrd-networkd-ssh.nix +++ b/nixos/tests/systemd-initrd-networkd-ssh.nix @@ -4,34 +4,16 @@ import ./make-test-python.nix ({ lib, ... }: { nodes = { server = { config, pkgs, ... }: { - environment.systemPackages = [ pkgs.cryptsetup ]; - boot.loader.systemd-boot.enable = true; - boot.loader.timeout = 0; - virtualisation = { - emptyDiskImages = [ 4096 ]; - useBootLoader = true; - # Booting off the encrypted disk requires an available init script from - # the Nix store - mountHostNixStore = true; - useEFIBoot = true; - }; - - specialisation.encrypted-root.configuration = { - virtualisation.rootDevice = "/dev/mapper/root"; - virtualisation.fileSystems."/".autoFormat = true; - boot.initrd.luks.devices = lib.mkVMOverride { - root.device = "/dev/vdb"; - }; - boot.initrd.systemd.enable = true; - boot.initrd.network = { + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; + boot.initrd.systemd.contents."/etc/msg".text = "foo"; + boot.initrd.network = { + enable = true; + ssh = { enable = true; - ssh = { - enable = true; - authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ]; - port = 22; - # Terrible hack so it works with useBootLoader - hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ]; - }; + authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ]; + port = 22; + hostKeys = [ ./initrd-network-ssh/ssh_host_ed25519_key ]; }; }; }; @@ -63,24 +45,16 @@ import ./make-test-python.nix ({ lib, ... }: { status, _ = client.execute("nc -z server 22") return status == 0 - server.wait_for_unit("multi-user.target") - server.succeed( - "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb", - "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf", - "sync", - ) - server.shutdown() - server.start() - client.wait_for_unit("network.target") with client.nested("waiting for SSH server to come up"): retry(ssh_is_up) - client.succeed( - "echo somepass | ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'systemd-tty-ask-password-agent' & exit" + msg = client.succeed( + "ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'cat /etc/msg'" ) + assert "foo" in msg + server.switch_root() server.wait_for_unit("multi-user.target") - server.succeed("mount | grep '/dev/mapper/root on /'") ''; }) From e9e2240763e409b9b634aa73712578be3fda6b1e Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 20 Sep 2023 06:26:03 -0400 Subject: [PATCH 119/203] nixos/tests/systemd-initrd-modprobe: Test parameter in stage 1 --- nixos/tests/systemd-initrd-modprobe.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/tests/systemd-initrd-modprobe.nix b/nixos/tests/systemd-initrd-modprobe.nix index bf635a10d0e9..0f93492176b4 100644 --- a/nixos/tests/systemd-initrd-modprobe.nix +++ b/nixos/tests/systemd-initrd-modprobe.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "systemd-initrd-modprobe"; nodes.machine = { pkgs, ... }: { + testing.initrdBackdoor = true; boot.initrd.systemd.enable = true; boot.initrd.kernelModules = [ "loop" ]; # Load module in initrd. boot.extraModprobeConfig = '' @@ -10,6 +11,12 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; testScript = '' + machine.wait_for_unit("initrd.target") + max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") + assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" + + # Make sure it sticks in stage 2 + machine.switch_root() machine.wait_for_unit("multi-user.target") max_loop = machine.succeed("cat /sys/module/loop/parameters/max_loop") assert int(max_loop) == 42, "Parameter should be respected for initrd kernel modules" From 4701361d2c4e7ca14a92575995138cc5ca207986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Nov 2023 23:45:22 +0000 Subject: [PATCH 120/203] circleci-cli: 0.1.29041 -> 0.1.29314 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5fb7386b08d4..7346469804ee 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.29041"; + version = "0.1.29314"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MEprN5I9ZWz4xTVdl4qZQHfbLbp4Khh63m37ZBq8pgA="; + sha256 = "sha256-RJ4WzKGmdfUHJASusVZqq8JKJlnrxxzV4IaZYuK8JTg="; }; - vendorHash = "sha256-EcQ5/zp041P4qi8nenrWuVItV3mFI3EHHRhKm/tqpfA="; + vendorHash = "sha256-eW36aQSK4W/HwTCPmeHIX53QN229KZhgGTb3oU10IcY="; nativeBuildInputs = [ installShellFiles ]; From 7628710dc9c58260791b187984b529bea7b64669 Mon Sep 17 00:00:00 2001 From: znaniye Date: Thu, 9 Nov 2023 12:31:16 -0300 Subject: [PATCH 121/203] spectmorph: 0.5.2 -> 0.6.1 --- pkgs/applications/audio/spectmorph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index 90348e7b80b1..8ae8001b6e5c 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "spectmorph"; - version = "0.5.2"; + version = "0.6.1"; src = fetchurl { - url = "https://spectmorph.org/files/releases/${pname}-${version}.tar.bz2"; - sha256 = "0yrq7mknhk096wfsx0q3b6wwa2w5la0rxa113di26rrrw136xl1f"; + url = "https://github.com/swesterfeld/spectmorph/releases/download/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-H/PaczAkjxeu2Q6S/jazZ0PU9oCmhBzsLgbGLusxXm8="; }; buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; From 1adb7308f87a0532ae89bd053837d61d77246ea0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 10 Nov 2023 03:38:56 +0100 Subject: [PATCH 122/203] python311Packages.awswrangler: fix hash --- pkgs/development/python-modules/awswrangler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 65f5bcf36e94..54ad818bb8a1 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-ZHEWG/A3lNwSw3MxguqjvgAOx5IHei43ku7GVJh8tLY="; + hash = "sha256-RjZWK7XfyRYu7vNaxPd0/F5nBN/JH01ZwZXloMS0g68="; }; nativeBuildInputs = [ From dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b Mon Sep 17 00:00:00 2001 From: 6t8k <58048945+6t8k@users.noreply.github.com> Date: Fri, 10 Nov 2023 02:49:43 +0100 Subject: [PATCH 123/203] digikam, kphotoalbum, photoqt: patches fixing build against exiv2 0.28.1 --- pkgs/applications/graphics/digikam/default.nix | 10 +++++++++- pkgs/applications/graphics/kphotoalbum/default.nix | 9 +++++++++ pkgs/applications/graphics/photoqt/default.nix | 7 ++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2a7e0e9ac0fc..be714028ec9a 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -67,6 +67,14 @@ mkDerivation rec { hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch"; + hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/graphics/kphotoalbum/default.nix b/pkgs/applications/graphics/kphotoalbum/default.nix index f8cb634cad70..6ff2f4339958 100644 --- a/pkgs/applications/graphics/kphotoalbum/default.nix +++ b/pkgs/applications/graphics/kphotoalbum/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, fetchpatch , fetchurl , lib , extra-cmake-modules @@ -25,6 +26,14 @@ mkDerivation rec { hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/kphotoalbum/-/commit/1ceb1ae37f3f95aa290b0846969af4b26f616760.patch"; + hash = "sha256-SfBJHyJZcysvemc/F09GPczBjcofxGomgjJ814PSU+c="; + }) + ]; + # not sure if we really need phonon when we have vlc, but on KDE it's bound to # be on the system anyway, so there is no real harm including it buildInputs = [ exiv2 phonon libvlc ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 6a7a57fd25f2..9513b92f60ac 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -30,8 +30,13 @@ stdenv.mkDerivation rec { hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; }; + postPatch = '' + # exiv2 0.28.1 + substituteInPlace CMakeLists.txt \ + --replace "exiv2lib" "exiv2" + '' # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? - postPatch = lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace cplusplus/main.cpp \ --replace "std::setlocale" "setlocale" ''; From 3e7461a4575a5e520d5277f292c01cb96c2f389e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 9 Nov 2023 22:17:44 -0500 Subject: [PATCH 124/203] sing-box: 1.6.2 -> 1.6.3 Diff: https://github.com/SagerNet/sing-box/compare/v1.6.2...v1.6.3 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 0833a457c9b6..93f1e6417168 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-LbgKgHny9RtowOGBQGW+ZSsxxzddTrSj2bvaC48HsU0="; + hash = "sha256-qwXBuU/hajWvR+VqMnOUGLDuTuLjbazSPjQ5jvVImJM="; }; - vendorHash = "sha256-uW9du8ySGQL9frGlNec6ISagiZtR/w8ZhMwpTmWllow="; + vendorHash = "sha256-2pGnpsgm4mvApvO1sMnRPTRS1unvpVPH9PGlr/S0KbY="; tags = [ "with_quic" From 0b74f7fd8d5085b4aadbc0ff6eda1a68cf4d3f57 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 9 Nov 2023 19:28:06 -0800 Subject: [PATCH 125/203] librewolf-unwrapped: 119.0-5 -> 119.0.1-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 7810db67afb3..afe766f841bc 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "119.0-5", + "packageVersion": "119.0.1-1", "source": { - "rev": "119.0-5", - "sha256": "0ql4i6b4fvydiyscj8ki2pnzr67bmb3azpdm6kk5y8yyw2697230" + "rev": "119.0.1-1", + "sha256": "1ghxrylxrb5i37i4z2hrb8dn9lndhs75pjvhdafg079jmar5wfn7" }, "settings": { - "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", - "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" + "rev": "095f50ed91aa7db2de9c67763cf46bae09146a58", + "sha256": "0nwrzcqxa72wcbxjbilxl340i69m5l0qr7gq2s6a76bbzxg502gi" }, "firefox": { - "version": "119.0", - "sha512": "4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c" + "version": "119.0.1", + "sha512": "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a" } } From 6e824a29ab0facfd78950043c2c42303bd01c0d5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 10 Nov 2023 04:28:51 +0100 Subject: [PATCH 126/203] snapraid: disable tests on x86_64-darwin --- pkgs/tools/filesystems/snapraid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index 9ce1461ffaee..d945a4a40094 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { VERSION = version; - doCheck = true; + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ]; From 70a2dc87f69c340f0f06eb67e119e4c82fb1eab0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 10 Nov 2023 04:28:38 +0100 Subject: [PATCH 127/203] ps3netsrv: fix build on darwin --- pkgs/servers/ps3netsrv/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 51ab46ec73b9..30ca1318b9cf 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, mbedtls, meson, ninja, fetchFromGitHub }: +{ lib, stdenv, fetchzip, mbedtls, meson, ninja }: let webManModVersion = "1.47.42"; in @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { mbedtls ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Doff64_t=off_t"; + postInstall = '' install -Dm644 ../LICENSE.TXT $out/usr/share/licenses/${pname}/LICENSE.TXT ''; From 1d8d40f5672d4a873299970bec1879287597db9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 04:02:52 +0000 Subject: [PATCH 128/203] python310Packages.pipdeptree: 2.13.0 -> 2.13.1 --- pkgs/development/python-modules/pipdeptree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 250ad2f2399d..7e15814fa684 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.13.0"; + version = "2.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-mblj6SQK/az2al81wMiWXHuyn1+30jfAxrWGv9Nw/gw="; + hash = "sha256-rlnJmGe9LYwIJxV02IjiKtT1iS1O9ik8dAfjsPHsa8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 460e1775379f40f6180c735a48fcbce0b563292a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Nov 2023 04:20:00 +0000 Subject: [PATCH 129/203] python311Packages.myst-nb: 0.17.2 -> 1.0.0 Changelog: https://github.com/executablebooks/MyST-NB/raw/v1.0.0/CHANGELOG.md --- .../python-modules/myst-nb/default.nix | 40 +++---------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 33c06fc24619..cf3d309420eb 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , flit-core , importlib-metadata , ipython @@ -15,46 +14,23 @@ , sphinx-togglebutton , typing-extensions , ipykernel -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "myst-nb"; - version = "0.17.2"; + version = "1.0.0"; + pyproject = true; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs="; + inherit version; + pname = "myst_nb"; + hash = "sha256-kHfkKhxrRB6lUHhQb4NVXdpdbIFu9JMIQdcdI54+DF4="; }; - patches = [ - # Fix compatiblity with myst-parser 1.0. Remove with the next release. - (fetchpatch { - url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch"; - hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8="; - excludes = [ - "myst_nb/__init__.py" - "docs/authoring/custom-formats.Rmd" - "docs/authoring/jupyter-notebooks.md" - "docs/index.md" - "pyproject.toml" - "tests/nb_fixtures/reporter_warnings.txt" - ]; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "myst-parser~=0.18.0" "myst-parser" - ''; - nativeBuildInputs = [ flit-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -71,10 +47,6 @@ buildPythonPackage rec { ipykernel ]; - pythonRelaxDeps = [ - "myst-parser" - ]; - pythonImportsCheck = [ "myst_nb" "myst_nb.sphinx_ext" From 00309155385e7685025de8da1d06f6f8fd11d04d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 10 Nov 2023 04:20:00 +0000 Subject: [PATCH 130/203] flexget: 3.9.16 -> 3.9.18 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.9.16...v3.9.18 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.9.18 --- 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 47a3b35f0256..792d5c93a9e5 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.16"; + version = "3.9.18"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-p92wiQ01NBFs5910wngkNHnE/mOfs9XnOLUEOyk9VpA="; + hash = "sha256-Wxi6+6c/PK990YCoFKBMxJbYgMkS9y46hNIlkVhjbA4="; }; postPatch = '' From 8f2a61be216e6072143f4a268c81652166f8dc3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 04:24:02 +0000 Subject: [PATCH 131/203] python310Packages.plexapi: 4.15.4 -> 4.15.5 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 57b4cb430b77..fc177fc433cb 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.4"; + version = "4.15.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-NBV4jrLfU5vqQljQh28tJxgaNSo/ilph8xsjdVKCOJg="; + hash = "sha256-kguy8sZtc8vHuWWqQqPPuDE5DgyWs/H62yxjv5VabFY="; }; propagatedBuildInputs = [ From c6ebe127135b0612a44e551dde6e8a3e87a55099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 06:06:48 +0000 Subject: [PATCH 132/203] python310Packages.py3status: 3.53 -> 3.54 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d635a6a4a88c..45ac825c6a56 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.53"; + version = "3.54"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vZrzHERjAg9J004A2dAbq8hKmAUslCTaRdwEAe9JRqU="; + hash = "sha256-xRiXFCILZeiNYJMIJ8Qxga71/7WXeTUsdnRvfvDzpCY="; }; nativeBuildInputs = [ From 3ad4d2b99b89c0c9bf3c6635b4335e6224417c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 06:14:19 +0000 Subject: [PATCH 133/203] asnmap: 1.0.5 -> 1.0.6 --- pkgs/tools/security/asnmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index b2c58136d9a8..44f2e09fc1a9 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JdbKFc374U/MjRiLUbVOqb7qeFYpvMevUdis7GDZz3Y="; + hash = "sha256-uX7mf1y30JngRI4UJYzghk2F4DZh9OQAjgkkNRbAgwc="; }; - vendorHash = "sha256-3/R8dhaJnoAsJgD4pqZ7etTXDFZnhW9sbUrnGp4md5o="; + vendorHash = "sha256-co18Q8nfRjJyDfpmJ1YSJ275DJRJHn2AR3jF8WionNY="; # Tests require network access doCheck = false; From b0b2f16bb9d8ee9c3aee1614ac35f02d2bb86671 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 10 Nov 2023 15:22:32 +0900 Subject: [PATCH 134/203] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1801560](https://hydra.nixos.org/eval/1801560) of nixpkgs commit [f10a9c9](https://github.com/NixOS/nixpkgs/commits/f10a9c90947faa4a399e6c98c9fa0ee5c4ae51c5) as of 2023-11-10 04:13 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 21 +++++++++ .../transitive-broken.yaml | 7 +-- .../haskell-modules/hackage-packages.nix | 47 +++++++++++++++++-- 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0805f78768d4..2088641aa531 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -99,6 +99,8 @@ broken-packages: - affection # failure in job https://hydra.nixos.org/build/233213076 at 2023-09-02 - affine-invariant-ensemble-mcmc # failure in job https://hydra.nixos.org/build/233237176 at 2023-09-02 - Agata # failure in job https://hydra.nixos.org/build/233221026 at 2023-09-02 + - agda2hs # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239252884 at 2023-11-10 + - agda2train # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239247619 at 2023-11-10 - Agda-executable # failure in job https://hydra.nixos.org/build/233332629 at 2023-09-02 - agda-language-server # failure in job https://hydra.nixos.org/build/233332694 at 2023-09-02 - agda-snippets # failure in job https://hydra.nixos.org/build/233332749 at 2023-09-02 @@ -1238,6 +1240,7 @@ broken-packages: - disjoint-set # failure in job https://hydra.nixos.org/build/233201934 at 2023-09-02 - disjoint-set-stateful # failure in job https://hydra.nixos.org/build/233253300 at 2023-09-02 - diskhash # failure in job https://hydra.nixos.org/build/233230362 at 2023-09-02 + - disposable # timeout - distance # failure in job https://hydra.nixos.org/build/233255082 at 2023-09-02 - Dist # failure in job https://hydra.nixos.org/build/233217811 at 2023-09-02 - distributed-closure # failure in job https://hydra.nixos.org/build/233223516 at 2023-09-02 @@ -1505,6 +1508,7 @@ broken-packages: - extensible-data # failure in job https://hydra.nixos.org/build/233198917 at 2023-09-02 - extensible-effects-concurrent # failure in job https://hydra.nixos.org/build/233233685 at 2023-09-02 - extensioneer # failure in job https://hydra.nixos.org/build/233663099 at 2023-09-02 + - extensions # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239249292 at 2023-11-10 - external-sort # failure in job https://hydra.nixos.org/build/233244337 at 2023-09-02 - extism # failure in job https://hydra.nixos.org/build/233242807 at 2023-09-02 - extism-pdk # failure in job https://hydra.nixos.org/build/237239071 at 2023-10-21 @@ -1623,6 +1627,7 @@ broken-packages: - flay # failure in job https://hydra.nixos.org/build/233235511 at 2023-09-02 - flexible-time # failure in job https://hydra.nixos.org/build/233208099 at 2023-09-02 - flickr # failure in job https://hydra.nixos.org/build/233212718 at 2023-09-02 + - Flint2 # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239246414 at 2023-11-10 - float-binstring # failure in job https://hydra.nixos.org/build/233203257 at 2023-09-02 - floating-bits # failure in job https://hydra.nixos.org/build/233223171 at 2023-09-02 - flock # failure in job https://hydra.nixos.org/build/233245164 at 2023-09-02 @@ -1829,7 +1834,9 @@ broken-packages: - ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02 - ghci-lib # failure in job https://hydra.nixos.org/build/233216644 at 2023-09-02 - ghci-ng # failure in job https://hydra.nixos.org/build/233229533 at 2023-09-02 + - ghcjs-base-stub # timeout - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 + - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02 @@ -1850,11 +1857,13 @@ broken-packages: - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02 - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02 - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02 + - gi-adwaita # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239685049 at 2023-11-10 - giak # failure in job https://hydra.nixos.org/build/233242229 at 2023-09-02 - gi-clutter # failure in job https://hydra.nixos.org/build/233252753 at 2023-09-02 - gi-coglpango # failure in job https://hydra.nixos.org/build/233194401 at 2023-09-02 - Gifcurry # failure in job https://hydra.nixos.org/build/233200204 at 2023-09-02 - gi-gio-hs-list-model # failure in job https://hydra.nixos.org/build/233241640 at 2023-09-02 + - gi-gsk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/239849990 at 2023-11-10 - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02 - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/233217494 at 2023-09-02 - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 @@ -2856,6 +2865,7 @@ broken-packages: - interruptible # failure in job https://hydra.nixos.org/build/233209873 at 2023-09-02 - interval-algebra # failure in job https://hydra.nixos.org/build/233208487 at 2023-09-02 - interval # failure in job https://hydra.nixos.org/build/233239434 at 2023-09-02 + - interval-patterns # failure in job https://hydra.nixos.org/build/239259401 at 2023-11-10 - interval-tree-clock # failure in job https://hydra.nixos.org/build/233234316 at 2023-09-02 - IntFormats # failure in job https://hydra.nixos.org/build/233195190 at 2023-09-02 - int-interval-map # failure in job https://hydra.nixos.org/build/233244556 at 2023-09-02 @@ -2924,6 +2934,7 @@ broken-packages: - java-adt # failure in job https://hydra.nixos.org/build/233256402 at 2023-09-02 - java-bridge # failure in job https://hydra.nixos.org/build/233219258 at 2023-09-02 - javascript-bridge # failure in job https://hydra.nixos.org/build/233217052 at 2023-09-02 + - javascript-extras # timeout - Javav # failure in job https://hydra.nixos.org/build/233243825 at 2023-09-02 - javav # failure in job https://hydra.nixos.org/build/233246644 at 2023-09-02 - jbi # failure in job https://hydra.nixos.org/build/233221466 at 2023-09-02 @@ -3021,6 +3032,7 @@ broken-packages: - kawhi # failure in job https://hydra.nixos.org/build/233193086 at 2023-09-02 - kdesrc-build-extra # failure in job https://hydra.nixos.org/build/233193718 at 2023-09-02 - kd-tree # failure in job https://hydra.nixos.org/build/233207928 at 2023-09-02 + - kdt # test failure in job https://hydra.nixos.org/build/239264029 at 2023-11-10 - keccak # failure in job https://hydra.nixos.org/build/233200469 at 2023-09-02 - keenser # failure in job https://hydra.nixos.org/build/233200021 at 2023-09-02 - keera-hails-reactivevalues # failure in job https://hydra.nixos.org/build/233258391 at 2023-09-02 @@ -3583,6 +3595,7 @@ broken-packages: - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02 - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02 - monus # failure in job https://hydra.nixos.org/build/233252424 at 2023-09-02 + - monus-weighted-search # timeout - monzo # failure in job https://hydra.nixos.org/build/233254681 at 2023-09-02 - morfette # failure in job https://hydra.nixos.org/build/233249575 at 2023-09-02 - morfeusz # failure in job https://hydra.nixos.org/build/233232351 at 2023-09-02 @@ -3725,6 +3738,7 @@ broken-packages: - networked-game # failure in job https://hydra.nixos.org/build/233239577 at 2023-09-02 - network-house # failure in job https://hydra.nixos.org/build/233193957 at 2023-09-02 - network-manager-tui # failure in job https://hydra.nixos.org/build/233247972 at 2023-09-02 + - network-messagepack-rpc-websocket # timeout - network-metrics # failure in job https://hydra.nixos.org/build/233259963 at 2023-09-02 - network-msg # failure in job https://hydra.nixos.org/build/233236413 at 2023-09-02 - network-msgpack-rpc # failure in job https://hydra.nixos.org/build/233222467 at 2023-09-02 @@ -4696,6 +4710,7 @@ broken-packages: - ron # failure in job https://hydra.nixos.org/build/233197052 at 2023-09-02 - rope # failure in job https://hydra.nixos.org/build/233198109 at 2023-09-02 - rosebud # failure in job https://hydra.nixos.org/build/233225772 at 2023-09-02 + - rose-trees # timeout - rosmsg # failure in job https://hydra.nixos.org/build/233248569 at 2023-09-02 - rospkg # failure in job https://hydra.nixos.org/build/233229989 at 2023-09-02 - rosso # failure in job https://hydra.nixos.org/build/233230103 at 2023-09-02 @@ -5010,6 +5025,7 @@ broken-packages: - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02 - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02 - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02 + - skews # timeout - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02 - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02 - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02 @@ -5469,6 +5485,7 @@ broken-packages: - thank-you-stars # failure in job https://hydra.nixos.org/build/233219923 at 2023-09-02 - th-build # failure in job https://hydra.nixos.org/build/233224794 at 2023-09-02 - th-dict-discovery # failure in job https://hydra.nixos.org/build/233204140 at 2023-09-02 + - theatre-dev # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/239251083 at 2023-11-10 - THEff # failure in job https://hydra.nixos.org/build/233221239 at 2023-09-02 - themoviedb # failure in job https://hydra.nixos.org/build/233233008 at 2023-09-02 - thentos-cookie-session # failure in job https://hydra.nixos.org/build/233234700 at 2023-09-02 @@ -5613,6 +5630,7 @@ broken-packages: - tremulous-query # failure in job https://hydra.nixos.org/build/233200947 at 2023-09-02 - TrendGraph # failure in job https://hydra.nixos.org/build/233258651 at 2023-09-02 - trhsx # failure in job https://hydra.nixos.org/build/233231297 at 2023-09-02 + - tries # timeout - trim # failure in job https://hydra.nixos.org/build/233195034 at 2023-09-02 - tripLL # failure in job https://hydra.nixos.org/build/233217806 at 2023-09-02 - trivia # failure in job https://hydra.nixos.org/build/233234176 at 2023-09-02 @@ -6015,6 +6033,7 @@ broken-packages: - wsdl # failure in job https://hydra.nixos.org/build/233208187 at 2023-09-02 - wsedit # failure in job https://hydra.nixos.org/build/233232333 at 2023-09-02 - ws # failure building executable 'ws' in job https://hydra.nixos.org/build/237237311 at 2023-10-21 + - wss-client # timeout - wtk # failure in job https://hydra.nixos.org/build/233220668 at 2023-09-02 - wumpus-core # failure in job https://hydra.nixos.org/build/233244405 at 2023-09-02 - wxdirect # failure in job https://hydra.nixos.org/build/233255519 at 2023-09-02 @@ -6188,7 +6207,9 @@ broken-packages: - zeolite-lang # failure in job https://hydra.nixos.org/build/233217146 at 2023-09-02 - zero # failure in job https://hydra.nixos.org/build/233209286 at 2023-09-02 - zeromq3-haskell # failure in job https://hydra.nixos.org/build/233215557 at 2023-09-02 + - zeromq4-clone-pattern # timeout - zeromq4-conduit # failure in job https://hydra.nixos.org/build/233198244 at 2023-09-02 + - zeromq4-patterns # timeout - zeromq-haskell # failure in job https://hydra.nixos.org/build/233196050 at 2023-09-02 - zettelkast # failure in job https://hydra.nixos.org/build/233211485 at 2023-09-02 - ZFS # failure in job https://hydra.nixos.org/build/233257824 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 8939090da07c..9eaabf6c8a13 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -22,7 +22,6 @@ dont-distribute-packages: - Advise-me - AlgoRhythm - AlignmentAlgorithms - - Allure - AndroidViewHierarchyImporter - Annotations - ApplePush @@ -254,7 +253,6 @@ dont-distribute-packages: - LDAPv3 - LPFP - LPPaver - - LambdaHack - LambdaINet - LambdaPrettyQuote - LambdaShell @@ -1502,6 +1500,7 @@ dont-distribute-packages: - gi-ges - gi-gstpbutils - gi-gtk-declarative-app-simple + - gi-gtk_4_0_8 - git-config - git-fmt - git-gpush @@ -1727,8 +1726,6 @@ dont-distribute-packages: - gogol-youtube-reporting - google-drive - google-mail-filters - - google-maps-geocoding - - google-static-maps - googleplus - gore-and-ash-actor - gore-and-ash-async @@ -1894,7 +1891,6 @@ dont-distribute-packages: - haskell-pdf-presenter - haskell-platform-test - haskell-reflect - - haskell-snake - haskell-src-exts-observe - haskell-token-utils - haskell-tools-ast @@ -4034,7 +4030,6 @@ dont-distribute-packages: - universe-dependent-sum - universe-th - unix-fcntl - - unleash-client-haskell - unpacked-these - unpacked-validation - unparse-attoparsec diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d40af7db4810..e873267d9ed5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -996,7 +996,6 @@ self: { description = "Near-future Sci-Fi roguelike and tactical squad combat game"; license = lib.licenses.agpl3Plus; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "Allure"; }) {}; @@ -6389,6 +6388,8 @@ self: { testHaskellDepends = [ base ]; description = "Haskell bindings for the flint library for number theory"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) flint; inherit (pkgs) gmp;}; "Flippi" = callPackage @@ -12948,7 +12949,6 @@ self: { description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "LambdaHack"; }) {}; @@ -27089,7 +27089,9 @@ self: { ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "agda2hs"; + broken = true; }) {}; "agda2lagda" = callPackage @@ -27133,7 +27135,9 @@ self: { doHaddock = false; description = "Agda backend to generate training data for machine learning purposes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "agda2train"; + broken = true; }) {}; "agentx" = callPackage @@ -88684,6 +88688,8 @@ self: { libraryHaskellDepends = [ base ghcjs-base-stub stm ]; description = "Allows storing different resource-releasing actions together"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dist-upload" = callPackage @@ -101933,7 +101939,9 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; + broken = true; }) {}; "external-sort" = callPackage @@ -118463,6 +118471,8 @@ self: { ]; description = "Allow GHCJS projects to compile under GHC and develop using intero"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcjs-codemirror" = callPackage @@ -118569,6 +118579,8 @@ self: { ]; description = "GHCJS bindings for the JavaScript Fetch API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghcjs-hplay" = callPackage @@ -118857,6 +118869,8 @@ self: { description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) libadwaita;}; "gi-atk" = callPackage @@ -119398,6 +119412,8 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage @@ -125758,7 +125774,6 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -125893,7 +125908,6 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "google-translate" = callPackage @@ -136906,7 +136920,6 @@ self: { description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "haskell-snake"; }) {}; @@ -170918,6 +170931,8 @@ self: { ]; description = "Intervals, and monoids thereof"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "interval-tree-clock" = callPackage @@ -174121,7 +174136,9 @@ self: { executableHaskellDepends = [ base ghcjs-base-stub ]; description = "Extra javascript functions when using GHCJS"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "javascript-extras-test"; + broken = true; }) {}; "javasf" = callPackage @@ -178120,6 +178137,8 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "keccak" = callPackage @@ -204951,6 +204970,8 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; description = "Efficient search weighted by an ordered monoid with monus"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monzo" = callPackage @@ -212483,6 +212504,8 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -258205,6 +258228,8 @@ self: { ]; description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rose-trie" = callPackage @@ -274651,6 +274676,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -299037,6 +299064,8 @@ self: { testHaskellDepends = [ hspec rerebase ]; description = "Minimalistic actor library experiments"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "themoviedb" = callPackage @@ -305233,6 +305262,8 @@ self: { ]; description = "Various trie implementations in Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "trifecta" = callPackage @@ -324385,6 +324416,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -332440,7 +332473,9 @@ self: { ]; description = "Haskell implementation of the ZeroMQ clone pattern"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-clone-pattern-exe"; + broken = true; }) {}; "zeromq4-conduit" = callPackage @@ -332505,7 +332540,9 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "zeromq4-patterns-exe"; + broken = true; }) {}; "zeromq4-simple" = callPackage From 5622db03b90327b3a9c5ce2ae06d19d9b24379c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 06:26:07 +0000 Subject: [PATCH 135/203] croc: 9.6.5 -> 9.6.6 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index eb9311240f7d..ffc8579869ca 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.5"; + version = "9.6.6"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mbDpd2bkNKRhe19f8sLJJnm9DkFWZ12fPqPDGN7pvCc="; + sha256 = "sha256-y2uS6GlqxfBpLE+6cOl+vLI+KSZ1ThFMjnUNEGplnxM="; }; - vendorHash = "sha256-Nw0d/+EQlB0DJRciB2WD0MKZ4HSYY7oSv0ddMPN0CIQ="; + vendorHash = "sha256-JLNbRmiO38M+JQiSJfxFcdFYrEyNBA1KOHnxbjaCusE="; subPackages = [ "." ]; From 21a34448fea8997476207087d895c6dc5858f983 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 06:29:30 +0000 Subject: [PATCH 136/203] gitsign: 0.7.1 -> 0.8.0 --- pkgs/applications/version-management/gitsign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index 5da7aab1b6f9..cf804ddfb54c 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-99JpuABkPHTNy9OpvRL7aIe1ZTrs2uZvxtxZf8346Ao="; + hash = "sha256-COgoj5MrX7VBwjgfH+Ud7gp0gE7gpsYoyd0Jv4uXoec="; }; - vendorHash = "sha256-+EKC/Up48EjwfVhLTpoxctWCSMDL0kLZaRPLBl0JGFQ="; + vendorHash = "sha256-btvFro0K0+9potwForIj/7h41l+LbUE0Gym9aHaWtEE="; subPackages = [ "." From f3557b9c856769591d8910ddf4bafd7584094fb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 06:45:35 +0000 Subject: [PATCH 137/203] ledger-live-desktop: 2.69.0 -> 2.71.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index fffa95566bf4..8ba06230bb27 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.69.0"; + version = "2.71.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI="; + hash = "sha256-boZ28o8bg2TXZcc1mx4ZlPIPRFK9wy4+MTbYLT5XCQU="; }; appimageContents = appimageTools.extractType2 { From ad70153e43ebea622bacdc3e2dd39576fe3f6a72 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 10 Nov 2023 07:58:15 +0100 Subject: [PATCH 138/203] ruff-lsp: 0.0.42 -> 0.0.45 Changelog: https://github.com/astral-sh/ruff-lsp/releases/tag/v0.0.45 --- .../development/tools/language-servers/ruff-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index d91ec72ea6ae..5b40af17c330 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,15 +16,15 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.42"; + version = "0.0.45"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff-lsp"; - rev = "v${version}"; - hash = "sha256-Dn/xPjYCyJYlDNMUfl61L/tWq5mRJ8WD0G5qZH9OepY="; + rev = "refs/tags/v${version}"; + hash = "sha256-jTLkex2K/IQTKZp2duM26/EaYhG5E2bGs/QKt5PA7lc="; }; postPatch = '' From 4528b23fa4c0c0939ce8e0fec5f7287ab51a38c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 07:17:44 +0000 Subject: [PATCH 139/203] python311Packages.auth0-python: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 165665b5a1b3..3b0cc0eb8030 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-kWlfckSjBxgzLd1ND4M0btt/+zfSHj5h4V/uDLmnHaA="; + hash = "sha256-KNhuonqFt+KrRYctQ426FcnzxISp5sBRs28hFL/Du0Q="; }; nativeBuildInputs = [ From 6a63b4a97aecc5018280c945962ae43ef8b38143 Mon Sep 17 00:00:00 2001 From: ineol Date: Fri, 10 Nov 2023 08:37:23 +0100 Subject: [PATCH 140/203] coqPackages.iris-named-props: new expression (#263100) --- .../coq-modules/iris-named-props/default.nix | 17 +++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/coq-modules/iris-named-props/default.nix diff --git a/pkgs/development/coq-modules/iris-named-props/default.nix b/pkgs/development/coq-modules/iris-named-props/default.nix new file mode 100644 index 000000000000..c4d167750432 --- /dev/null +++ b/pkgs/development/coq-modules/iris-named-props/default.nix @@ -0,0 +1,17 @@ +{ lib, mkCoqDerivation, coq, version ? null, iris }: + +mkCoqDerivation rec { + pname = "iris-named-props"; + owner = "tchajed"; + inherit version; + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.16" "8.18"; out = "2023-08-14"; } + ] null; + release."2023-08-14".sha256 = "sha256-gu9qOdHO0qJ2B9Y9Vf66q08iNJcfuECJO66fizFB08g="; + release."2023-08-14".rev = "ca1871dd33649f27257a0fbf94076acc80ecffbc"; + propagatedBuildInputs = [ iris ]; + meta = { + description = "Named props for Iris"; + maintainers = with lib.maintainers; [ ineol ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5ca5e3867d5c..7c72f34fdbef 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -70,6 +70,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + iris-named-props = callPackage ../development/coq-modules/iris-named-props {}; itauto = callPackage ../development/coq-modules/itauto { }; ITree = callPackage ../development/coq-modules/ITree { }; LibHyps = callPackage ../development/coq-modules/LibHyps {}; From e06c716ef149f466f25e62a836c30b90476e65e5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Nov 2023 08:38:13 +0100 Subject: [PATCH 141/203] =?UTF-8?q?coqPackages.interval:=204.8.0=20?= =?UTF-8?q?=E2=86=92=204.9.0=20(#266082)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/interval/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 1e31323f2e36..9ac4f1c383a9 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -7,6 +7,7 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "4.9.0"; } { case = range "8.12" "8.17"; out = "4.8.0"; } { case = range "8.12" "8.16"; out = "4.6.0"; } { case = range "8.8" "8.16"; out = "4.5.2"; } @@ -14,6 +15,8 @@ mkCoqDerivation rec { { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.9.0".sha256 = "sha256-+5NppyQahcc1idGu/U3B+EIWuZz2L3/oY7dIJR6pitE="; + release."4.8.1".sha256 = "sha256-gknZ3bA90YY2AvwfFsP5iMhohwkQ8G96mH+4st2RPDc="; release."4.8.0".sha256 = "sha256-YPQ1tuUgGixAVdQUJ9a3lZUNVgm2pKK3RKvl3m+/8rY="; release."4.7.0".sha256 = "sha256-Cel25w4BeaNqu9KAW3N2KYO2IGY0EOAK5FQ6VHBPmFQ="; release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0="; From 1557486c60a6993c3e2de82f4a0eaba84a317e40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 07:52:43 +0000 Subject: [PATCH 142/203] python311Packages.pymediainfo: 6.0.1 -> 6.1.0 --- pkgs/development/python-modules/pymediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index e511c24fccde..4c8d6aee1e49 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; + hash = "sha256-GGoLQalFJPCYTQhcprlFx5olRGW3CX8lYNwMBOjR2KU="; }; postPatch = '' From 3b3f0a24ec4dceedcb6d55081a7eaec972e76aab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 09:12:02 +0100 Subject: [PATCH 143/203] python311Packages.aioelectricitymaps: 0.1.4 -> 0.1.5 Diff: https://github.com/jpbede/aioelectricitymaps/compare/refs/tags/v0.1.4...v0.1.5 Changelog: https://github.com/jpbede/aioelectricitymaps/releases/tag/v0.1.5 --- .../development/python-modules/aioelectricitymaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index 8aca66a80b4c..79a07c06e9e9 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioelectricitymaps"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aioelectricitymaps"; rev = "refs/tags/v${version}"; - hash = "sha256-Whg3F4Oyfqn2Lod44e15Pxc3m0dEB2F+MK0bvEM7c7w="; + hash = "sha256-XJw3oy5IHyXmdoVxSU15dWHcc4Wd435Lyr/wpz53aZI="; }; nativeBuildInputs = [ From 9c56fb315cf798a94a50d74fe8d6612c634eb2dd Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 10 Nov 2023 08:12:43 +0000 Subject: [PATCH 144/203] brook: pin to go1.20 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8388ef624c6b..f79b0c0d3b8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4471,7 +4471,10 @@ with pkgs; brltty = callPackage ../tools/misc/brltty { }; - brook = callPackage ../tools/networking/brook { }; + brook = callPackage ../tools/networking/brook { + # See https://hydra.nixos.org/build/239027853/nixlog/2. + buildGoModule = buildGo120Module; + }; broot = callPackage ../tools/misc/broot { inherit (darwin.apple_sdk.frameworks) Security; From 41eb1ba8d2b590179589fa4d9bcfb1b4da7e563a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 09:13:33 +0100 Subject: [PATCH 145/203] python311Packages.censys: 2.2.8 -> 2.2.9 Diff: https://github.com/censys/censys-python/compare/refs/tags/v2.2.8...v2.2.9 Changelog: https://github.com/censys/censys-python/releases/tag/v2.2.9 --- pkgs/development/python-modules/censys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 15fba8b6a654..9c24281e8d62 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.8"; + version = "2.2.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9g0UmG2MJN1GB4ny/BvMV0ipID4w9e5P+NJnpd6DqeI="; + hash = "sha256-Q6Ii2fsJYNABhuaRK4nZ6bjjvNsoIcgNVFBXdBgTXIo="; }; nativeBuildInputs = [ From 160acaa20e67ba48995590fddf1463ce2c3b1164 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 09:14:53 +0100 Subject: [PATCH 146/203] python311Packages.pyoverkiz: 1.13.0 -> 1.13.1 Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.13.0...v1.13.1 Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.13.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 6a5f62eb262b..29c131a12f9f 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.0"; + version = "1.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-3sfsaVf7yatxsfxbKPTewi8hGSW5IJP1jczBGz6Qqmw="; + hash = "sha256-55oqrVjvbdwNn5S3YQVU3saWtFHhoUCcyW9VzXs87YM="; }; postPatch = '' From f80124c2af0f2fb12c359ea8cde25eca1180fd41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 09:20:52 +0100 Subject: [PATCH 147/203] python311Packages.annexremote: 1.6.0 -> 1.6.4 Diff: https://github.com/Lykos153/AnnexRemote/compare/refs/tags/v1.6.0...v1.6.4 Changelog: https://github.com/Lykos153/AnnexRemote/releases/tag/v1.6.4 --- .../python-modules/annexremote/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index 46e937eb8dae..02067d4ebaa9 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -1,33 +1,34 @@ { lib -, isPy3k , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, nose , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "annexremote"; - version = "1.6.0"; - format = "setuptools"; + version = "1.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Lykos153"; repo = "AnnexRemote"; - rev = "v${version}"; - sha256 = "sha256-h03gkRAMmOq35zzAq/OuctJwPAbP0Idu4Lmeu0RycDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-eBq1nZnNuzTLvc11G/XaenZlVEUke3kpWlZ7P5g4kc8="; }; - nativeCheckInputs = [ - nose + nativeBuildInputs = [ + setuptools + setuptools-scm ]; - checkPhase = '' - nosetests -v -e "^TestExport_MissingName" -e "^TestRemoveexportdirectory" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "annexremote" @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper module to easily develop git-annex remotes"; homepage = "https://github.com/Lykos153/AnnexRemote"; + changelog = "https://github.com/Lykos153/AnnexRemote/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ montag451 ]; }; From 11b441293478339618d79a9c59017b3e450a3f1c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Nov 2023 08:32:34 +0000 Subject: [PATCH 148/203] sudo: 1.9.15p1 -> 1.9.15p2 Changes: https://www.sudo.ws/releases/stable/#1.9.15p2 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 28ee46b89e62..e286f7e7aee3 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.15p1"; + version = "1.9.15p2"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-Fmw3q5NFShgYb5Iv5k7VzWe6bd28sO+6LfWJhyPclHQ="; + hash = "sha256-GZwM2/p+/P/6nIhoSo4vsgamK3CjFlB+SpHInIc7vMg="; }; prePatch = '' From 7c4874fa9f935a31c230896be12992ae2b2f45bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 10 Nov 2023 09:45:51 +0100 Subject: [PATCH 149/203] python311Packages.azure-appconfiguration: 1.4.0 -> 1.5.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_1.5.0/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md --- .../azure-appconfiguration/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index db43d7770d2b..40726506f72b 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -1,27 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, azure-core -, msrest +{ lib +, pythonOlder +, isodate +, fetchPypi +, buildPythonPackage +, azure-core }: buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-fzZyT6j3K90FClJawf3o0F2TSMSu5pVqZvP8yJwTdBc="; + hash = "sha256-cJIRe68GzY6T7ukhN+coF2m0AD/EFtSh7aZGuyVkAnw="; }; propagatedBuildInputs = [ azure-core - msrest + isodate ]; - pythonImportsCheck = [ "azure.appconfiguration" ]; + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "azure.appconfiguration" + ]; meta = with lib; { description = "Microsoft App Configuration Data Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; From ab2e448dc4a39900c8fe405de5a0fbf45e6ce183 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 8 Nov 2023 14:00:45 +0100 Subject: [PATCH 150/203] lwgrp: init at 1.0.5 --- pkgs/by-name/lw/lwgrp/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/lw/lwgrp/package.nix diff --git a/pkgs/by-name/lw/lwgrp/package.nix b/pkgs/by-name/lw/lwgrp/package.nix new file mode 100644 index 000000000000..c9c657bee32a --- /dev/null +++ b/pkgs/by-name/lw/lwgrp/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, mpi, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "lwgrp"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "lwgrp"; + rev = "v${version}"; + hash = "sha256-f0tYn9FbrOz8iMoG8Is8vYDNfYHTfxLKNnyxJA+Msdk="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Data structures and operations to group MPI processes as an ordered set"; + homepage = "https://github.com/LLNL/lwgrp"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} From 55a71be4607748bb8dbf0306683f8f6559a27c72 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 8 Nov 2023 14:02:11 +0100 Subject: [PATCH 151/203] dtcmp: init at 1.1.5 --- pkgs/by-name/dt/dtcmp/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/dt/dtcmp/package.nix diff --git a/pkgs/by-name/dt/dtcmp/package.nix b/pkgs/by-name/dt/dtcmp/package.nix new file mode 100644 index 000000000000..cd8f54e25d31 --- /dev/null +++ b/pkgs/by-name/dt/dtcmp/package.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, mpi, lwgrp }: + +stdenv.mkDerivation rec { + pname = "dtcmp"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "LLNL"; + repo = "dtcmp"; + rev = "v${version}"; + hash = "sha256-Dc+c8JCc5D23CtpwiWkHCqngywEZXw7cYsRiSYiQdWk="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ lwgrp ]; + + configureFlags = [ "--with-lwgrp=${lib.getDev lwgrp}" ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "MPI datatype comparison library"; + homepage = "https://github.com/LLNL/dtcmp"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} From e068478ba207bfcbdb3ef82789092bc49b68b353 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 8 Nov 2023 14:02:39 +0100 Subject: [PATCH 152/203] libcircle: init at 0.3 --- pkgs/by-name/li/libcircle/package.nix | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/li/libcircle/package.nix diff --git a/pkgs/by-name/li/libcircle/package.nix b/pkgs/by-name/li/libcircle/package.nix new file mode 100644 index 000000000000..d176bbacc89f --- /dev/null +++ b/pkgs/by-name/li/libcircle/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, mpi +, lwgrp +}: + +stdenv.mkDerivation rec { + pname = "libcircle"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "libcircle"; + rev = "v${version}"; + hash = "sha256-EfnoNL6wo6qQES6XzMtpTpYcsJ8V2gy32i26wiTldH0="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "API for distributing embarrassingly parallel workloads using self-stabilization"; + homepage = "http://hpc.github.io/libcircle/"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} From 514518e74b3ee8310d3b2c71ce9a6589224c28f3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 8 Nov 2023 14:03:19 +0100 Subject: [PATCH 153/203] mpifileutils: 0.11.1 --- pkgs/by-name/mp/mpifileutils/package.nix | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/mp/mpifileutils/package.nix diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix new file mode 100644 index 000000000000..92300592c2fa --- /dev/null +++ b/pkgs/by-name/mp/mpifileutils/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mpi +, attr +, dtcmp +, libarchive +, libcircle +, bzip2 +, openssl +}: + +stdenv.mkDerivation rec { + pname = "mpifileutils"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "mpifileutils"; + rev = "v${version}"; + hash = "sha256-3nls82awMMCwlfafsOy3AY8OvT9sE+BvvsDOY14YvQc="; + }; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + attr + dtcmp + libarchive + libcircle + bzip2 + openssl + ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Suite of MPI-based tools to manage large datasets"; + homepage = "https://hpc.github.io/mpifileutils"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} From 90d9b21034f053ef81642e3f27d537653ce8019e Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Tue, 7 Nov 2023 17:17:30 +0100 Subject: [PATCH 154/203] zoom-us: 5.16.5.303 -> 5.16.6.382 --- .../instant-messengers/zoom-us/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index cf6a9ccae535..10af3d3ea4d3 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.16.2.23409"; - versions.x86_64-darwin = "5.16.2.23409"; - versions.x86_64-linux = "5.16.5.303"; + versions.aarch64-darwin = "5.16.6.24664"; + versions.x86_64-darwin = "5.16.6.24664"; + versions.x86_64-linux = "5.16.6.382"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-MUkxEj4G6MCCXcqyFquCrHhnu+sVw5H4HSk+sP5H+gY="; + hash = "sha256-5xccYYisVRZw7tJ6uri52BuaeURadaHypse4vjwPQIY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-niR/WbMq7T1PBCJMK1DdhbFc4eJDgub8LIv3X4i8S5c="; + hash = "sha256-N3jzvxoRY3W5fw1Fs0qevgHC+7cLLYvoGA/ZYiE71JA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-M+76HzqhPVxsP0nZOG4Oe8lnRJ9MJ2mE4+1hGvRkSUg="; + hash = "sha256-2O8jGQHGyF5XLQUxHUWA3h9K792lRQmOC2mS0rTukSw="; }; }; From 800193d83a58f96d9a1f0fc59dad7aa0a367f299 Mon Sep 17 00:00:00 2001 From: tu-maurice Date: Thu, 9 Nov 2023 22:56:27 +0100 Subject: [PATCH 155/203] pidginPackages.pidgin-sipe: fix compile error --- .../pidgin/pidgin-plugins/sipe/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix index a01477997047..1cf7fed874e9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/sipe/default.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool ]; buildInputs = [ pidgin gmime libxml2 nss ]; - configureFlags = [ "--without-dbus" ]; + configureFlags = [ + "--without-dbus" + "--enable-quality-check=no" + ]; + enableParallelBuilding = true; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; From dbe4ec0c8d36c35cb56c94e94ad250e2afe73db7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 10 Nov 2023 11:21:06 +0100 Subject: [PATCH 156/203] =?UTF-8?q?python311Packages.nbxmpp:=204.4.0=20?= =?UTF-8?q?=E2=86=92=204.5.0=20(#265166)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 5bd9269503ef..47ed44420f03 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.4.0"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-AuGLP/7Mggk7rF9KRvqbVtAkQFq0NXaHDUGV6HMLU7Y="; + hash = "sha256-7TGP3J4qepnUV/3aC7FssSGu4PahB70DGWezjOy+/+w="; }; nativeBuildInputs = [ From ee7f11bf8a2ce420973e605a6257b4de57f9e786 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 10:32:32 +0000 Subject: [PATCH 157/203] python311Packages.subarulink: 0.7.8 -> 0.7.9 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 92fe9124bf71..603acb73884b 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.8"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lBAel9ueuyr6AFNCYk1nHRvf8KvtiszESzRIOqjBjHQ="; + hash = "sha256-dRhZWV58tHoGpJ2bDWFov1timTHYnqTPILySauutyzg="; }; propagatedBuildInputs = [ From 1713e1d02380738cd3d0548634b1cabcb234b4af Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 10 Nov 2023 20:11:19 +0900 Subject: [PATCH 158/203] taskell: mark broken taskell depends on an old version of brick that no longer compiles --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2088641aa531..5723167b408d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5380,6 +5380,7 @@ broken-packages: - tamarin-prover-utils # failure in job https://hydra.nixos.org/build/233235417 at 2023-09-02 - Tape # failure in job https://hydra.nixos.org/build/233191662 at 2023-09-02 - tapioca # failure in job https://hydra.nixos.org/build/233207781 at 2023-09-02 + - taskell # depends on old version of brick - TaskMonad # failure in job https://hydra.nixos.org/build/233219257 at 2023-09-02 - tasty-autocollect # failure in job https://hydra.nixos.org/build/233256957 at 2023-09-02 - tasty-auto # failure in job https://hydra.nixos.org/build/233220008 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e873267d9ed5..005dfd53a42e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -292974,7 +292974,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "taskell"; + broken = true; }) {}; "taskpool" = callPackage From 546fc20314e70669836d049cf2339d6aed1dee71 Mon Sep 17 00:00:00 2001 From: RaySlash Date: Tue, 26 Sep 2023 14:10:21 +1000 Subject: [PATCH 159/203] hid-tmff2: init at v0.81 A linux module for Thrustmaste T300RS, T248 and TX(experimental) wheels. https://github.com/Kimplul/hid-tmff2/commit/ca168637fbfb085ebc9ade0c47fa0653dac5d25b - Additionally, https://github.com/scarburato/hid-tminit is also required for proper init of the driver. - The driver has been updated to v0.81 - Fixed a typo in maintainer-list - hid-tmff2 update sha256 - update hid-tmff2 version Co-authored-by: Artturi --- maintainers/maintainer-list.nix | 2 +- pkgs/os-specific/linux/hid-tmff2/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 ++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/hid-tmff2/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 574f01add772..1d581f05f94b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14428,7 +14428,7 @@ name = "David McKay"; }; rayslash = { - email = "stevemathewjoy@tutanota.cm"; + email = "stevemathewjoy@tutanota.com"; github = "rayslash"; githubId = 45141270; name = "Steve Mathew Joy"; diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix new file mode 100644 index 000000000000..ac297c78e10e --- /dev/null +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation { + pname = "hid-tmff2"; + # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12 + version = "0.81"; + + src = fetchFromGitHub { + owner = "Kimplul"; + repo = "hid-tmff2"; + rev = "ca168637fbfb085ebc9ade0c47fa0653dac5d25b"; + hash = "sha256-Nm5m5xjwJGy+ia4nTkvPZynIxUj6MVGGbSNmIcIpziM="; + # For hid-tminit. Source: https://github.com/scarburato/hid-tminit + fetchSubmodules = true; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installFlags = [ + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; + + postPatch = "sed -i '/depmod -A/d' Makefile"; + + meta = with lib; { + description = "A linux kernel module for Thrustmaster T300RS, T248 and TX(experimental)"; + homepage = "https://github.com/Kimplul/hid-tmff2"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rayslash ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 7b746286f055..584fece9fbee 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -583,6 +583,8 @@ in { hid-ite8291r3 = callPackage ../os-specific/linux/hid-ite8291r3 { }; + hid-tmff2 = callPackage ../os-specific/linux/hid-tmff2 { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 From 6f277d8a2e5632a0f1dff0ecd26c17b86ee36a5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 11:27:21 +0000 Subject: [PATCH 160/203] python311Packages.tiny-proxy: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/tiny-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tiny-proxy/default.nix b/pkgs/development/python-modules/tiny-proxy/default.nix index cbb015909ec0..9a319d90a164 100644 --- a/pkgs/development/python-modules/tiny-proxy/default.nix +++ b/pkgs/development/python-modules/tiny-proxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tiny-proxy"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "tiny-proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-emQRiG2QiuZt4/lI8shJOvMpaqXNyJ/PMvtDZPaoyLo="; + hash = "sha256-59T09qcOstl/yfzQmNlTNxGerQethZntwDAHwz/5FFM="; }; nativeBuildInputs = [ From fb254b9d4f4dfd79c9249b41cfc0741ccdcc0f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 11:10:27 -0300 Subject: [PATCH 161/203] lxqt.lxqt-menu-data: init at 1.4.1 --- pkgs/desktops/lxqt/default.nix | 3 +- pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/lxqt/lxqt-menu-data/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index fbac7dbd034d..2aad1aba1b12 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -18,6 +18,7 @@ let lxqt-admin = callPackage ./lxqt-admin {}; lxqt-config = callPackage ./lxqt-config {}; lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-menu-data = callPackage ./lxqt-menu-data {}; lxqt-notificationd = callPackage ./lxqt-notificationd {}; lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; lxqt-policykit = callPackage ./lxqt-policykit {}; @@ -50,7 +51,6 @@ let libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra - pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager qt5.qtsvg # provides QT5 plugins for svg icons @@ -68,6 +68,7 @@ let lxqt-admin lxqt-config lxqt-globalkeys + lxqt-menu-data lxqt-notificationd lxqt-openssh-askpass lxqt-policykit diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix new file mode 100644 index 000000000000..5ac4a5b0b714 --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qttools +, gitUpdater +}: + +mkDerivation rec { + pname = "lxqt-menu-data"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = pname; + rev = version; + hash = "sha256-I9jb2e57ZBvND27F5C1zMaoFtij5TetmN9zbJSjxiS4="; + }; + + nativeBuildInputs = [ + cmake + lxqt-build-tools + qttools + ]; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + homepage = "https://github.com/lxqt/lxqt-menu-data"; + description = "Menu files for LXQt Panel, Configuration Center and PCManFM-Qt/libfm-qt"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.lxqt.members; + }; +} From 9dc9b82f657f208318a8af9faa58ecc6833b47b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 162/203] lxqt.liblxqt: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index c7a34a9c493c..f7fba687bb86 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "liblxqt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Ug6LmDxynSDLWykZhnih2F9lT34aOlU0ewM88PX+5Ms="; + hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg polkit-qt kwindowsystem From 6eae0afd93c243c607b22fb6565008d4455dbb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 163/203] lxqt.libqtxdg: 3.11.0 -> 3.12.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 4f155f39576a..f2c42ccca592 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "b3XR0Tn/roiCjNGb3EMf4ilECNaUjGYi11ykVBppBuc="; + hash = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; }; nativeBuildInputs = [ From 1e227dee4625489b8a11ded71290470d47e4b5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 164/203] lxqt.libfm-qt: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index a19a8a208330..c945107aaf3b 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -4,6 +4,7 @@ , cmake , pkg-config , lxqt-build-tools +, lxqt-menu-data , pcre , libexif , xorg @@ -16,29 +17,30 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "MK1QMYfr0T/cE46IUWarG9a/PJUSSskk1W3y2+kvEwg="; + hash = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ + lxqt-menu-data pcre libexif xorg.libpthreadstubs xorg.libxcb xorg.libXdmcp qtx11extras - qttools libfm menu-cache ]; From 57362c2f342bc76c6166828322fceae0812e7fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 165/203] lxqt.lximage-qt: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index f33e6986d8c7..ec95c19b0c5a 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -18,24 +18,24 @@ mkDerivation rec { pname = "lximage-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "afCW3VeXAq2HYc4fjSrd+7j6cGoHmGlO8jCiNq6/F3E="; + hash = "sha256-Igfd8lhKDjdseQeARiirj+tEoJdcaeHuyd4mfQHOVg0="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg qtimageformats # add-on module to support more image file formats From f80d8784e379df5cbd008eff6d486b3d018d8fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 166/203] lxqt.lxqt-about: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 993721b443e5..fd20c68ba863 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,23 +14,23 @@ mkDerivation rec { pname = "lxqt-about"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Dm4WFtF0O7MgAvwYBI/1DkY9MhneI+QSM+wRp4JlD+o="; + hash = "sha256-FA9xvIi45qpD6iGxiiNKNlcLKzJtb0cWmvDBJRnJFwA="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg kwindowsystem liblxqt From 8dcd4858fc8e09bebe38fe8de6cd026bcda6a485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 167/203] lxqt.lxqt-admin: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 540c04b85c59..fc911cf27ea5 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "glSxrSCr56lpdWca9q8hgnMcW22DNdsIyBzxPmQXQOY="; + hash = "sha256-wPK3TMBC359GnisjpdY2zU+Jnvr7Hdzb6r+HuUQC3mo="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtx11extras - qttools qtsvg kwindowsystem liblxqt From 4c175d5509914f92c394b73a1d72833d6644d3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 168/203] lxqt.lxqt-archiver: 0.8.0 -> 0.9.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index b8e31a378c25..40cad3cb6082 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -16,19 +16,20 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "C38c/jCyRur7jQSgU2ByasCQnollHgy3/mUoNv61OCU="; + hash = "sha256-8pfUpyjn01D8CL+2PjGkZqyHu+lpHZIXlXn67rZoxMY="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ @@ -37,7 +38,6 @@ mkDerivation rec { libfm-qt menu-cache qtbase - qttools qtx11extras ]; From 1e418e442bc568feed5958d2d188c8dad73414d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:49 -0300 Subject: [PATCH 169/203] lxqt.lxqt-config: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 2c8c5d9b4a67..64b54b3e6bc3 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,11 +1,11 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , pkg-config , glib , lxqt-build-tools +, lxqt-menu-data , qtbase , qtx11extras , qttools @@ -21,31 +21,32 @@ mkDerivation rec { pname = "lxqt-config"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Gm/Y/5i7Abob9eRdLZHpRma2+Mdh2LBZUGKM4mMZMFk="; + hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ glib.bin qtbase qtx11extras - qttools qtsvg kwindowsystem libkscreen liblxqt libqtxdg + lxqt-menu-data xorg.libpthreadstubs xorg.libXdmcp xorg.libXScrnSaver From d433ac138f6e24be4bbd32f1310f14f3f2b31da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 170/203] lxqt.lxqt-globalkeys: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 6bdcc59bc353..83235bfdaebd 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "lo5FG6+kQTm15MEh+CZO2DvywsLrmX4sKzs4Rka6GSo="; + hash = "sha256-2S61d7BSuDPU1dNXLENpmpt6BB+CAeCtBVQS+ZGxrtU="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem From bad048def5c82dd95daa21b31efc2911a11830f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 171/203] lxqt.lxqt-notificationd: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 47792b35388d..a39c560d48d0 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zfoTc+O8eYpUc13vzHUuk71q+MATNGEGtiYhQmFldtw="; + hash = "sha256-Y3+ShGb1DKJw4zv3SCwEq2unJesI1q5OaTlSO8fP76A="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg kwindowsystem liblxqt From 40d098e239806ba4673b006f5da4d39eec64b473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 172/203] lxqt.lxqt-openssh-askpass: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index a14cbd7da243..f53c4ea05f8d 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,23 +15,23 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "6S+x8Az9e7rZ8i5p6+F3PZjx7k8fJcM1b/55dJdkuOM="; + hash = "sha256-o/hJdaGtjcJiwjqfvfwfcOUv4YdAeeW+rCxsmZZdJQ0="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem From 2d1e2341fd050191773083e6610209b2663f0cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 173/203] lxqt.lxqt-panel: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index fb901742ea65..16895a1aa956 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -14,9 +14,9 @@ , libstatgrab , libsysstat , lm_sensors -, lxmenu-data , lxqt-build-tools , lxqt-globalkeys +, lxqt-menu-data , gitUpdater , menu-cache , pcre @@ -30,19 +30,20 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "tSj7GGIvneYapkyqqgSMJtPGApC1fdpiId2XgQF5xf0="; + hash = "sha256-LQq1XOA0dGXXORVr2H/gI+axvCAd4P3nB4zCFYWgagc="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ @@ -57,13 +58,12 @@ mkDerivation rec { libstatgrab libsysstat lm_sensors - lxmenu-data lxqt-globalkeys + lxqt-menu-data menu-cache pcre qtbase qtsvg - qttools qtx11extras solid xorg.libXdmcp From a33c8cf06055ea1997b0d78a758285ead760f3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 174/203] lxqt.lxqt-policykit: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 0478c108e219..da3480b73e39 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -19,24 +19,24 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ZcftMdMBj/7OhxRZ34AB0IW5CfDYTT8JZLJejTb0XVg="; + hash = "sha256-w0o76oBFNy3syQqyFZdAbFUu8yX+uA6cMOHf3WfKPEU="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg polkit From b4c394cd0e688015b5bfccd523ff7a710880e1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 175/203] lxqt.lxqt-powermanagement: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 32834a4a49a4..1823e7fb5d0d 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -18,23 +18,23 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "lnEi3Emwx3ykIx1ZlRMjRP3FAaYgIhsVpY9r0dT3DEE="; + hash = "sha256-1koP+ElW5e85TJqToaErnGkTn3uRHk45bDDrXG6Oy68="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem From fcea4004239361fb004a375c6525b7dfcb896d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 176/203] lxqt.lxqt-qtplugin: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 4b27307520cd..264575b019d8 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,18 +15,19 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "/phBrpSru/4m+mcAkn4C6hKm5H2BAXNkbTgU2HmoyBg="; + hash = "sha256-0shNkM1AGAjzMQDGLOIP2DFx6goJGoD0U0Gr+rRRFrk="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ @@ -35,7 +36,6 @@ mkDerivation rec { libqtxdg qtbase qtsvg - qttools qtx11extras ]; From fd4db211e11986770b2da46a95e45c4c130dc7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 177/203] lxqt.lxqt-runner: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 7300331ab98e..3d5bdf0a01b8 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,24 +20,24 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "iC0XTdgB1+hwMfc/45JiEfAhwadbFOgTTJj9Kvxx+l4="; + hash = "sha256-NGytLQ2D5t1UdMGZoeHxHaXPwbRFDx+11ocjImXqZBU="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg qtx11extras kwindowsystem From a90af63807fa176af58d1c3c0855237900a9af34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:50 -0300 Subject: [PATCH 178/203] lxqt.lxqt-session: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 6de643d72737..421d166734f1 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -20,24 +20,24 @@ mkDerivation rec { pname = "lxqt-session"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "jhz1OHnPvjZMSo8+X/pf8rVLjPPSEiE7BDLnhUp/Vbk="; + hash = "sha256-kVDPJPYBwK7aXCIWGClwfM9J3067U8lPVWt0jFfqooY="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtsvg qtx11extras kwindowsystem From 3edc4f4c26cc8c1013db224e02df8fc2b2662325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 179/203] lxqt.lxqt-sudo: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 6d5fd9da8546..73794bad7a1f 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,23 +16,23 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "S+NWoF1l0HPOwceWwhfmGo7Xrm+6GeoMpJbGpK16rZs="; + hash = "sha256-J7jiap3qZD+P0kGzt+b3wa16pxbS2fr3OmalhV5O9ro="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem From ac7d0ebef789142696fe0c0c89dfb3726b989d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 180/203] lxqt.obconf-qt: 0.16.2 -> 0.16.3 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 2adfc9ac2dcf..4ebd052a5ef4 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,25 +15,25 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "zxwQfKowgpLjfxSV2t7Ly8o7DFqoIxi60zIVCcKDQWo="; + hash = "sha256-ExBcP+j1uf9Y8f6YfZsqyD6YTx1PriS3w8I6qdqQGeE="; }; nativeBuildInputs = [ cmake pkg-config lxqt-build-tools + qttools ]; buildInputs = [ pcre qtbase - qttools qtx11extras xorg.libpthreadstubs xorg.libXdmcp From 130185efc944bf2dc5320296f76e4317066ab057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 181/203] lxqt.pavucontrol-qt: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/default.nix | 2 +- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 2aad1aba1b12..d196787a8f28 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -27,7 +27,7 @@ let lxqt-session = callPackage ./lxqt-session {}; lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + pavucontrol-qt = callPackage ./pavucontrol-qt {}; qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 3bff6b7f1eb3..f5b69b2e85fa 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -3,38 +3,34 @@ , fetchFromGitHub , cmake , pkg-config -, lxqt +, lxqt-build-tools , libpulseaudio -, pcre , qtbase , qttools -, qtx11extras , gitUpdater }: mkDerivation rec { pname = "pavucontrol-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "cXYJ9EMmZ1LHBvjRWM1TEv7ADdG69DTyb5DZN7q3NIQ="; + hash = "sha256-eNhoqY1pak96x0xCypvgHmgCYjw4CYH8ABtWjIZrD3w="; }; nativeBuildInputs = [ cmake pkg-config - lxqt.lxqt-build-tools + lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools - qtx11extras libpulseaudio - pcre ]; passthru.updateScript = gitUpdater { }; From cfe78673f054d85ce20c0c33795998b67b63a321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 182/203] lxqt.pcmanfm-qt: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b26c30b14e0c..ea2f60474574 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -4,43 +4,43 @@ , cmake , pkg-config , libexif -, lxqt +, lxqt-build-tools +, lxqt-menu-data , qtbase , qttools , qtx11extras , qtimageformats , libfm-qt , menu-cache -, lxmenu-data , gitUpdater }: mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "qqvjsZRG+ImKHr+XLNNHhnAe1kBWh47/nFcKB1MTSJo="; + hash = "sha256-+U8eV6oDpaJfTzejsVtbcaQrfSjWUnVpnIDbkvVCY/c="; }; nativeBuildInputs = [ cmake pkg-config - lxqt.lxqt-build-tools + lxqt-build-tools + qttools ]; buildInputs = [ libexif + lxqt-menu-data qtbase - qttools qtx11extras qtimageformats # add-on module to support more image file formats libfm-qt menu-cache - lxmenu-data ]; passthru.updateScript = gitUpdater { }; From dcea6a0b0f6d521f0f1ce2464954bfd6836f3062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 183/203] lxqt.qps: 2.7.0 -> 2.8.0 --- pkgs/desktops/lxqt/qps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 4873c1055cbe..0b6b81a4e39f 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,18 +14,19 @@ mkDerivation rec { pname = "qps"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "70mANEnui/orN+8eIBzCCSsh5wvPXuPUAAwRcXtHsaY="; + hash = "sha256-Xr+61t6LzoXASHuXrE5ro3eWGxMSDCVnck49dCtiaww="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ @@ -33,7 +34,6 @@ mkDerivation rec { liblxqt libqtxdg qtbase - qttools qtx11extras ]; From 006cba46c1c21cdc44df040234e367a8d69f3d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 184/203] lxqt.qterminal: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 0573c36924fb..0a1bf1f82d12 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -13,23 +13,23 @@ mkDerivation rec { pname = "qterminal"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "/R/fv8UAOeCVvXXBAXjturTTmN/LeqLKFJjAmEry2WU="; + hash = "sha256-nojNx351lYw0jVKEvzAIDP1WrZWcCAlfYMxNG95GcEo="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools qtx11extras qtermwidget ]; From c87e4511d078b7c3179e0f9681ec6f09837485ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 185/203] lxqt.qtermwidget: 1.3.0 -> 1.4.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 719183095a96..e92df23f2d5f 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,23 +11,23 @@ mkDerivation rec { pname = "qtermwidget"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "eir9PvJXzAQYwRqoUf0Nc4SfkVGa7bohbJVdKPCoyNs="; + hash = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; }; nativeBuildInputs = [ cmake lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools ]; passthru.updateScript = gitUpdater { }; From d228fbb844434e08027bcdaa0abdd2fbea14c335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 186/203] lxqt.qtxdg-tools: 3.11.0 -> 3.12.0 --- pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index aa8ea1acd979..10476a00cf73 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtxdg-tools"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "sha256-iUvjLZbTDBsQw7PIA0LUAvhoq6FrdbLhjbMwKdE01Hc="; + hash = "sha256-3i5SVhEMHar09xoSfVCxJtPXeR81orcNR7pSIJImipQ="; }; nativeBuildInputs = [ From 5cfac1baadc22fbcc21761b31a1b5d0696493235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:51 -0300 Subject: [PATCH 187/203] lxqt.screengrab: 2.6.0 -> 2.7.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index f4f94e237865..59513dfebfda 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -17,25 +17,25 @@ mkDerivation rec { pname = "screengrab"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "ySC5bCOnen2bjhmLY4GnwiFaUrvGx93LJrLQo0pBUc4="; + hash = "sha256-mmN3BQum7X0GWTUYauEN2mAo3GWdmtkIl2i84g5cp78="; }; nativeBuildInputs = [ cmake pkg-config perl # needed by LXQtTranslateDesktop.cmake + qttools autoPatchelfHook # fix libuploader.so and libextedit.so not found ]; buildInputs = [ qtbase - qttools qtx11extras qtsvg kwindowsystem From e392c20f6357eefe6ce5d72102e0c323b8bda3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:23:52 -0300 Subject: [PATCH 188/203] lxqt.xdg-desktop-portal-lxqt: 0.4.0 -> 0.5.0 --- pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 9f6a8f3ecf4a..622a445bb9fd 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "gH4L6cjx3DjGWcgoqUSnsx4Bn+T9t03AXPB5ZNDa0Nw="; + hash = "sha256-6yfLjDK8g8cpeeyuFUEjERTLLn6h3meKjD2Eb7Cj9qY="; }; nativeBuildInputs = [ From 94abf3ea025689dc76c53f0b244a6b51be371a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:25:51 -0300 Subject: [PATCH 189/203] lxqt.compton-conf: qttools is a compile time dependence No need to use qt5.callPackage Use hash attribute instead of sha256 --- pkgs/desktops/lxqt/compton-conf/default.nix | 4 ++-- pkgs/desktops/lxqt/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index b95dd4b6fdf2..4a9a878d31c7 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -19,18 +19,18 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q"; + hash = "sha256-GNS0GdkQOEFQHCeXFVNDdT35KCRhfwmkL78tpY71mz0="; }; nativeBuildInputs = [ cmake pkg-config lxqt.lxqt-build-tools + qttools ]; buildInputs = [ qtbase - qttools libconfig ]; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index d196787a8f28..eacdac554136 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -37,7 +37,7 @@ let ### OPTIONAL qterminal = callPackage ./qterminal {}; - compton-conf = qt5.callPackage ./compton-conf {}; + compton-conf = callPackage ./compton-conf {}; obconf-qt = callPackage ./obconf-qt {}; lximage-qt = callPackage ./lximage-qt {}; qps = callPackage ./qps {}; From b448e62d46f4fef2e455cb2cec7c656ac8c5c466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:29:22 -0300 Subject: [PATCH 190/203] lxqt.libsysstat: use hash attribute instead of sha256 --- pkgs/desktops/lxqt/libsysstat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 4fdfa341e923..5e3514310c3d 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0z2r8041vqssm59lkb3ka7qis9br4wvavxzd45m3pnqlp7wwhkbn"; + hash = "sha256-dk3I+bkU2ztqIe33rTYneSUd8VFzrElTqVrjHQhAWXw="; }; nativeBuildInputs = [ From e66b5580b5208b4e7bb21fbc3efa33c7f46dc8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:30:15 -0300 Subject: [PATCH 191/203] lxqt.lxqt-build-tools: use hash attribute instead of sha256 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index f31d1561bb52..b3874abfa576 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; + hash = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; }; postPatch = '' From 5793546dccfd4aa2e24d3ced5c8641ca15031e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:30:55 -0300 Subject: [PATCH 192/203] lxqt.lxqt-themes: use hash attribute instead of sha256 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1cbc1949b20d..a9a957091df4 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { owner = "lxqt"; repo = pname; rev = version; - sha256 = "bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; + hash = "sha256-bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; }; nativeBuildInputs = [ From a47165567a8d7562d7d82d3f3e181de002fca2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Nov 2023 17:31:27 -0300 Subject: [PATCH 193/203] lxqt.qlipper: qttools is a build time dependence Use hash attribute instead of sha256 --- pkgs/desktops/lxqt/qlipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index 64ce835d3a66..91f11e8d1374 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -15,16 +15,16 @@ mkDerivation rec { owner = "pvanek"; repo = pname; rev = version; - sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60"; + hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834="; }; nativeBuildInputs = [ cmake + qttools ]; buildInputs = [ qtbase - qttools ]; passthru.updateScript = gitUpdater { }; From 15e591d39eee6aaa0752705129a07463275376fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Nov 2023 11:47:28 +0000 Subject: [PATCH 194/203] python311Packages.xkcdpass: 1.19.4 -> 1.19.5 --- pkgs/development/python-modules/xkcdpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 4610e71876e6..0d11e9df8c1b 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.4"; + version = "1.19.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KTXVS0gtGby1Rla9oBy77J7kH/1C0jWlJwX9lcq3D9c="; + hash = "sha256-zEgC3tTQ6kwDovHPHRTvYndWVF79DpnAX454VDZiedE="; }; nativeBuildInputs = [ From 3c87cb32f0532af8e5a7bb4f982c479540356cd3 Mon Sep 17 00:00:00 2001 From: Renato Garcia Date: Fri, 10 Nov 2023 08:48:45 -0300 Subject: [PATCH 195/203] snakemake: 7.29.0 -> 7.32.4 (#266543) --- pkgs/applications/science/misc/snakemake/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 1eded1e419c4..3acd66f79084 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.29.0"; + version = "7.32.4"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UfUzvDo5OE1LGCBBGoDpxG96RKOaShbqu5TOOILG3AY="; + hash = "sha256-9KuMPqvM8ZCTuomc0R9MBxsK3KIpukDTrlwU6MHysK0="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { pandas pytestCheckHook requests-mock + pillow ]; disabledTestPaths = [ @@ -56,6 +57,8 @@ python3.pkgs.buildPythonApplication rec { "tests/test_tes.py" "tests/test_tibanna.py" "tests/test_linting.py" + "tests/test_google_lifesciences.py" + "tests/test_conda_python_script/test_script.py" ]; disabledTests = [ From 2ea5992e2e04fa39fc3f1f01544cc5d38fdc4089 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 1 Nov 2023 09:45:42 +0000 Subject: [PATCH 196/203] nncp: 8.9.0 -> 8.10.0 --- .../misc/nncp/default.nix => by-name/nn/nncp/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{tools/misc/nncp/default.nix => by-name/nn/nncp/package.nix} (95%) diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/by-name/nn/nncp/package.nix similarity index 95% rename from pkgs/tools/misc/nncp/default.nix rename to pkgs/by-name/nn/nncp/package.nix index eb929c9923b1..902b78272da0 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/by-name/nn/nncp/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "nncp"; - version = "8.9.0"; + version = "8.10.0"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz"; - hash = "sha256-JZ+svDNU7cwW58ZOJ4qszbR/+j7Cr+oLNig/RqqCS10="; + sha256 = "154e13ba15c0ea93f54525793b0699e496b2db7281e1555f08d785a528f3f7fc"; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67b62f9e2e1f..cd9a1b9315ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34026,8 +34026,6 @@ with pkgs; ninjas2 = callPackage ../applications/audio/ninjas2 { }; - nncp = darwin.apple_sdk_11_0.callPackage ../tools/misc/nncp { }; - nootka = qt5.callPackage ../applications/audio/nootka { }; novnc = callPackage ../applications/networking/novnc { }; From 508a3afb43e8b9f79d4d6b4ae507bd5533add5ce Mon Sep 17 00:00:00 2001 From: itstarsun Date: Fri, 10 Nov 2023 11:59:41 +0000 Subject: [PATCH 197/203] protolint: add meta.mainProgram --- pkgs/development/tools/protolint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index 47bdd5530e7a..69fcacb4bc15 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.zane ]; + mainProgram = "protolint"; }; } From b5e89202d2fff62fcac041affde9e371bd638be1 Mon Sep 17 00:00:00 2001 From: itstarsun Date: Fri, 10 Nov 2023 12:03:48 +0000 Subject: [PATCH 198/203] muon: add meta.mainProgram --- pkgs/development/tools/build-managers/muon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index c3be1a4bc535..92593bb60e5f 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; broken = stdenv.isDarwin; # typical `ar failure` + mainProgram = "muon"; }; }) # TODO LIST: From 8f25bfc671debe9930e25134ccd718e59c46888e Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Thu, 9 Nov 2023 17:32:59 -0800 Subject: [PATCH 199/203] blisp: add bdd as maintainer --- pkgs/development/embedded/blisp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index fa3adc2fdf22..093e0ef195ca 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; - maintainers = [ maintainers.fortuneteller2k ]; + maintainers = [ maintainers.bdd ]; }; }) From 120323847de725ceaa88191ba253be38082ad8dc Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 3 Nov 2023 15:22:15 +0800 Subject: [PATCH 200/203] fdroidserver: add shell completion --- pkgs/development/tools/fdroidserver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index ee4d64f118f2..d559b5ba5ee6 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -5,6 +5,7 @@ , buildPythonApplication , python3 , pythonRelaxDepsHook +, installShellFiles , androguard , babel , clint @@ -53,10 +54,13 @@ buildPythonApplication rec { postInstall = '' patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin + installShellCompletion --cmd fdroid \ + --bash completion/bash-completion ''; nativeBuildInputs = [ pythonRelaxDepsHook + installShellFiles ]; buildInputs = [ From 880323328fa5f45fb0baaaa8d4b7669056f972cf Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 3 Nov 2023 15:25:54 +0800 Subject: [PATCH 201/203] fdroidserver: 2.2.1 -> unstable-2023-10-23 --- pkgs/development/tools/fdroidserver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index d559b5ba5ee6..88fc8f6e4f0b 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -27,14 +27,14 @@ buildPythonApplication rec { pname = "fdroidserver"; - version = "2.2.1"; + version = "unstable-2023-10-23"; format = "setuptools"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; - rev = "refs/tags/${version}"; - sha256 = "sha256-+Y1YTgELsX834WIrhx/NX34yLMHdkKM+YUNvnHPiC/s="; + rev = "f4b10cf83935432d19948dac669964384bef0728"; + hash = "sha256-GmR6Td5pScwEKK9W6m26xQV4XxBdZ7frN2UvwUGY4Dw="; }; pythonRelaxDeps = [ From acd80bbf005658bf55dad08819d31529b91fe6cd Mon Sep 17 00:00:00 2001 From: David Stritzl <437018+davidstritzl@users.noreply.github.com> Date: Sat, 4 Nov 2023 21:19:07 +0100 Subject: [PATCH 202/203] mpv: sign darwin bundle executable This fixes the application exiting immediately after launch via application bundle on macOS 14 (#261072). --- pkgs/applications/video/mpv/default.nix | 8 +++++++- pkgs/applications/video/mpv/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 8290e39979c3..95681d4a4ab4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -19,6 +19,7 @@ , libuchardet , libiconv , xcbuild +, sigtool , waylandSupport ? stdenv.isLinux , wayland @@ -154,7 +155,7 @@ in stdenv'.mkDerivation (finalAttrs: { pkg-config python3 ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; @@ -203,6 +204,11 @@ in stdenv'.mkDerivation (finalAttrs: { postBuild = lib.optionalString stdenv.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv + # Swap binary and bundle symlink to sign bundle executable as symlinks cannot be signed + rm build/mpv.app/Contents/MacOS/mpv-bundle + mv build/mpv.app/Contents/MacOS/mpv build/mpv.app/Contents/MacOS/mpv-bundle + ln -s mpv-bundle build/mpv.app/Contents/MacOS/mpv + codesign --force --sign - build/mpv.app/Contents/MacOS/mpv-bundle popd ''; diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index b427318121ef..a86c9671a481 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -97,7 +97,7 @@ let '' + lib.optionalString stdenv.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" - makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} + makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv-bundle" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 724b95d682b8..038b8923a1d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33939,6 +33939,7 @@ with pkgs; mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; + inherit (darwin) sigtool; }; shaka-packager = callPackage ../applications/video/shaka-packager { }; From e1e9724363506b7733d8a3e83b3e08143d93464e Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 9 Nov 2023 22:37:38 +0100 Subject: [PATCH 203/203] matrix-sliding-sync: 0.99.11 -> 0.99.12 https://github.com/matrix-org/sliding-sync/releases/tag/v0.99.12 diff: https://github.com/matrix-org/sliding-sync/compare/v0.99.11...v0.99.12 --- pkgs/servers/matrix-synapse/sliding-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index 32a64f0a669d..aca863ed2da9 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.11"; + version = "0.99.12"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-Wd/nnJhKg+BDyOIz42zEScjzQRrpEq6YG9/9Tk24hgg="; + hash = "sha256-7M+Ti1SfurRngXg2oCdLveG6QyjM2BjKnoovJxz7ZOY="; }; - vendorHash = "sha256-0QSyYhOht1j1tWNxHQh+NUZA/W1xy7ANu+29H/gusOE="; + vendorHash = "sha256-li5kEF7U7KyyMLMhVBqvnLuLXI6QrJl1KeusKrQXo8w="; subPackages = [ "cmd/syncv3" ];