From 90099ac5fa24cd9f4003c4def847c3559352dc8e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 28 May 2022 20:35:49 +0200 Subject: [PATCH 01/27] haskell.compiler: ghc922 -> ghc923 https://www.haskell.org/ghc/download_ghc_9_2_3.html Since the tarball is generated by Hadrian, neither autoreconf nor ./boot is executed so ./configure and ghc.mk is missing. --- lib/options.nix | 2 +- .../development/option-declarations.section.md | 4 ++-- .../development/option-declarations.section.xml | 4 ++-- .../compilers/ghc/{9.2.2.nix => 9.2.3.nix} | 10 ++++++++-- .../haskell/haskell-language-server/withWrapper.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 12 ++++++------ pkgs/top-level/release-haskell.nix | 12 ++++++------ 8 files changed, 28 insertions(+), 22 deletions(-) rename pkgs/development/compilers/ghc/{9.2.2.nix => 9.2.3.nix} (98%) diff --git a/lib/options.nix b/lib/options.nix index 4aa9fe6e78c5..8d82a809083b 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -120,7 +120,7 @@ rec { Example: mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; } => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } */ diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 2e11218e8238..ef7255557a10 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -120,14 +120,14 @@ lib.mkOption { ```nix lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; } # is like lib.mkOption { type = lib.types.package; default = pkgs.ghc; defaultText = lib.literalExpression "pkgs.ghc"; - example = lib.literalExpression "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } ``` diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index 91867c224107..381163dd7c74 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -183,14 +183,14 @@ lib.mkOption { lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; } # is like lib.mkOption { type = lib.types.package; default = pkgs.ghc; defaultText = lib.literalExpression "pkgs.ghc"; - example = lib.literalExpression "pkgs.haskell.package.ghc922.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } diff --git a/pkgs/development/compilers/ghc/9.2.2.nix b/pkgs/development/compilers/ghc/9.2.3.nix similarity index 98% rename from pkgs/development/compilers/ghc/9.2.2.nix rename to pkgs/development/compilers/ghc/9.2.3.nix index 880db4337893..af641ae9c59a 100644 --- a/pkgs/development/compilers/ghc/9.2.2.nix +++ b/pkgs/development/compilers/ghc/9.2.3.nix @@ -6,6 +6,8 @@ , xattr, autoSignDarwinBinariesHook , bash +, autoreconfHook # GHC 9.2.3 tarballs don't have autoconf run on them + , libiconv ? null, ncurses , glibcLocales ? null @@ -171,12 +173,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.2.2"; + version = "9.2.3"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "902463a4cc6ee479af9358b9f8b2ee3237b03e934a1ea65b6d1fcf3e0d749ea6"; + sha256 = "50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e"; }; enableParallelBuilding = true; @@ -218,6 +220,9 @@ stdenv.mkDerivation (rec { '' + '' echo -n "${buildMK}" > mk/build.mk + # GHC 9.2.3 tarball is not properly prepared + ./boot + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" @@ -283,6 +288,7 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ + autoreconfHook # GHC 9.2.3 tarball hasn't autoconf run on it perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index e91ec04f0097..7c6481cabadc 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "884" "8107" "902" "922" ] +, supportedGhcVersions ? [ "884" "8107" "902" "923" ] , dynamic ? false , haskellPackages , haskell @@ -8,7 +8,7 @@ # # The recommended way to override this package is # -# pkgs.haskell-language-server.override { supportedGhcVersions = [ "901" ]; } +# pkgs.haskell-language-server.override { supportedGhcVersions = [ "902" ]; } # # for example. Read more about this in the haskell-language-server section of the nixpkgs manual. # diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5403295b7e2a..f6eb9764d28b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14281,7 +14281,7 @@ with pkgs; stdenv = clangStdenv; }; - jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc922.jacinda; + jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc923.jacinda; janet = callPackage ../development/interpreters/janet {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c46a7f1bcd24..79815b65f605 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -13,13 +13,13 @@ let "integer-simple" "native-bignum" "ghc902" - "ghc922" + "ghc923" "ghcHEAD" ]; nativeBignumIncludes = [ "ghc902" - "ghc922" + "ghc923" "ghcHEAD" ]; @@ -121,7 +121,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc922 = callPackage ../development/compilers/ghc/9.2.2.nix { + ghc923 = callPackage ../development/compilers/ghc/9.2.3.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra if stdenv.isAarch64 || stdenv.isAarch32 then @@ -227,9 +227,9 @@ in { ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; - ghc922 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc922; - ghc = bh.compiler.ghc922; + ghc923 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc923; + ghc = bh.compiler.ghc923; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghcHEAD = callPackage ../development/haskell-modules { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 789d83c4be07..0c5ac7d7514c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -52,7 +52,7 @@ let ghc884 ghc8107 ghc902 - ghc922 + ghc923 ]; # packagePlatforms applied to `haskell.packages.*` @@ -329,8 +329,8 @@ let ; }; - haskell.packages.native-bignum.ghc922 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc922) + haskell.packages.native-bignum.ghc923 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc923) hello lens random @@ -442,11 +442,11 @@ let jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 - jobs.pkgsMusl.haskell.compiler.ghc922 + jobs.pkgsMusl.haskell.compiler.ghc923 jobs.pkgsMusl.haskell.compiler.ghcHEAD jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc922 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc923 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; @@ -462,7 +462,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc922 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc923 ]; }; } From 0e024a3126485af4a3b2633886b096b2443eb9a2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 29 May 2022 19:12:40 +0200 Subject: [PATCH 02/27] haskellPackages: stackage LTS 19.7 -> LTS 19.8 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 116 +++++++++--------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 2f5a561ca3e9..5339368c6395 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.7 +# Stackage LTS 19.8 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -11,7 +11,7 @@ default-package-overrides: - acid-state ==0.16.1 - action-permutations ==0.0.0.1 - active ==0.2.0.15 - - ad ==4.5 + - ad ==4.5.1 - ad-delcont ==0.3.0.0 - adjunctions ==4.4.1 - adler32 ==0.1.2.0 @@ -231,6 +231,8 @@ default-package-overrides: - brick ==0.68.1 - brittany ==0.14.0.2 - broadcast-chan ==0.2.1.2 + - brotli ==0.0.0.0 + - brotli-streams ==0.0.0.0 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 - bson-lens ==0.1.1 @@ -251,7 +253,7 @@ default-package-overrides: - bytes ==0.17.2 - byteset ==0.1.1.0 - bytestring-builder ==0.10.8.2.0 - - bytestring-conversion ==0.3.1 + - bytestring-conversion ==0.3.2 - bytestring-lexing ==0.5.0.8 - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.5 @@ -312,7 +314,7 @@ default-package-overrides: - character-cases ==0.1.0.6 - charset ==0.3.9 - charsetdetect-ae ==1.1.0.4 - - Chart ==1.9.3 + - Chart ==1.9.4 - ChasingBottoms ==1.3.1.11 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 @@ -340,7 +342,7 @@ default-package-overrides: - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 - clay ==0.14.0 - - cleff ==0.3.2.0 + - cleff ==0.3.3.0 - cleff-plugin ==0.1.0.0 - clientsession ==0.9.1.2 - climb ==0.3.3 @@ -388,7 +390,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.15 + - concurrent-output ==1.10.16 - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 @@ -413,7 +415,7 @@ default-package-overrides: - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - - constraints ==0.13.3 + - constraints ==0.13.4 - constraints-extras ==0.3.2.1 - constraint-tuples ==0.1.2 - construct ==0.3.1 @@ -470,10 +472,7 @@ default-package-overrides: - ctrie ==0.2 - cubicbezier ==0.6.0.6 - cubicspline ==0.1.2 - - cublas ==0.6.0.0 - - cuda ==0.11.0.0 - - cue-sheet ==2.0.1 - - cufft ==0.10.0.0 + - cue-sheet ==2.0.2 - curl ==1.3.8 - curl-runnings ==0.17.0 - currencies ==0.2.0.0 @@ -482,8 +481,6 @@ default-package-overrides: - cursor-brick ==0.1.0.1 - cursor-fuzzy-time ==0.0.0.0 - cursor-gen ==0.4.0.0 - - cusolver ==0.3.0.0 - - cusparse ==0.3.0.0 - cutter ==0.0 - cyclotomic ==1.1.1 - czipwith ==1.0.1.4 @@ -592,7 +589,7 @@ default-package-overrides: - distributed-static ==0.3.9 - distribution-opensuse ==1.1.3 - distributive ==0.6.2.1 - - djinn-lib ==0.0.1.3 + - djinn-lib ==0.0.1.4 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -684,7 +681,7 @@ default-package-overrides: - error-or-utils ==0.2.0 - errors ==2.3.0 - errors-ext ==0.4.2 - - ersatz ==0.4.10 + - ersatz ==0.4.11 - esqueleto ==3.5.4.1 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 @@ -784,7 +781,7 @@ default-package-overrides: - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.6 - foldl ==1.4.12 - - folds ==0.7.7 + - folds ==0.7.8 - follow-file ==0.0.3 - FontyFruity ==0.5.3.5 - force-layout ==0.4.0.6 @@ -821,7 +818,7 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.1 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.2 + - fuzzyset ==0.2.3 - fuzzy-time ==0.2.0.0 - gauge ==0.2.5 - gd ==3000.7.3 @@ -884,7 +881,7 @@ default-package-overrides: - ghc-lib-parser-ex ==9.0.0.6 - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.9 + - ghc-prof ==1.4.1.11 - ghc-source-gen ==0.4.3.0 - ghc-syntax-highlighter ==0.0.7.0 - ghc-tcplugins-extra ==0.4.2 @@ -965,6 +962,7 @@ default-package-overrides: - gtk-sni-tray ==0.1.8.0 - gtk-strut ==0.1.3.0 - guarded-allocation ==0.0.1 + - hackage-cli ==0.0.3.6 - hackage-db ==2.1.2 - hackage-security ==0.6.2.1 - haddock-library ==1.10.0 @@ -1000,7 +998,7 @@ default-package-overrides: - haskell-src ==1.0.4 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.9 + - haskell-src-meta ==0.8.10 - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.0 - haskoin-core ==0.21.2 @@ -1097,7 +1095,7 @@ default-package-overrides: - hpc-codecov ==0.3.0.0 - HPDF ==1.6.0 - hpp ==0.6.5 - - hpqtypes ==1.9.3.1 + - hpqtypes ==1.9.4.0 - hprotoc ==2.4.17 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -1109,7 +1107,7 @@ default-package-overrides: - hsdns ==1.8 - hsemail ==2.2.1 - hset ==2.2.0 - - hsexif ==0.6.1.8 + - hsexif ==0.6.1.9 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 - hsini ==0.5.1.2 @@ -1186,6 +1184,7 @@ default-package-overrides: - http-directory ==0.1.9 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 + - http-io-streams ==0.1.6.1 - http-link-header ==1.2.1 - http-media ==0.8.0.0 - http-query ==0.1.3 @@ -1270,12 +1269,12 @@ default-package-overrides: - influxdb ==1.9.2.2 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.1.5 + - inline-c ==0.9.1.6 - inline-c-cpp ==0.5.0.0 - inliterate ==0.1.0 - input-parsers ==0.2.3.2 - insert-ordered-containers ==0.2.5.1 - - inspection-testing ==0.4.6.0 + - inspection-testing ==0.4.6.1 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3.1 @@ -1339,7 +1338,7 @@ default-package-overrides: - jwt ==0.11.0 - kan-extensions ==5.2.4 - kanji ==3.5.0 - - katip ==0.8.7.1 + - katip ==0.8.7.2 - katip-logstash ==0.1.0.2 - katip-wai ==0.1.1.0 - kazura-queue ==0.1.0.4 @@ -1417,7 +1416,7 @@ default-package-overrides: - lift-generics ==0.2.1 - lift-type ==0.1.0.1 - line ==4.0.1 - - linear ==1.21.8 + - linear ==1.21.9 - linear-base ==0.1.0 - linear-circuit ==0.1.0.4 - linebreak ==1.1.0.1 @@ -1469,7 +1468,7 @@ default-package-overrides: - lzma ==0.0.0.3 - lzma-clib ==5.2.2 - lzma-conduit ==1.2.3 - - machines ==0.7.2 + - machines ==0.7.3 - magic ==1.1 - magico ==0.0.2.3 - mainland-pretty ==0.7.1 @@ -1516,15 +1515,15 @@ default-package-overrides: - microlens ==0.4.12.0 - microlens-aeson ==2.4.1 - microlens-contra ==0.1.0.2 - - microlens-ghc ==0.4.13.1 - - microlens-mtl ==0.2.0.1 + - microlens-ghc ==0.4.13.2 + - microlens-mtl ==0.2.0.2 - microlens-platform ==0.4.2.1 - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.10 - microspec ==0.2.1.3 - - microstache ==1.0.2 + - microstache ==1.0.2.1 - midair ==0.2.0.1 - - midi ==0.2.2.2 + - midi ==0.2.2.3 - midi-alsa ==0.2.1 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 @@ -1551,7 +1550,7 @@ default-package-overrides: - model ==0.5 - modern-uri ==0.3.4.4 - modular ==0.1.0.8 - - monad-chronicle ==1.0.0.1 + - monad-chronicle ==1.0.1 - monad-control ==1.0.3.1 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.2 @@ -1590,7 +1589,7 @@ default-package-overrides: - mono-traversable-keys ==0.2.0 - more-containers ==0.2.2.2 - morpheus-graphql-tests ==0.18.0 - - moss ==0.2.0.0 + - moss ==0.2.0.1 - mountpoints ==1.0.2 - mpi-hs ==0.7.2.0 - mpi-hs-binary ==0.1.1.0 @@ -1657,7 +1656,7 @@ default-package-overrides: - network-uri ==2.6.4.1 - network-wait ==0.1.2.0 - newtype ==0.2.2.0 - - newtype-generics ==0.6.1 + - newtype-generics ==0.6.2 - nfc ==0.1.0 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 @@ -1677,7 +1676,7 @@ default-package-overrides: - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - - nqe ==0.6.3 + - nqe ==0.6.4 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1691,12 +1690,10 @@ default-package-overrides: - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 - nvim-hs ==2.2.0.1 - - nvvm ==0.10.0.0 - ObjectName ==1.1.0.2 - ochintin-daicho ==0.3.4.2 - o-clock ==1.2.1.1 - oeis ==0.3.10 - - oeis2 ==1.0.7 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1723,9 +1720,9 @@ default-package-overrides: - operational ==0.2.4.1 - operational-class ==0.3.0.0 - opml-conduit ==0.9.0.0 - - optics ==0.4.1 + - optics ==0.4.2 - optics-core ==0.4.1 - - optics-extra ==0.4.1 + - optics-extra ==0.4.2.1 - optics-th ==0.4.1 - optics-vl ==0.2.1 - optima ==0.4.0.3 @@ -1787,7 +1784,7 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.3 - pcg-random ==0.1.3.7 - - pcre2 ==2.1.1 + - pcre2 ==2.1.1.1 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 @@ -2007,7 +2004,7 @@ default-package-overrides: - rawfilepath ==1.0.1 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - - rcu ==0.2.5 + - rcu ==0.2.6 - rdtsc ==1.3.0.1 - re2 ==0.3 - readable ==0.3.1 @@ -2057,7 +2054,7 @@ default-package-overrides: - repa-io ==3.4.1.2 - replace-attoparsec ==1.4.5.0 - replace-megaparsec ==1.4.5.0 - - repline ==0.4.0.0 + - repline ==0.4.2.0 - req ==3.10.0 - req-conduit ==1.0.1 - require ==0.4.11 @@ -2069,7 +2066,7 @@ default-package-overrides: - resource-pool ==0.2.3.2 - resourcet ==1.2.5 - result ==0.2.6.0 - - retry ==0.9.2.0 + - retry ==0.9.2.1 - rev-state ==0.1.2 - rfc1751 ==0.1.3 - rfc5051 ==0.2 @@ -2097,14 +2094,14 @@ default-package-overrides: - RSA ==2.4.1 - rss-conduit ==0.6.0.1 - runmemo ==1.0.0.1 - - rvar ==0.3.0.0 + - rvar ==0.3.0.1 - s3-signer ==0.5.0.0 - safe ==0.3.19 - safe-coloured-text ==0.1.0.0 - safe-coloured-text-terminfo ==0.0.0.0 - safecopy ==0.10.4.2 - safe-decimal ==0.2.1.0 - - safe-exceptions ==0.1.7.2 + - safe-exceptions ==0.1.7.3 - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 @@ -2183,7 +2180,7 @@ default-package-overrides: - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - servant-multipart-client ==0.12.1 - - servant-openapi3 ==2.0.1.4 + - servant-openapi3 ==2.0.1.5 - servant-pipes ==0.15.3 - servant-rawm ==1.0.0.0 - servant-ruby ==0.9.0.0 @@ -2228,7 +2225,7 @@ default-package-overrides: - silently ==1.2.5.2 - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - - simple-cmd ==0.2.5 + - simple-cmd ==0.2.6 - simple-cmd-args ==0.1.7 - simple-log ==0.9.12 - simple-media-timestamp ==0.2.0.0 @@ -2251,8 +2248,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.12.3 - - skylighting-core ==0.12.3 + - skylighting ==0.12.3.1 + - skylighting-core ==0.12.3.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.1 - slist ==0.2.0.0 @@ -2306,7 +2303,7 @@ default-package-overrides: - srt-attoparsec ==0.1.0.0 - srt-dhall ==0.1.0.0 - srt-formatting ==0.1.0.0 - - stache ==2.3.1 + - stache ==2.3.2 - stack-all ==0.4.0.1 - stack-clean-old ==0.4.6 - stackcollapse-ghc ==0.0.1.4 @@ -2343,13 +2340,13 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.3.1 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.2.1 + - streaming-bytestring ==0.2.2 - streaming-cassava ==0.2.0.0 - streaming-commons ==0.2.2.4 - streamly ==0.8.1.1 - streamly-bytestring ==0.1.4 - streams ==3.3 - - streamt ==0.5.0.0 + - streamt ==0.5.0.1 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.7 @@ -2361,7 +2358,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.2.0 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.1.1 + - string-interpolate ==0.3.1.2 - string-qq ==0.0.4 - string-random ==0.1.4.2 - stringsearch ==0.3.6.6 @@ -2417,18 +2414,18 @@ default-package-overrides: - tasty-ant-xml ==1.1.8 - tasty-bench ==0.3.1 - tasty-dejafu ==2.0.0.8 - - tasty-discover ==4.2.2 + - tasty-discover ==4.2.4 - tasty-expected-failure ==0.12.3 - tasty-fail-fast ==0.0.3 - tasty-focus ==1.0.1 - tasty-golden ==2.3.5 - tasty-hedgehog ==1.1.0.0 - tasty-hslua ==1.0.2 - - tasty-hspec ==1.2 + - tasty-hspec ==1.2.0.1 - tasty-html ==0.4.1.4 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 - - tasty-inspection-testing ==0.1 + - tasty-inspection-testing ==0.1.0.1 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.2 - tasty-lua ==1.0.2 @@ -2502,7 +2499,7 @@ default-package-overrides: - th-lift ==0.8.2 - th-lift-instances ==0.1.19 - th-nowq ==0.1.0.5 - - th-orphans ==0.13.12 + - th-orphans ==0.13.13 - th-printf ==0.7 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 @@ -2603,7 +2600,7 @@ default-package-overrides: - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.4 - unbounded-delays ==0.1.1.1 - - unbound-generics ==0.4.1 + - unbound-generics ==0.4.2 - unboxed-ref ==0.4.0.0 - unboxing-vector ==0.2.0.0 - uncaught-exception ==0.1.0 @@ -2611,7 +2608,7 @@ default-package-overrides: - unexceptionalio ==0.5.1 - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 - - unicode-collation ==0.1.3.1 + - unicode-collation ==0.1.3.2 - unicode-data ==0.3.0 - unicode-show ==0.1.1.1 - unicode-transforms ==0.4.0.1 @@ -2826,6 +2823,7 @@ default-package-overrides: - xmonad ==0.17.0 - xmonad-contrib ==0.17.0 - xmonad-extras ==0.17.0 + - xor ==0.0.1.1 - xss-sanitize ==0.3.7 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.8.0 @@ -2848,7 +2846,7 @@ default-package-overrides: - yesod-gitrev ==0.2.2 - yesod-markdown ==0.12.6.13 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.10 + - yesod-page-cursor ==2.0.1.0 - yesod-paginator ==1.1.2.1 - yesod-persistent ==1.6.0.8 - yesod-recaptcha2 ==1.0.2 From 8f4dd98a47378d7c86deafb00df25f08e92c1c94 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 29 May 2022 19:12:54 +0200 Subject: [PATCH 03/27] all-cabal-hashes: 2022-05-20T19:45:02Z -> 2022-05-29T17:05:02Z 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 6b7041d7e674..5894a522434c 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "d69efcbdc39d5a7ae25039f9737ad04e34f38f68", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d69efcbdc39d5a7ae25039f9737ad04e34f38f68.tar.gz", - "sha256": "1xlnp36h5r8q3nf1fbq472rkqp0wmgz51rylnd23kl0pba2fypkp", - "msg": "Update from Hackage at 2022-05-20T19:45:02Z" + "commit": "1da63d5bfb88cd1e920fefd1b55650c78edc5539", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1da63d5bfb88cd1e920fefd1b55650c78edc5539.tar.gz", + "sha256": "1n8qv8ajfwrj73f81m2zj81jyjx1jxxhjljwp8gch2aq8piz74g6", + "msg": "Update from Hackage at 2022-05-29T17:05:02Z" } From d4323047f48bacefdd9e8943f675107da2df4854 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 29 May 2022 19:13:48 +0200 Subject: [PATCH 04/27] 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 | 2289 ++++++++--------- 1 file changed, 1131 insertions(+), 1158 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cfccf3c8a4e4..7c59e52bef37 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1136,8 +1136,10 @@ self: { }: mkDerivation { pname = "AspectAG"; - version = "0.7.0.0"; - sha256 = "1w5zfx5vgvkys84vdrdd3rv39ly25wbn9izlir19irniqsbf6z6v"; + version = "0.7.0.1"; + sha256 = "00cprqks3lany16zbmm250p1qms4hampwck44m688z2xk388gakn"; + revision = "2"; + editedCabalFile = "0hlgkm8ph28x1dkjprjjajdwk8y7ghsb9i6vr5jbr046vzrziblp"; libraryHaskellDepends = [ base containers ghc-prim loch-th mtl poly-rec requirements template-haskell @@ -2099,18 +2101,18 @@ self: { "BlogLiterately-diagrams" = callPackage ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder , diagrams-lib, diagrams-rasterific, directory, filepath - , JuicyPixels, pandoc, safe, split + , JuicyPixels, pandoc, safe, split, text }: mkDerivation { pname = "BlogLiterately-diagrams"; - version = "0.2.1"; - sha256 = "0ki56kc51p1b9zkvs91adgj140pchnbdwfmhsvb4qzzf9sz90kjb"; + version = "0.3"; + sha256 = "0l9h8anjbvm49fg1niy4sg8cxr3fl1kvmqfb1lfdi5vypdgqqwms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base BlogLiterately containers diagrams-builder diagrams-lib diagrams-rasterific directory filepath JuicyPixels pandoc safe - split + split text ]; executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; @@ -3029,10 +3031,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.9.3"; - sha256 = "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry"; - revision = "3"; - editedCabalFile = "0lgfq5cmhx0q9wqnplw1xr5ql88jjffzc0i72v1lfiqsp9w3lppf"; + version = "1.9.4"; + sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -3067,10 +3067,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.9.3"; - sha256 = "075yzq50jpakgq6lb3anr660jydm68ry0di33icdacbdymq8avwn"; - revision = "4"; - editedCabalFile = "0qsgg78plwr7wabc680x8qshv137vhplqqvs4730xb62z45r6kjl"; + version = "1.9.4"; + sha256 = "0rkkmyfszzpnbw1s6lqg2fadkbvgqrxrp1rvj9v45ihzwnpbg758"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -12918,6 +12916,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ListLike_4_7_7" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7.7"; + sha256 = "0h4yfzrf3ljvzf3x75nx791bpxlmdi7f42ff0xyfk8d498iws08a"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -13702,6 +13722,8 @@ self: { pname = "MissingH"; version = "1.5.0.1"; sha256 = "0c92fdv32nq51kfdizi3lpxmnvscsgk6marfzaycd7k05aka8byb"; + revision = "1"; + editedCabalFile = "18jigc9mis823dhlx14yd0r59618jwqw93hsdyzmdrgfaigd6qpn"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process regex-compat time @@ -19827,26 +19849,23 @@ self: { }) {}; "TLT" = callPackage - ({ mkDerivation, ansi-terminal, base, either, free, HUnit, mtl - , resourcet, STMonadTrans, symbol, transformers + ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet + , STMonadTrans, transformers }: mkDerivation { pname = "TLT"; - version = "0.1.0.1"; - sha256 = "1b91ax19dfgi50rlkfvjjywzz6w998d5jsq5c0yz620rcdl7jrki"; + version = "0.3.0.0"; + sha256 = "0pl9ga3vr9yj4f4k2pisq8yarhbsbfvj9q3n24f0db8csq363yc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base either free HUnit mtl resourcet STMonadTrans - symbol transformers + ansi-terminal base free mtl resourcet STMonadTrans transformers ]; executableHaskellDepends = [ - ansi-terminal base either free HUnit mtl resourcet STMonadTrans - symbol transformers + ansi-terminal base free mtl resourcet STMonadTrans transformers ]; testHaskellDepends = [ - ansi-terminal base either free HUnit mtl resourcet STMonadTrans - symbol transformers + ansi-terminal base free mtl resourcet STMonadTrans transformers ]; description = "Testing in monads and transformers without explicit specs"; license = lib.licenses.lgpl3Only; @@ -20037,6 +20056,32 @@ self: { broken = true; }) {}; + "TastyTLT" = callPackage + ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet + , STMonadTrans, tagged, tasty, TLT, transformers + }: + mkDerivation { + pname = "TastyTLT"; + version = "0.0.0.0"; + sha256 = "0xcwsgn5d8gsingxw6nq12gibxc3gn99bqr2pzbflysyygwf4gz1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base free mtl resourcet STMonadTrans tagged tasty TLT + transformers + ]; + executableHaskellDepends = [ + ansi-terminal base free mtl resourcet STMonadTrans tagged tasty TLT + transformers + ]; + testHaskellDepends = [ + ansi-terminal base free mtl resourcet STMonadTrans tagged tasty TLT + transformers + ]; + description = "Run TLT tests from Tasty"; + license = lib.licenses.lgpl3Only; + }) {}; + "Taxonomy" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl , graphviz, parsec, text, vector @@ -24238,24 +24283,6 @@ self: { }) {}; "ad" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , criterion, data-reify, erf, free, nats, reflection, semigroups - , transformers - }: - mkDerivation { - pname = "ad"; - version = "4.5"; - sha256 = "1v37ckxcav3aicv4vv7y77mmvinfwd8mxzcnm672mmxq1d29vpsc"; - libraryHaskellDepends = [ - adjunctions array base comonad containers data-reify erf free nats - reflection semigroups transformers - ]; - benchmarkHaskellDepends = [ base criterion erf ]; - description = "Automatic Differentiation"; - license = lib.licenses.bsd3; - }) {}; - - "ad_4_5_1" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , criterion, data-reify, erf, free, nats, reflection, semigroups , transformers @@ -24271,7 +24298,6 @@ self: { benchmarkHaskellDepends = [ base criterion erf ]; description = "Automatic Differentiation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ad-delcont" = callPackage @@ -24840,6 +24866,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-commit_1_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, hspec, text, transformers + }: + mkDerivation { + pname = "aeson-commit"; + version = "1.5"; + sha256 = "1xblprnxnx7q1mf7qp47ilkd6i8s36ixdlb75dqr297izn0sxp39"; + libraryHaskellDepends = [ aeson base text transformers ]; + testHaskellDepends = [ aeson aeson-qq base hspec text ]; + description = "Parse Aeson data with commitment"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -24948,6 +24988,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-diff_1_1_0_13" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest + , directory, doctest, edit-distance-vector, filepath, Glob + , optparse-applicative, QuickCheck, scientific, text, vector, yaml + }: + mkDerivation { + pname = "aeson-diff"; + version = "1.1.0.13"; + sha256 = "0sd13q0nj0k1sam5xfj6dcjcki18f375sa69hm6i4xc6snfhn3cb"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base bytestring edit-distance-vector scientific text vector + ]; + executableHaskellDepends = [ + aeson base bytestring optparse-applicative yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest filepath Glob QuickCheck + vector + ]; + description = "Extract and apply patches to JSON documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-diff-generic" = callPackage ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring , containers, dlist, hashable, lens, scientific, tagged @@ -36471,8 +36538,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.2.8"; - sha256 = "1frvim9asp0849g7f5c1hcjkr82c9w27im479vmk6n4zzssvzach"; + version = "3.2.9"; + sha256 = "0hw96090gb4rf6n6mf9mn2y50sjgcvny2ipdd9720an33nhpsd3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45555,8 +45622,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.19.1.0"; - sha256 = "0vflzwc90w69c78xpjldvgywl1ykn73wzq06501lnl6bwb07ahs0"; + version = "0.20.0.0"; + sha256 = "175w602jvjrf2j1jaygj4spznyq66ga5mkbpfi6nzrygv609dbrh"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers exceptions hashable http-client http-types mtl network-uri scientific semigroups semver @@ -47233,6 +47300,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_69" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.69"; + sha256 = "1q963gpcjcrnsyrypkb238ay8lbkq8745pxkanmhy4m40gvk5j94"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -48016,10 +48110,8 @@ self: { }: mkDerivation { pname = "buffer-builder-aeson"; - version = "0.2.0.4"; - sha256 = "0kjwahpx35mabmwnwfi669p1gcr43zas2f5wpaxn98p45gjpp93s"; - revision = "1"; - editedCabalFile = "112b8ir16x2dla4vm6yrdjxsi6csi8wl0193iykrvmssrybpqr89"; + version = "0.2.0.5"; + sha256 = "19drq1rqg06czl9aswv432yl9kkdzgkxyzfy526kzy22ffpm4asr"; libraryHaskellDepends = [ aeson base buffer-builder bytestring integer-gmp scientific unordered-containers vector @@ -49240,30 +49332,6 @@ self: { }) {}; "bytestring-conversion" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, case-insensitive - , criterion, double-conversion, QuickCheck, tasty, tasty-quickcheck - , text, transformers - }: - mkDerivation { - pname = "bytestring-conversion"; - version = "0.3.1"; - sha256 = "1y2fhwz632sp7n0iw87lz2g8vks4jgxz2kw99kysgivxfd4fmdqk"; - revision = "2"; - editedCabalFile = "1x8c42cfzb6fdvgkxxdxcpdf16csimlzsgahb1axnplmr6b3ba63"; - libraryHaskellDepends = [ - attoparsec base bytestring case-insensitive double-conversion text - ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion text transformers - ]; - description = "Type-classes to convert values to and from ByteString"; - license = lib.licenses.mpl20; - }) {}; - - "bytestring-conversion_0_3_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , criterion, double-conversion, QuickCheck, tasty, tasty-quickcheck , text, transformers @@ -49283,7 +49351,6 @@ self: { ]; description = "Type-classes to convert values to and from ByteString"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-csv" = callPackage @@ -50441,6 +50508,8 @@ self: { pname = "cabal-doctest"; version = "1.0.9"; sha256 = "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"; + revision = "1"; + editedCabalFile = "0dw9h3zqivzzisjz0g3ccb10fwz858dhvy6hvwm5i1sj80wm8imd"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for running doctests"; license = lib.licenses.bsd3; @@ -50651,6 +50720,8 @@ self: { pname = "cabal-info"; version = "0.2.1"; sha256 = "1gf4f80964l9mj53rn0anciz6p0035lrcc0lxbnh5dgh3iiap14l"; + revision = "1"; + editedCabalFile = "1cmwk131swxkzc9d7i2q4y833wi5vfppnw6178w5wmnxsjz1vgkk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51265,6 +51336,8 @@ self: { pname = "cabal2nix"; version = "2.18.0"; sha256 = "11hzic1l7amd2hwqwgfmy2r855z9w0m2rvvx7r52x347q0nn142b"; + revision = "1"; + editedCabalFile = "0j682816qdxaqm56bqjigjg0c0nl4jf68fg01f73xhbr486lzvga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54232,6 +54305,8 @@ self: { pname = "cborg"; version = "0.2.7.0"; sha256 = "076656vq2qabhdnwzifc5gsj20vwh69vhy19dh0qa1f2lqxrzfvq"; + revision = "1"; + editedCabalFile = "02n2d8i0yc5qk77r5b63hqvd79ygcdk1pnf445nmp4bfsjvv8jyj"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -54537,6 +54612,8 @@ self: { pname = "cereal"; version = "0.5.8.2"; sha256 = "0kvnlm22qdmb7g2jz7imsvh799q4nvms1ni0cbba5vigp5ai64hp"; + revision = "1"; + editedCabalFile = "16hdvwa1qpwicn512mnsksi4zdnwmqnn9sdga4iy3jza4rj9lzgy"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -58235,8 +58312,8 @@ self: { }: mkDerivation { pname = "cleff"; - version = "0.3.2.0"; - sha256 = "0ayvywkd88p5frr41405jz82zya31jslbzxzln2x01maibjyyf2h"; + version = "0.3.3.0"; + sha256 = "0fnpk28nhafypp7p1ay1760sin9hh06dz23r68gmm93i879ayl9b"; libraryHaskellDepends = [ atomic-primops base containers exceptions microlens monad-control primitive template-haskell th-abstraction transformers-base @@ -61308,6 +61385,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "comfort-array_0_5_1_1" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, deepseq + , doctest-exitcode-stdio, doctest-lib, guarded-allocation + , non-empty, prelude-compat, primitive, QuickCheck, semigroups + , storable-record, storablevector, tagged, transformers, utility-ht + }: + mkDerivation { + pname = "comfort-array"; + version = "0.5.1.1"; + sha256 = "07rajrpp495g17naywybkrydd67ixiav5g8rayavwabvyrybnmgy"; + libraryHaskellDepends = [ + base containers deepseq guarded-allocation non-empty prelude-compat + primitive QuickCheck semigroups storable-record storablevector + tagged transformers utility-ht + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest-exitcode-stdio doctest-lib + QuickCheck tagged + ]; + description = "Arrays where the index type is a function of the shape type"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "comfort-array-shape" = callPackage ({ mkDerivation, base, ChasingBottoms, comfort-array, containers , doctest-exitcode-stdio, doctest-lib, fixed-length, non-empty @@ -62358,8 +62459,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.7.5.0"; - sha256 = "0cxsjk3zwkhwb3bgq2ji1mvvapcwxzg333z7zfdv9ba3xgw3ngq0"; + version = "0.8.0.0"; + sha256 = "0j74nz3ih5hyl8ljld9m9nd1zip9ibpm55bavgzpp2wknxsrkwzg"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -62398,8 +62499,8 @@ self: { ({ mkDerivation, base, composite-aeson, path }: mkDerivation { pname = "composite-aeson-path"; - version = "0.7.5.0"; - sha256 = "0b013jpdansx6fmxq1sf33975vvnajhs870a92i1lwd2k2wsj600"; + version = "0.8.0.0"; + sha256 = "05n7kcgxgwc06ja3yhspmidi5i4a5j5xj8ivlkh7g5plm4crrvlp"; libraryHaskellDepends = [ base composite-aeson path ]; description = "Formatting data for the path library"; license = lib.licenses.bsd3; @@ -62412,8 +62513,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.7.5.0"; - sha256 = "05iakig5cqy4zkfl1kvjf9ck7gw5m7bdlcwwnv0kc5znyj66fbif"; + version = "0.8.0.0"; + sha256 = "109fd2y7c0jq620rdyghkk6f4ikx8ajxxw7zia6dq3zz5rkpqj16"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -62460,8 +62561,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.7.5.0"; - sha256 = "12qaxm20kn2cf6d19xargxfg8jrvb5ix0glm3ba0641plxlssqrq"; + version = "0.8.0.0"; + sha256 = "1zl2jxgsa55zkzrji4cwfrf38ijm8qby66rk7wxl3nri69914d0i"; libraryHaskellDepends = [ base deepseq exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core @@ -62480,8 +62581,8 @@ self: { ({ mkDerivation, base, binary, composite-base }: mkDerivation { pname = "composite-binary"; - version = "0.7.5.0"; - sha256 = "0pvmmb4m6ysgj468khmggvsgs5c0hjmcn46s0wam353abdw89i7m"; + version = "0.8.0.0"; + sha256 = "1qq8jslsr58kpvrbhhv27x5vn564y8fiq9djdvlqri10012v1bbm"; libraryHaskellDepends = [ base binary composite-base ]; description = "Orphan binary instances"; license = lib.licenses.bsd3; @@ -62540,8 +62641,8 @@ self: { ({ mkDerivation, base, composite-base, hashable }: mkDerivation { pname = "composite-hashable"; - version = "0.7.5.0"; - sha256 = "1s4bnlr08fb1sszys1frkxrjrsi61jpcldh126mcwzlf6wlvqvjn"; + version = "0.8.0.0"; + sha256 = "12rb0iaxlx1hci14pa98maw0pjghrnirxfn5z1mrn139938wdha6"; libraryHaskellDepends = [ base composite-base hashable ]; description = "Orphan hashable instances"; license = lib.licenses.bsd3; @@ -62555,6 +62656,8 @@ self: { pname = "composite-ix"; version = "0.0.1.0"; sha256 = "0kyy3fm1z9w2mwrhwn3gz5hpvykzsnij0rrsqi2fh3gd1dsxgc6c"; + revision = "1"; + editedCabalFile = "1ngh5b814hp64mh91h9h7qw29yz3ir7nli3nz6klpimnnddr6871"; libraryHaskellDepends = [ base composite-base containers lens nonempty-containers vector vinyl @@ -62581,8 +62684,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.5.0"; - sha256 = "1qmlhn1lj2l5qpykxdg23axvxwn8l2pvzvwqn261rj21qj90k093"; + version = "0.8.0.0"; + sha256 = "1h0xa0x038mgpmp9chycgf9bm8w4zfnsdcfzb4zxjw1hyv8csl8s"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -62605,8 +62708,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.5.0"; - sha256 = "1b6bcw7gq2smghp7mnkh9gymn3mh4b1xxkv97zhxjsb91wnmvyml"; + version = "0.8.0.0"; + sha256 = "1ikq68bnfgxa003y0q3g512h40and5l0k4qm3yb7bpbinbip9123"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -63329,8 +63432,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.15"; - sha256 = "1n02ck0zci6y2w8dm03j2qypgbc176skapixrmnxrp9dnbwcprc0"; + version = "1.10.16"; + sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -63750,6 +63853,23 @@ self: { license = lib.licenses.mit; }) {}; + "conduit-concurrent-map_0_1_3" = callPackage + ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl + , QuickCheck, resourcet, say, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-concurrent-map"; + version = "0.1.3"; + sha256 = "0mpbklyfqdc1wzx5z4dy2x2y5zi8bb7p83q04csybj5c5f4136yq"; + libraryHaskellDepends = [ + base conduit containers mtl resourcet unliftio unliftio-core vector + ]; + testHaskellDepends = [ base conduit hspec HUnit QuickCheck say ]; + description = "Concurrent, order-preserving mapping Conduit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -64695,8 +64815,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.5"; - sha256 = "1wmdg9zxfz8vhhsq5rraynhrhqc8fjrdhfrky2mfajzbp8dpaqsm"; + version = "0.2.6"; + sha256 = "0zlj733fyw0iiczjzzp9mlgywd175crp853wyp9b1gq1m2j6vxnm"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -65184,25 +65304,6 @@ self: { }) {}; "constraints" = callPackage - ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec - , hspec-discover, mtl, transformers, transformers-compat - , type-equality - }: - mkDerivation { - pname = "constraints"; - version = "0.13.3"; - sha256 = "0jhdix263zxsiki0pmdpyrg7vcfxx2x9w7pjiypva3wsr9agdjzr"; - libraryHaskellDepends = [ - base binary deepseq ghc-prim hashable mtl transformers - transformers-compat type-equality - ]; - testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; - description = "Constraint manipulation"; - license = lib.licenses.bsd2; - }) {}; - - "constraints_0_13_4" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec , hspec-discover, mtl, transformers, transformers-compat , type-equality @@ -65219,7 +65320,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Constraint manipulation"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "constraints-deriving" = callPackage @@ -66293,6 +66393,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "convertible_1_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, old-time + , QuickCheck, text, time + }: + mkDerivation { + pname = "convertible"; + version = "1.1.1.1"; + sha256 = "1vwc6h1z88xkw4bq3js8x9x86jnk3amdskyksca77p0kwiqbs7lr"; + libraryHaskellDepends = [ + base bytestring containers mtl old-time text time + ]; + testHaskellDepends = [ base containers old-time QuickCheck time ]; + description = "Typeclasses and instances for converting between types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "convertible-ascii" = callPackage ({ mkDerivation, ascii, base, base-unicode-symbols, blaze-builder , bytestring, convertible-text, failure, text @@ -66713,8 +66830,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.2.0.1"; - sha256 = "1l302ncnv1w3p84v16acxvkyr6kvrr6385i7qdrmqi0a8yfwizb0"; + version = "0.2.2.0"; + sha256 = "1l2h14x375v5dfamjbmknx28kyi18l2anv46887807bd3yz84552"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program core-text exceptions http-streams io-streams mtl network-info @@ -66781,8 +66898,8 @@ self: { }: mkDerivation { pname = "core-webserver-warp"; - version = "0.1.1.4"; - sha256 = "03jsb8x41v62l065lkdy2zr6cwk80l84ai6lnbwxf1472f5p7619"; + version = "0.1.1.5"; + sha256 = "0i8w0fga1x2hm3hhacyi7xmi86dhglw78786wijghwpqlfgayy9w"; libraryHaskellDepends = [ async base bytestring core-data core-program core-telemetry core-text http-types http2 mtl safe-exceptions vault wai warp @@ -70134,10 +70251,8 @@ self: { }: mkDerivation { pname = "cue-sheet"; - version = "2.0.1"; - sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i"; - revision = "3"; - editedCabalFile = "1v8yvvb9sdpkg7m6z5a4sf0hcss7swb318700ap0qc79qn4ifdqb"; + version = "2.0.2"; + sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -79229,8 +79344,8 @@ self: { }: mkDerivation { pname = "dino"; - version = "0.1.2"; - sha256 = "0sk7p89fmjynykk7djfn8cmmjrqyv5pml9ny2dycr1n86cnxr88x"; + version = "0.1.3"; + sha256 = "13p5bivvl5cicv61rnx268i4156vgxiz9cf20xfrwz4pdxffr3al"; libraryHaskellDepends = [ ansi-wl-pprint base containers errors exceptions hashable monad-loops mtl text transformers tree-view unordered-containers @@ -80812,6 +80927,28 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "distribution-nixpkgs_1_7_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, hspec, language-nix, lens, pretty, process + }: + mkDerivation { + pname = "distribution-nixpkgs"; + version = "1.7.0"; + sha256 = "007riyq6irmzzmf3gynaa5hpz8a4khg8wl4blyz78c59bqblpw69"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq language-nix lens + pretty process + ]; + testHaskellDepends = [ + aeson base Cabal deepseq directory hspec language-nix lens + ]; + description = "Types and functions to manipulate the Nixpkgs distribution"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "distribution-opensuse" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class @@ -81005,10 +81142,8 @@ self: { ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { pname = "djinn-lib"; - version = "0.0.1.3"; - sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v"; - revision = "1"; - editedCabalFile = "0zz4q631wpxdm4h499j0m1kin4n1ahnwzb0x2jh6vd463i89xlbk"; + version = "0.0.1.4"; + sha256 = "1s4kx6h6vj0hi2v87q95jb2wpg6hgq5qiswv0lh5qhmnb367c8w8"; libraryHaskellDepends = [ base containers mtl pretty ]; description = "Generate Haskell code from a type. Library extracted from djinn package."; license = lib.licenses.bsd3; @@ -82084,6 +82219,36 @@ self: { broken = true; }) {}; + "doctest-parallel_0_2_3" = callPackage + ({ mkDerivation, base, base-compat, Cabal, code-page, containers + , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths + , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty + , process, QuickCheck, random, setenv, silently, stringbuilder, syb + , template-haskell, transformers, unordered-containers + }: + mkDerivation { + pname = "doctest-parallel"; + version = "0.2.3"; + sha256 = "0sk1990ksqcgc13kppbh0xljakn3qsqaxi19990fixwakhzh229v"; + libraryHaskellDepends = [ + base base-compat Cabal code-page containers deepseq directory + exceptions extra filepath ghc ghc-paths Glob pretty 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 hspec-discover HUnit + mockery process QuickCheck setenv silently stringbuilder syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -82672,6 +82837,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "dotparse" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg + , containers, flatparse, neat-interpolation, numhask, numhask-space + , optics-core, process-extras, template-haskell, text, these + }: + mkDerivation { + pname = "dotparse"; + version = "0.0.1"; + sha256 = "1nwbyra3aksllxg5dymjlsy8ikd1rjj5lgfd9gs9s1sh746gakzx"; + libraryHaskellDepends = [ + algebraic-graphs base bytestring chart-svg containers flatparse + neat-interpolation numhask numhask-space optics-core process-extras + template-haskell text these + ]; + description = "dot language parsing and printing"; + license = lib.licenses.bsd3; + }) {}; + "double-conversion" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -86269,8 +86452,8 @@ self: { pname = "ekg-core"; version = "0.1.1.7"; sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; - revision = "1"; - editedCabalFile = "17rfxsns0za7jqp3069mwp0lbd433gwb7lrnla02y7hfxbpnldf4"; + revision = "2"; + editedCabalFile = "05h0jz42s1d3bjcvzbp3dv5rvil4ar244mdqdvzbf60z848ppygl"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -88686,6 +88869,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "equivalence_0_4_0_1" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans + , template-haskell, transformers, transformers-compat + }: + mkDerivation { + pname = "equivalence"; + version = "0.4.0.1"; + sha256 = "1pcv64dflv9kknz9smnq4a7pd8jmghi3g4kri1dw0cnb54g7rj7c"; + libraryHaskellDepends = [ + base containers mtl STMonadTrans transformers transformers-compat + ]; + testHaskellDepends = [ + base containers mtl QuickCheck STMonadTrans template-haskell + transformers transformers-compat + ]; + description = "Maintaining an equivalence relation implemented as union-find using STT"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "erd" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , gitrev, graphviz, parsec, raw-strings-qq, tasty, tasty-hunit @@ -89034,8 +89237,8 @@ self: { pname = "errors"; version = "2.3.0"; sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7"; - revision = "2"; - editedCabalFile = "1x1bhmkx7zxwdfassc9ypl9d319p6f14rv6d3mjgvac7nxfbq245"; + revision = "3"; + editedCabalFile = "18siil7qihpjwimvidm9xqn38wmpcsnaybdkch7nmkgzn1jxl94n"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat ]; @@ -89090,33 +89293,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , data-default, fail, lens, mtl, parsec, process, semigroups - , streams, temporary, transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.10"; - sha256 = "1pklw9zhpxkm5yhkdlw78c2324ffk8n5pqkvicxh0x0ha852fs7y"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups streams temporary transformers - unordered-containers - ]; - executableHaskellDepends = [ - array base containers fail lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ersatz_0_4_11" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , data-default, fail, lens, mtl, parsec, process, semigroups , streams, temporary, transformers, unordered-containers @@ -92086,8 +92262,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.8.3"; - sha256 = "1cwh7a6mipyh4a7vs1394wmmbm1ms5cs9snl5nd1mg1v455ykcmb"; + version = "0.9"; + sha256 = "06zmc71r4cqglkv3av38djbkakvw9zxc3901xi2h65fwxn4npvnc"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq ghc-prim hashable incremental membership prettyprinter primitive profunctors @@ -94015,12 +94191,12 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "fedora-dists_2_1_0" = callPackage + "fedora-dists_2_1_1" = callPackage ({ mkDerivation, aeson, base, cached-json-file, pdc, text }: mkDerivation { pname = "fedora-dists"; - version = "2.1.0"; - sha256 = "040qn1fbc3iss4p5svcsy5crpcs2x38y6ns3wf1zjx05lz40gb07"; + version = "2.1.1"; + sha256 = "0790akym2rrcch9jjky9v4qc6y22vg1w6ffi9nbx42zijkqmsm1f"; libraryHaskellDepends = [ aeson base cached-json-file pdc text ]; description = "Library for Fedora distribution versions"; license = lib.licenses.gpl3Only; @@ -96261,6 +96437,24 @@ self: { license = "unknown"; }) {}; + "fix-whitespace_0_0_8" = callPackage + ({ mkDerivation, base, directory, extra, filepath, filepattern + , text, yaml + }: + mkDerivation { + pname = "fix-whitespace"; + version = "0.0.8"; + sha256 = "1vjbh3jx67xdzxnpyh9k2c5qv5axw07wck5jmahg0kxrj1w2nhh6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath filepattern text yaml + ]; + description = "Fixes whitespace issues"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96945,16 +97139,16 @@ self: { "flatparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, gauge , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive - , template-haskell + , QuickCheck, template-haskell }: mkDerivation { pname = "flatparse"; - version = "0.3.2.0"; - sha256 = "0jnf1sxd39xd2jry2p7d9sj29ym0bs4wb3yskl9sjwa6ssck4vdq"; + version = "0.3.3.0"; + sha256 = "00ggikjgyb5sivj5aff328gaamxi241y6kign8l9pvrr802xmc0c"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell ]; - testHaskellDepends = [ base bytestring hspec HUnit ]; + testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; benchmarkHaskellDepends = [ attoparsec base bytestring gauge integer-gmp megaparsec parsec primitive @@ -98192,26 +98386,6 @@ self: { }) {}; "folds" = callPackage - ({ mkDerivation, adjunctions, base, bifunctors, comonad - , constraints, contravariant, data-reify, distributive, lens, mtl - , pointed, profunctors, reflection, semigroupoids, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "folds"; - version = "0.7.7"; - sha256 = "1hggk92i61f3nxcjdxvgs3b8am3jypig09s9wqwrwzaclx0mk5sh"; - configureFlags = [ "-f-test-hlint" ]; - libraryHaskellDepends = [ - adjunctions base bifunctors comonad constraints contravariant - data-reify distributive lens mtl pointed profunctors reflection - semigroupoids transformers unordered-containers vector - ]; - description = "Beautiful Folding"; - license = lib.licenses.bsd3; - }) {}; - - "folds_0_7_8" = callPackage ({ mkDerivation, adjunctions, base, bifunctors, comonad , constraints, contravariant, data-reify, distributive, lens, mtl , pointed, profunctors, reflection, semigroupoids, transformers @@ -98229,7 +98403,6 @@ self: { ]; description = "Beautiful Folding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "folds-common" = callPackage @@ -99515,39 +99688,41 @@ self: { }) {}; "freckle-app" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring + ({ mkDerivation, aeson, ansi-terminal, base, bugsnag, bytestring , case-insensitive, conduit, containers, data-default, datadog , directory, doctest, ekg-core, errors, exceptions, fast-logger , filepath, Glob, hashable, hspec, hspec-core , hspec-expectations-lifted, hspec-junit-formatter, http-client , http-conduit, http-link-header, http-types, immortal, iproute - , lens, lens-aeson, load-env, monad-control, monad-logger + , lens, lens-aeson, load-env, memcache, monad-control, monad-logger , MonadRandom, mtl, network, network-uri, persistent , persistent-postgresql, postgresql-simple, primitive, process - , resource-pool, retry, rio, safe, semigroupoids, template-haskell - , temporary, text, time, transformers, transformers-base, unliftio - , unordered-containers, vector, wai, wai-extra, yaml, yesod - , yesod-core + , resource-pool, retry, rio, safe, scientist, semigroupoids + , template-haskell, temporary, text, time, transformers + , transformers-base, unliftio, unliftio-core, unordered-containers + , vector, wai, wai-extra, yaml, yesod, yesod-core }: mkDerivation { pname = "freckle-app"; - version = "1.0.2.10"; - sha256 = "05y2b4lfc0wxygjrvjlw3nfl9s1x9km095k2vzj57mb58zkr3kyv"; + version = "1.0.4.0"; + sha256 = "0snlgizlbi7izqv66izcf2s3ns5yj8h75jmh1f0ialkppzz1bh07"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring case-insensitive conduit - containers data-default datadog doctest ekg-core errors exceptions - fast-logger filepath Glob hashable hspec hspec-core + aeson ansi-terminal base bugsnag bytestring case-insensitive + conduit containers data-default datadog doctest ekg-core errors + exceptions fast-logger filepath Glob hashable hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-conduit http-link-header http-types immortal iproute lens - load-env monad-control monad-logger MonadRandom mtl network - network-uri persistent persistent-postgresql postgresql-simple - primitive process resource-pool retry rio safe semigroupoids - template-haskell text time transformers transformers-base unliftio - unordered-containers vector wai wai-extra yaml yesod yesod-core + load-env memcache monad-control monad-logger MonadRandom mtl + network network-uri persistent persistent-postgresql + postgresql-simple primitive process resource-pool retry rio safe + scientist semigroupoids template-haskell text time transformers + transformers-base unliftio unordered-containers vector wai + wai-extra yaml yesod yesod-core ]; testHaskellDepends = [ - aeson base bytestring directory hspec http-types lens lens-aeson - process temporary text time wai wai-extra + aeson base bytestring directory errors hspec http-types lens + lens-aeson memcache monad-logger mtl postgresql-simple process + temporary text time unliftio-core wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -102114,25 +102289,6 @@ self: { }) {}; "fuzzyset" = callPackage - ({ mkDerivation, base, data-default, hspec, ieee754, text - , text-metrics, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; - version = "0.2.2"; - sha256 = "1153xv53l6khw7yy36pfaf7pmmlwpg4ig7ywk4rxj375janlg1g8"; - libraryHaskellDepends = [ - base data-default text text-metrics unordered-containers vector - ]; - testHaskellDepends = [ - base data-default hspec ieee754 text text-metrics - unordered-containers vector - ]; - description = "Fuzzy set for approximate string matching"; - license = lib.licenses.bsd3; - }) {}; - - "fuzzyset_0_2_3" = callPackage ({ mkDerivation, base, data-default, hspec, ieee754, text , text-metrics, unordered-containers, vector }: @@ -102149,7 +102305,6 @@ self: { ]; description = "Fuzzy set for approximate string matching"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -106167,7 +106322,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_2_2_20220307" = callPackage + "ghc-lib_9_2_3_20220527" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -106175,8 +106330,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.2.2.20220307"; - sha256 = "0hcm4px40791rnfxaxmkwaydgsp43vnka02jj3bq57jylklvr0y4"; + version = "9.2.3.20220527"; + sha256 = "0ldafrp5j91cjqgh78vfqjmf1ywj1cjhjyxch9yqlj6yz4r6gqi4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -106229,15 +106384,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_2_2_20220307" = callPackage + "ghc-lib-parser_9_2_3_20220527" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.2.20220307"; - sha256 = "123bkxir6qrhyxjzlv3vm1p8wiah24i1r4ary79lhp14phyv5x46"; + version = "9.2.3.20220527"; + sha256 = "0w7rnpjyrl8h8rxplfwqdsj9g4q8y8fz9rs8mshil1f4wxnc6nmx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -106290,14 +106445,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_2_0_3" = callPackage + "ghc-lib-parser-ex_9_2_0_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.2.0.3"; - sha256 = "178cgr279716gpnlsky99qasmk9jma2jdsk8xfnhk6ibm1p5gfbv"; + version = "9.2.0.4"; + sha256 = "138wkpy7qpdkp07028flab3lwq4b3mns0qcrkfrhclixlz8pi74v"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -106547,29 +106702,6 @@ self: { }) {c = null;}; "ghc-prof" = callPackage - ({ mkDerivation, attoparsec, base, containers, directory, filepath - , process, scientific, tasty, tasty-hunit, temporary, text, time - }: - mkDerivation { - pname = "ghc-prof"; - version = "1.4.1.9"; - sha256 = "1m7pwrwf45hc8nscl9kzzw9n0blnfpx7dl38kv8hvshaqbbg0v4q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers scientific text time - ]; - testHaskellDepends = [ - attoparsec base containers directory filepath process tasty - tasty-hunit temporary text - ]; - description = "Library for parsing GHC time and allocation profiling reports"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ghc-prof_1_4_1_11" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, scientific, tasty, tasty-hunit, temporary, text, time }: @@ -109337,8 +109469,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220504"; - sha256 = "10pp58b7glwi1yckrij49d1iq99pc4dpkkbkb1qqiif9dr9672f3"; + version = "10.20220525"; + sha256 = "1nrwa4qm3xkr11x0b0c1mx052zhd7lz9w97xf0ycdkhsyc6vbiy6"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -109899,6 +110031,8 @@ self: { pname = "github"; version = "0.28"; sha256 = "142l0zff852606hkpvkhvagp6h3ziq2z2x7x2pa77q5ymyq48089"; + revision = "3"; + editedCabalFile = "03cn567jgkgd8a78ymm9zws8fp8881kmpj6jkb7cj3kbq05062jv"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -116964,17 +117098,17 @@ self: { }) {}; "grow-vector" = callPackage - ({ mkDerivation, base, primitive, quickcheck-instances, tasty - , tasty-discover, tasty-hspec, tasty-quickcheck, vector + ({ mkDerivation, base, hspec, primitive, quickcheck-instances + , tasty, tasty-discover, tasty-hspec, tasty-quickcheck, vector }: mkDerivation { pname = "grow-vector"; - version = "0.1.3.0"; - sha256 = "13b75yghy6nksga98wn8gc9b2198g4pqrm52hrldryyf4v83zadg"; + version = "0.1.5.0"; + sha256 = "1dn6gabmndhi56v3nsapxm9qbf54dp2blhgn8ibza0lnv8hwn15b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ - base primitive quickcheck-instances tasty tasty-discover + base hspec primitive quickcheck-instances tasty tasty-discover tasty-hspec tasty-quickcheck ]; testToolDepends = [ tasty-discover ]; @@ -117213,8 +117347,8 @@ self: { }: mkDerivation { pname = "gsmenu"; - version = "3.0"; - sha256 = "15ddm69fmk0nkkrs5g80amdvld2mq59ah58nbnk83mwkffpi484f"; + version = "3.1"; + sha256 = "0pyz5rhkmdl002f80jc8zksv8jff8bv99hvwg7g6ijfy68yibwsh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119282,8 +119416,8 @@ self: { pname = "hackage-security"; version = "0.6.2.1"; sha256 = "1a349ma9ijypjzgj7xgkkr6rd8k49crdgx330h9vgmp7vlbcs8mz"; - revision = "1"; - editedCabalFile = "0vhwszqngng5vxf2dpn1fdai59s8c7jh6p04jf983y9rzbic6d7b"; + revision = "2"; + editedCabalFile = "1r7jaf7vq90xlcsdq9snlz3d52zqcpijlby7abpzfw09v4mjjjqx"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -120794,6 +120928,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "hal_1_0_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, containers, exceptions + , hashable, hedgehog, hspec, hspec-hedgehog, http-client + , http-types, mtl, raw-strings-qq, scientific, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "hal"; + version = "1.0.0"; + sha256 = "0mfdxjlypb1sj2kcsqks6anh80xy1azcg9lvlpkgz7dgdpjfygaq"; + revision = "1"; + editedCabalFile = "0chjhs3vnzmlwhjlkg24vnpx4baavkj42ldbz25li1r24naw5bsd"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + conduit-extra containers exceptions hashable http-client http-types + mtl scientific text time unordered-containers + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + hedgehog hspec hspec-hedgehog http-client http-types raw-strings-qq + scientific text time transformers unordered-containers vector + ]; + description = "A runtime environment for Haskell applications running on AWS Lambda"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "halberd" = callPackage ({ mkDerivation, base, Cabal, containers, haskell-names , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb @@ -124972,6 +125134,8 @@ self: { pname = "haskell-src"; version = "1.0.4"; sha256 = "1spkhv83hy5v1lxs44l3w53vk8zj7gnx42c40hrkj4fcz6apdiwb"; + revision = "1"; + editedCabalFile = "0dfjzq0sxxcalqxygp2svx4890qx8b4amad0xldwy1f4xrp3lsnb"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -125115,8 +125279,8 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.9"; - sha256 = "0y3hnqg33pqzc66nl58va8lvwvmb0mx5q0p9r55i6cc3xwjahiyx"; + version = "0.8.10"; + sha256 = "0hzwrmv9157wcym1qwy9pxkb8mz5b428nzqf455n6qlrjjjmqpi1"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -125671,8 +125835,8 @@ self: { }: mkDerivation { pname = "haskell-xmpp"; - version = "2.0.1"; - sha256 = "0x06a43h930ad17shvc8iwibkpgbfk6lkkr9mnp0xnwaf6kzrf47"; + version = "2.0.4"; + sha256 = "1nj0n5qxp56vxg9npklkji63y627rypv3gz307785qpcin0vflpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129302,8 +129466,10 @@ self: { ({ mkDerivation }: mkDerivation { pname = "hcom"; - version = "0.0.0.2"; - sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq"; + version = "0.0.0.4"; + sha256 = "1xvl0p58q8l7yq90hfydgy2h5644xxjai99frli719l2mg7s1ndm"; + revision = "3"; + editedCabalFile = "0dzyhd2gjpv7182s1pjvwxwnxa19pva1x94837my57hmnrs7iskh"; doHaddock = false; description = "Haskell COM support library"; license = lib.licenses.bsd3; @@ -130351,8 +130517,8 @@ self: { pname = "hedgehog"; version = "1.1.1"; sha256 = "1qx7bjcdgczvz5xhrqz25lray9rk3wrhzqfc5vpjnvgkzvnj3mny"; - revision = "1"; - editedCabalFile = "0f1s6dbm966cigaf9zz82yxpxdrl4l0qfipa9qazxr90dx4zw70z"; + revision = "2"; + editedCabalFile = "06i998jic83qpihcv7xhc2ny1z3b4k0p22ds79l5l9hfbf0la6rh"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -130562,8 +130728,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "2"; - editedCabalFile = "1n7icqychb94j7s8msmih3h573vf17pn1sq79nkqric3wwf74rdp"; + revision = "3"; + editedCabalFile = "0mfpgn46126y1y2k3i2r5nqxcrsa16il3vyf7ir0w471nmks7n54"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = lib.licenses.bsd3; @@ -130914,37 +131080,38 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder , blaze-html, bytestring, containers, criterion , criterion-measurement, directory, directory-tree, dlist, filepath - , hashable, HUnit, lens, lifted-base, map-syntax, monad-control - , mtl, process, QuickCheck, random, statistics, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, transformers-base, unordered-containers, vector - , xmlhtml + , hashable, HUnit, indexed-traversable, lens, lifted-base + , map-syntax, monad-control, mtl, process, QuickCheck, random + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml }: mkDerivation { pname = "heist-emanote"; - version = "1.2.0.0"; - sha256 = "098gy30vpwwg4hx7nqkic11214y5vrcqazvxk9477ry9rmp7hv85"; + version = "1.2.1.0"; + sha256 = "0xrcgh9g0207zr60r0g5aqzjf0j240zwx6wlwl0jamwjzg45x3ka"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable - lifted-base map-syntax monad-control mtl process random text time - transformers transformers-base unordered-containers vector xmlhtml + indexed-traversable lifted-base map-syntax monad-control mtl + process random text time transformers transformers-base + unordered-containers vector xmlhtml ]; testHaskellDepends = [ aeson attoparsec base bifunctors blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath - hashable HUnit lens lifted-base map-syntax monad-control mtl - process QuickCheck random test-framework test-framework-hunit - test-framework-quickcheck2 text time transformers transformers-base - unordered-containers vector xmlhtml + hashable HUnit indexed-traversable lens lifted-base map-syntax + monad-control mtl process QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unordered-containers vector xmlhtml ]; benchmarkHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers criterion criterion-measurement directory directory-tree - dlist filepath hashable HUnit lifted-base map-syntax monad-control - mtl process random statistics test-framework test-framework-hunit - text time transformers transformers-base unordered-containers - vector xmlhtml + dlist filepath hashable HUnit indexed-traversable lifted-base + map-syntax monad-control mtl process random statistics + test-framework test-framework-hunit text time transformers + transformers-base unordered-containers vector xmlhtml ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; @@ -133341,6 +133508,8 @@ self: { pname = "hi-file-parser"; version = "0.1.2.0"; sha256 = "1jm3gbibafkw3ninvsz7f1x89xdyk6wml45mq9zb85p6m9xqlpv9"; + revision = "1"; + editedCabalFile = "1q53g0h4xnq0fsjbwg1fclnw0kxpzz58p8jrczhmgb4z5wn8g292"; libraryHaskellDepends = [ base binary bytestring mtl rio vector ]; testHaskellDepends = [ base binary bytestring hspec mtl rio vector @@ -133914,16 +134083,16 @@ self: { "highlight" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, bytestring - , containers, criterion, directory, doctest, filepath, lens, mtl - , mtl-compat, optparse-applicative, pipes, pipes-bytestring - , pipes-group, pipes-safe, process, QuickCheck, regex - , regex-with-pcre, semigroups, system-filepath, tasty, tasty-golden - , text, transformers, transformers-compat, unix + , containers, criterion, directory, filepath, lens, mtl, mtl-compat + , optparse-applicative, pipes, pipes-bytestring, pipes-group + , pipes-safe, process, regex, regex-with-pcre, semigroups + , system-filepath, tasty, tasty-golden, text, transformers + , transformers-compat, unix }: mkDerivation { pname = "highlight"; - version = "1.0.0.1"; - sha256 = "0xklv4fnhi4dbz33hzw7l4ng5ap1jfhn4qmkshl2k6gn2pkyaikx"; + version = "1.0.0.2"; + sha256 = "019chfvi85cjcb6minkf5cgxdr6y9m8izw9rf37iq0swawc4icm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133935,8 +134104,8 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base base-compat bytestring directory doctest lens pipes process - QuickCheck tasty tasty-golden transformers transformers-compat unix + base base-compat bytestring directory lens pipes process tasty + tasty-golden transformers transformers-compat unix ]; benchmarkHaskellDepends = [ base criterion ]; description = "Command line tool for highlighting parts of files matching a regex"; @@ -140046,37 +140215,6 @@ self: { }) {}; "hpqtypes" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , directory, exceptions, filepath, HUnit, lifted-base - , monad-control, mtl, postgresql, QuickCheck, random, resource-pool - , scientific, semigroups, test-framework, test-framework-hunit - , text, text-show, time, transformers, transformers-base - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "hpqtypes"; - version = "1.9.3.1"; - sha256 = "02cinc29smiic2zc8z83h9bppsf60yp56a4cb9k4agkjqf5n2036"; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - aeson async base bytestring containers exceptions lifted-base - monad-control mtl resource-pool semigroups text text-show time - transformers transformers-base uuid-types vector - ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers uuid-types vector - ]; - description = "Haskell bindings to libpqtypes"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {inherit (pkgs) postgresql;}; - - "hpqtypes_1_9_4_0" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers , directory, exceptions, filepath, HUnit, lifted-base , monad-control, mtl, postgresql, QuickCheck, random, resource-pool @@ -143203,8 +143341,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.8"; - sha256 = "1c44j9qnld5lg8zcw3pyh56fk0r62g76qmma790mcvy4sbrcz102"; + version = "0.6.1.9"; + sha256 = "1k6zq1jjzl7y38yh9cris096i5bba24rwwizdr8a2cyqqxz2g8jf"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -143427,8 +143565,8 @@ self: { pname = "hsini"; version = "0.5.1.2"; sha256 = "1r6qksnrmk18ndxs5zaga8b7kvmk34kp0kh5hwqmq797qrlax9pa"; - revision = "1"; - editedCabalFile = "0wkvajjgs64l4wlw8s6sn3pbwx3ni41p1260chp67a16innr1qp6"; + revision = "2"; + editedCabalFile = "1b83g6jk9hcm2h17f1h9vyzm34bmr7w4j5888rbv9k8gpi97f8i7"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers mtl parsec tasty tasty-hunit @@ -144566,6 +144704,8 @@ self: { pname = "hspec-core"; version = "2.7.10"; sha256 = "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1"; + revision = "1"; + editedCabalFile = "0g6x70fqwblf2dzjgq6hp4nj5vqrbfvzphl3j8a73h1966zhrxy9"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -144595,6 +144735,8 @@ self: { pname = "hspec-core"; version = "2.8.5"; sha256 = "0hy3qw7qvix5899hkq96mqda2ridif2g3mwdn8sxg2wlhbcvzfjm"; + revision = "1"; + editedCabalFile = "1nwki2mb64akmc7585cmjhiizwm090j7gqx5js1h9rmvl7z2zfbx"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -153490,6 +153632,8 @@ self: { pname = "imperative-edsl"; version = "0.9"; sha256 = "0qzk3kjmjv3357dlc4fa43k4xn7xhyavmbnni0cd86zrilgxha6h"; + revision = "1"; + editedCabalFile = "11spl74xarqx3pcag1j2i72m4k9gv5lkv6g7zy658yg4ibywwkdx"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -154845,32 +154989,6 @@ self: { }) {}; "inline-c" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq - , regex-posix, split, template-haskell, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "inline-c"; - version = "0.9.1.5"; - sha256 = "0a0m3bhh910c5g46cwkxgflsgw5ab7lzymwll9hijyvwgnsw3h7i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base bytestring containers hashable mtl parsec - parsers template-haskell transformers unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix split template-haskell transformers - unordered-containers vector - ]; - description = "Write Haskell source files including C code inline. No FFI required."; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ roberth ]; - }) {}; - - "inline-c_0_9_1_6" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq , regex-posix, split, template-haskell, transformers @@ -154893,7 +155011,6 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ roberth ]; }) {}; @@ -155103,22 +155220,6 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.4.6.0"; - sha256 = "0qz1npyycj4bvyly9xmjbnhw569l52h38gx02rk0r7zhapw83aig"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_6_1" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: @@ -155132,7 +155233,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -156052,8 +156152,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "2.0.0"; - sha256 = "0p6zgshfcf7gh1349hwxg2zfwvzi0w7ldi9p2pmm9xkqs6q4q8dz"; + version = "2.0.2"; + sha256 = "1fsz0grgk4iq457zqvhnsqbrphgg62d46h5rzxffmy5zlvpzhq8g"; libraryHaskellDepends = [ base binary containers deepseq foldl nonempty-containers prettyprinter QuickCheck safe text time witch witherable @@ -160824,6 +160924,29 @@ self: { broken = true; }) {}; + "json-stream_0_4_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, hspec + , primitive, QuickCheck, quickcheck-unicode, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "json-stream"; + version = "0.4.4.0"; + sha256 = "1rjvrkrjmh5kvrajd6n2q3h68dkh1m5jhm7f6hq723zvxzl98wij"; + libraryHaskellDepends = [ + aeson base bytestring primitive scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring directory hspec primitive QuickCheck + quickcheck-unicode scientific text unordered-containers vector + ]; + description = "Incremental applicative JSON parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "json-syntax" = callPackage ({ mkDerivation, aeson, array-builder, array-chunks, base , bytebuild, byteslice, bytesmith, bytestring, contiguous, gauge @@ -162287,10 +162410,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.7.1"; - sha256 = "157mc5w05j82020g0f65bdjz839fs6cd263xz5z7p00h0y576vg6"; - revision = "1"; - editedCabalFile = "0snkks2ng5bwnbm5zr615c5nlagh0vv46xfz5gb5vlx1gkgawd1r"; + version = "0.8.7.2"; + sha256 = "02h7mgprmqy219i4ph9qg5pwgdzrxkzkgckbcaizmny84c87b46r"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -164287,8 +164408,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.9"; - sha256 = "0clj5nsjpjx5z2g7gbr8qmvajicrahy42b41d582zrq1117l9gmi"; + version = "0.9.1"; + sha256 = "0njjrxqycyl7vh46rmx2b3i0467nkppbx20xc3j1jxn7s3dc884x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164774,8 +164895,10 @@ self: { }: mkDerivation { pname = "kvitable"; - version = "1.0.0.0"; - sha256 = "1p8myw0f32gb1cxzp63l4i7m6gz1l423pl40yp2jl7vfdp4kzjwz"; + version = "1.0.1.0"; + sha256 = "0j0sl1bdx174w79xz80j89r3nmllics1h72mslsivnqv04l519l9"; + revision = "1"; + editedCabalFile = "0f801w2jgadc53nxxkgzdmfy90im0vvqh5i36r68cfx0ycywkcgn"; libraryHaskellDepends = [ base containers lucid microlens prettyprinter text ]; @@ -166158,8 +166281,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-c99"; - version = "0.1.3"; - sha256 = "159cy0vrnzs8kdraclia3i693kkik33dnhx5279d7l685jf3a8fz"; + version = "0.2.0"; + sha256 = "02fcgf5sqg35nkviqjl04f6dhkkbxy4shlkvfxpk220k73xx0qkh"; libraryHaskellDepends = [ base pretty ]; description = "An implementation of the C99 AST that strictly follows the standard"; license = lib.licenses.mit; @@ -166169,8 +166292,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.1.2"; - sha256 = "0v0y50n2ks8jp91y37az6q46ax6dqx1igmlkb4b7c76qngak88xi"; + version = "0.2.0"; + sha256 = "0sm85abxp3ia9450mxwnqbz00hcmafdbzsj0ynp4l95rxw11j0q6"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -166179,14 +166302,12 @@ self: { }) {}; "language-c99-util" = callPackage - ({ mkDerivation, base, language-c99 }: + ({ mkDerivation, base, ieee754, language-c99 }: mkDerivation { pname = "language-c99-util"; - version = "0.1.1"; - sha256 = "0rdwb29d2aa9mqkn5b4acwviymxy18sjfmzr01j7n3j4n3q4d2lz"; - revision = "1"; - editedCabalFile = "0wnrdcw05zmk1flycjavdb8188qy93p6m1b6k38799ngsm78qq7k"; - libraryHaskellDepends = [ base language-c99 ]; + version = "0.2.0"; + sha256 = "0cs68wz6vimy5lbjy3ks8qvx3ih49n0j4bdrn3p495rkwzy4y6r4"; + libraryHaskellDepends = [ base ieee754 language-c99 ]; description = "Utilities for language-c99"; license = lib.licenses.mit; }) {}; @@ -171752,33 +171873,6 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, cereal, containers, deepseq, distributive, ghc-prim - , hashable, HUnit, indexed-traversable, lens, random, reflection - , semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.21.8"; - sha256 = "0m2lr86l932rn2cnxaplaicfbg7makhrh8xbnj3m8jhhnyn3v88b"; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable indexed-traversable lens - random reflection semigroupoids semigroups tagged template-haskell - transformers transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq HUnit reflection simple-reflect - test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = lib.licenses.bsd3; - }) {}; - - "linear_1_21_9" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, cereal, containers, deepseq, distributive, ghc-prim , hashable, HUnit, indexed-traversable, lens, random, reflection @@ -171803,7 +171897,6 @@ self: { ]; description = "Linear Algebra"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -173605,8 +173698,8 @@ self: { }: mkDerivation { pname = "little-logger"; - version = "1.0.0"; - sha256 = "1llf4x5yq1d4kn07qp3ay0lbr1sskw79ck69biwxwyv4l8d132lp"; + version = "1.0.1"; + sha256 = "110yk385dss8hyyzkf2hpaxvrd39hgfhyv6sjf0pxqbxa4bqv51f"; libraryHaskellDepends = [ base microlens monad-logger mtl text unliftio-core ]; @@ -173614,7 +173707,7 @@ self: { base directory microlens monad-logger mtl tasty tasty-hunit temporary text unliftio-core ]; - description = "Basic logging based on co-log"; + description = "Basic logging based on monad-logger"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -173636,15 +173729,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "little-rio_1_0_0" = callPackage + "little-rio_1_0_1" = callPackage ({ mkDerivation, base, deepseq, exceptions, little-logger , microlens, microlens-mtl, mtl, primitive, resourcet , unliftio-core }: mkDerivation { pname = "little-rio"; - version = "1.0.0"; - sha256 = "179b5v53g55ihq84r5hka6bxivxj8hmqbg02spgddp5jmqaqbaw9"; + version = "1.0.1"; + sha256 = "0l505nimjwg9i8kkj2ndp5i4mh0mhxnhssxsvgmd5qnzxw4i0rd3"; libraryHaskellDepends = [ base deepseq exceptions little-logger microlens microlens-mtl mtl primitive resourcet unliftio-core @@ -176699,8 +176792,8 @@ self: { }: mkDerivation { pname = "lucid2"; - version = "0.0.20220509"; - sha256 = "0d38gic3xjqj5in97sbfzjb696011bl47sshzh0377md5j02yc85"; + version = "0.0.20220526"; + sha256 = "004bmzwzxfq2pmp7wn1mrdwkw9fnyfnmvzymnwn8fczkq17w4csd"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text transformers ]; @@ -177473,28 +177566,6 @@ self: { }) {}; "machines" = callPackage - ({ mkDerivation, adjunctions, base, comonad, conduit, containers - , criterion, distributive, mtl, pipes, pointed, profunctors - , semigroupoids, semigroups, streaming, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "machines"; - version = "0.7.2"; - sha256 = "0pgsa67j9l1zmazlqdb5wg3cqsikyfvkq8yih7iwcqzkys5qssvr"; - libraryHaskellDepends = [ - adjunctions base comonad containers distributive mtl pointed - profunctors semigroupoids semigroups transformers - transformers-compat void - ]; - benchmarkHaskellDepends = [ - base conduit criterion mtl pipes streaming - ]; - description = "Networked stream transducers"; - license = lib.licenses.bsd3; - }) {}; - - "machines_0_7_3" = callPackage ({ mkDerivation, adjunctions, base, comonad, conduit, containers , criterion, distributive, mtl, pipes, pointed, profunctors , semigroupoids, semigroups, streaming, transformers @@ -177514,7 +177585,6 @@ self: { ]; description = "Networked stream transducers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "machines-amazonka" = callPackage @@ -180718,21 +180788,22 @@ self: { maintainers = with lib.maintainers; [ dschrempf ]; }) {}; - "mcmc_0_6_2_4" = callPackage + "mcmc_0_6_2_5" = callPackage ({ mkDerivation, aeson, async, base, bytestring, circular , containers, covariance, criterion, data-default, deepseq , directory, dirichlet, double-conversion, hmatrix, hspec - , log-domain, math-functions, microlens, mwc-random, pretty-show - , primitive, statistics, time, transformers, vector, zlib + , log-domain, math-functions, microlens, mwc-random, parallel + , pretty-show, primitive, statistics, time, transformers, vector + , zlib }: mkDerivation { pname = "mcmc"; - version = "0.6.2.4"; - sha256 = "01ramkpjxknjaj4qp78im1a24sqv35nm72afr6wiqlwj11dcs2mq"; + version = "0.6.2.5"; + sha256 = "1yx72if0411pxxxqipz7dpmmn8hwmhgh9vsmw0a0za0niq8lmsm0"; libraryHaskellDepends = [ aeson async base bytestring circular containers covariance data-default deepseq directory dirichlet double-conversion hmatrix - log-domain math-functions microlens mwc-random pretty-show + log-domain math-functions microlens mwc-random parallel pretty-show primitive statistics time transformers vector zlib ]; testHaskellDepends = [ base hspec mwc-random statistics ]; @@ -182646,17 +182717,15 @@ self: { "microaeson" = callPackage ({ mkDerivation, aeson, alex, array, base, bytestring, containers - , deepseq, QuickCheck, quickcheck-instances, tasty + , deepseq, fail, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "microaeson"; - version = "0.1.0.0"; - sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "4"; - editedCabalFile = "0rrdyk6clik8g3biv40rpg50qzfacb9yrd45ah85xpmk8flbzcfx"; + version = "0.1.0.1"; + sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; libraryHaskellDepends = [ - array base bytestring containers deepseq text + array base bytestring containers deepseq fail text ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ @@ -182870,8 +182939,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.13.1"; - sha256 = "0q079kjqah8nbr4lll1w9i1wb1ayia07qi6g50hfcpsfvwsrh8s6"; + version = "0.4.13.2"; + sha256 = "1258p84jj4kv6l71ijwjzpvzvqxxsqbvs5vrksi24mlf29gaxqi0"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -182896,21 +182965,6 @@ self: { }) {}; "microlens-mtl" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.2.0.1"; - sha256 = "0ijy7xyd5lbc3calhcrhy8czkf3fjcxrv68p7kd2a5b352rfi7fp"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - description = "microlens support for Reader/Writer/State from mtl"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-mtl_0_2_0_2" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -182923,7 +182977,6 @@ self: { ]; description = "microlens support for Reader/Writer/State from mtl"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-platform" = callPackage @@ -182942,14 +182995,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "microlens-platform_0_4_3_0" = callPackage + "microlens-platform_0_4_3_1" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: mkDerivation { pname = "microlens-platform"; - version = "0.4.3.0"; - sha256 = "113xq10cr32mbbjy57zdafk5nww75c442fm5bz3h4vckawkc8n3p"; + version = "0.4.3.1"; + sha256 = "0kix9j6k1yp09102fsliqaynamgwbi31l4hwswcp90flw2v9ah35"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -183042,28 +183095,6 @@ self: { }) {}; "microstache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, filepath, hspec, parsec, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "microstache"; - version = "1.0.2"; - sha256 = "0pirywb9304j2ylasskwq20k6d2srk616sh41l4s37yajsjggx5i"; - revision = "3"; - editedCabalFile = "1bs7h4ffd1ckjjanqsshvw1z472d0lnq3bz7qmbnfmg73jji23pv"; - libraryHaskellDepends = [ - aeson base containers deepseq directory filepath parsec text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec parsec text - ]; - description = "Mustache templates for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "microstache_1_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, filepath, hspec, parsec, text, transformers , unordered-containers, vector @@ -183081,7 +183112,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microtimer" = callPackage @@ -183140,30 +183170,6 @@ self: { }) {}; "midi" = callPackage - ({ mkDerivation, base, binary, bytestring, event-list - , explicit-exception, monoid-transformer, non-negative, QuickCheck - , random, semigroups, transformers, utility-ht - }: - mkDerivation { - pname = "midi"; - version = "0.2.2.2"; - sha256 = "0fv9980k35qv9qk73g2mp88xvhchyq0lq37cl7i26gx4f64vaz6y"; - revision = "1"; - editedCabalFile = "0sa17aphsnk0lc42k1niisbd4jck7j4xij95mjjc5nlrcx1zd123"; - libraryHaskellDepends = [ - base binary bytestring event-list explicit-exception - monoid-transformer non-negative QuickCheck random semigroups - transformers utility-ht - ]; - testHaskellDepends = [ - base bytestring event-list explicit-exception non-negative - QuickCheck transformers utility-ht - ]; - description = "Handling of MIDI messages and files"; - license = "GPL"; - }) {}; - - "midi_0_2_2_3" = callPackage ({ mkDerivation, base, binary, bytestring, event-list , explicit-exception, monoid-transformer, non-negative, QuickCheck , random, semigroups, transformers, utility-ht @@ -183183,7 +183189,6 @@ self: { ]; description = "Handling of MIDI messages and files"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "midi-alsa" = callPackage @@ -183908,33 +183913,33 @@ self: { , case-insensitive, conduit, conduit-extra, connection, cryptonite , cryptonite-conduit, digest, directory, exceptions, filepath , http-client, http-client-tls, http-conduit, http-types, ini - , memory, protolude, QuickCheck, raw-strings-qq, resourcet, retry - , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text - , time, transformers, unliftio, unliftio-core, unordered-containers - , xml-conduit + , memory, network-uri, QuickCheck, raw-strings-qq, relude + , resourcet, retry, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, unliftio + , unliftio-core, unordered-containers, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "1.5.3"; - sha256 = "0nbrvkj8dn9m2i60iqk2wmf7fnj8bv4n65r4wxpimwb06yrvrfj2"; + version = "1.6.0"; + sha256 = "1pf1m02iz7lw4k53dac2rqnv84fcwcvx690y65h1mh2ip31abkp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive conduit conduit-extra connection cryptonite cryptonite-conduit digest directory exceptions filepath http-client http-client-tls - http-conduit http-types ini memory protolude raw-strings-qq - resourcet retry text time transformers unliftio unliftio-core - unordered-containers xml-conduit + http-conduit http-types ini memory network-uri raw-strings-qq + relude resourcet retry text time transformers unliftio + unliftio-core unordered-containers xml-conduit ]; testHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive conduit conduit-extra connection cryptonite cryptonite-conduit digest directory exceptions filepath http-client http-client-tls - http-conduit http-types ini memory protolude QuickCheck - raw-strings-qq resourcet retry tasty tasty-hunit tasty-quickcheck - tasty-smallcheck text time transformers unliftio unliftio-core - unordered-containers xml-conduit + http-conduit http-types ini memory network-uri QuickCheck + raw-strings-qq relude resourcet retry tasty tasty-hunit + tasty-quickcheck tasty-smallcheck text time transformers unliftio + unliftio-core unordered-containers xml-conduit ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = lib.licenses.asl20; @@ -185773,24 +185778,6 @@ self: { }) {}; "monad-chronicle" = callPackage - ({ mkDerivation, base, data-default-class, mtl, semigroupoids - , these, transformers, transformers-compat - }: - mkDerivation { - pname = "monad-chronicle"; - version = "1.0.0.1"; - sha256 = "1p9w9f5sw4adxxrgfba0vxs5kdhl82ibnwfqal7nrrhp3v86imbg"; - revision = "2"; - editedCabalFile = "1h3dk50wpbpi5qdxfwk8d5c22ad0ll1j647b4dbcjm4318l4ahkm"; - libraryHaskellDepends = [ - base data-default-class mtl semigroupoids these transformers - transformers-compat - ]; - description = "These as a transformer, ChronicleT"; - license = lib.licenses.bsd3; - }) {}; - - "monad-chronicle_1_0_1" = callPackage ({ mkDerivation, base, data-default-class, mtl, semigroupoids , these, transformers, transformers-compat }: @@ -185804,7 +185791,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monad-classes" = callPackage @@ -187651,8 +187637,8 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.1.0"; - sha256 = "12q86bh057pn040wdr39wlq066mcffpgsx71jy5h8rj02qi4b78f"; + version = "1.1.1"; + sha256 = "13vncdylaazcyfsdylxxnfkywyzw7ydmacisjhx6qhq12c87375q"; libraryHaskellDepends = [ base exceptions math-functions vector vector-th-unbox ]; @@ -188693,22 +188679,6 @@ self: { }) {}; "moss" = callPackage - ({ mkDerivation, base, bytestring, conduit-extra, mtl, network - , network-simple, unix-compat - }: - mkDerivation { - pname = "moss"; - version = "0.2.0.0"; - sha256 = "17ac31r26c8zddp3qdk573lyry2bz7c0y49q0adln3psd39czzw0"; - libraryHaskellDepends = [ - base bytestring conduit-extra mtl network network-simple - unix-compat - ]; - description = "Haskell client for Moss"; - license = lib.licenses.mit; - }) {}; - - "moss_0_2_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit-extra, mtl, network , network-simple, unix-compat }: @@ -188722,7 +188692,6 @@ self: { ]; description = "Haskell client for Moss"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "moto" = callPackage @@ -192260,6 +192229,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "mysql-simple_0_4_8" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, containers, hspec, mysql, old-locale, pcre-light + , text, time, vector + }: + mkDerivation { + pname = "mysql-simple"; + version = "0.4.8"; + sha256 = "077psr65rszk06bxx67bhvfk8ajmsr56bwynx7d57lqdvzvm4691"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + containers mysql old-locale pcre-light text time vector + ]; + testHaskellDepends = [ + base blaze-builder bytestring hspec mysql text time + ]; + description = "A mid-level MySQL client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mysql-simple-quasi" = callPackage ({ mkDerivation, base, haskell-src-meta, mysql-simple , template-haskell @@ -193238,6 +193228,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "natural-arithmetic_0_1_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "natural-arithmetic"; + version = "0.1.3.0"; + sha256 = "13ihizfvkl5bjy5rn966y22lgs8f1dgwyqky3k9gjsqxczlg44xa"; + libraryHaskellDepends = [ base ]; + description = "Arithmetic of natural numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "natural-induction" = callPackage ({ mkDerivation, base, peano }: mkDerivation { @@ -196005,8 +196007,8 @@ self: { pname = "newtype"; version = "0.2.2.0"; sha256 = "1b7bamnd0p8vmxvlg39g5d4a2av49kx10rdyz04ixa28pg8zy01s"; - revision = "2"; - editedCabalFile = "0zfrjyybccr5prjkfazh0bgybjfv5vr1zpyxi1nqkqia1rm7pjrn"; + revision = "3"; + editedCabalFile = "0yll88ydchd2gqcvdk28fchf2vygpd42ky2bigg4ga08jan2nacx"; libraryHaskellDepends = [ base ]; description = "A typeclass and set of functions for working with newtypes"; license = lib.licenses.bsd3; @@ -196031,22 +196033,6 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups - , transformers - }: - mkDerivation { - pname = "newtype-generics"; - version = "0.6.1"; - sha256 = "1aswwfz3lc65n56l3vqcp5ak002vd11kcfz2is0a3584p8pz1zpw"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base gauge semigroups ]; - description = "A typeclass and set of functions for working with newtypes"; - license = lib.licenses.bsd3; - }) {}; - - "newtype-generics_0_6_2" = callPackage ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups }: mkDerivation { pname = "newtype-generics"; @@ -196058,7 +196044,6 @@ self: { benchmarkHaskellDepends = [ base gauge semigroups ]; description = "A typeclass and set of functions for working with newtypes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -196655,6 +196640,8 @@ self: { pname = "nix-graph"; version = "1.0.2.0"; sha256 = "0g6kay7j4klgpnd4qq1b0drfc17m4nkip3sks6fn4528r0i95xll"; + revision = "1"; + editedCabalFile = "1dy379gajvs3846csb9j560avvsdzrxzh9sg93rmbcwdyv72lj6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198047,26 +198034,6 @@ self: { }) {}; "nqe" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit - , text, unique, unliftio - }: - mkDerivation { - pname = "nqe"; - version = "0.6.3"; - sha256 = "0wg9cfzgj36dj77m521pqcliqd43i3j6i1bvqgvb8npmzqijag7q"; - libraryHaskellDepends = [ - base conduit containers hashable mtl stm unique unliftio - ]; - testHaskellDepends = [ - async base bytestring conduit conduit-extra exceptions hspec stm - stm-conduit text unliftio - ]; - description = "Concurrency library in the style of Erlang/OTP"; - license = lib.licenses.mit; - }) {}; - - "nqe_0_6_4" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit , text, unique, unliftio @@ -198084,7 +198051,6 @@ self: { ]; description = "Concurrency library in the style of Erlang/OTP"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "nri-env-parser" = callPackage @@ -198710,6 +198676,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "numeric-prelude_0_4_4" = callPackage + ({ mkDerivation, array, base, containers, deepseq + , doctest-exitcode-stdio, doctest-lib, non-negative, parsec + , QuickCheck, random, semigroups, storable-record, utility-ht + }: + mkDerivation { + pname = "numeric-prelude"; + version = "0.4.4"; + sha256 = "04x6ry2sxr5hsiz4098dn2gqyjqywiq2xk0anf6wc4xrvasgccjs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers deepseq non-negative parsec QuickCheck random + semigroups storable-record utility-ht + ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib QuickCheck random + utility-ht + ]; + description = "An experimental alternative hierarchy of numeric type classes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "numeric-qq" = callPackage ({ mkDerivation, base, directory, doctest, filepath, loch-th , placeholders, template-haskell @@ -198814,6 +198804,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "numhask_0_10_1_0" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "numhask"; + version = "0.10.1.0"; + sha256 = "1zxp98svs872qpc0d8pycdbnf47phw4xbrvpi4vrzwyri5wahsxb"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + description = "A numeric class hierarchy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, distributive, numhask, vector }: @@ -199959,6 +199962,8 @@ self: { pname = "oeis2"; version = "1.0.7"; sha256 = "1nywxada76zqzraadwbmz3v6dpwbd997393ksrprci5n6myrakng"; + revision = "1"; + editedCabalFile = "1fxg13qd5rniidin08yjywgfk8dvwfc3y5n582z3x0x86b2ifxy6"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -200446,6 +200451,8 @@ self: { pname = "one-liner"; version = "2.0"; sha256 = "0al9wavxx23xbalqw0cdlhq01kx8kyhg33fipwmn5617z3ddir6v"; + revision = "1"; + editedCabalFile = "19iwyb3jx7bwybmmmamyzf4lxiwik7wdl8k1crikzmxn016pnybz"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim linear-base profunctors tagged transformers @@ -200455,6 +200462,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "one-liner_2_1" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit + , linear-base, profunctors, tagged, transformers + }: + mkDerivation { + pname = "one-liner"; + version = "2.1"; + sha256 = "09gdivd38disddxs42179vmgca0yzk5dfm6ygicgl5l25qbizrfh"; + libraryHaskellDepends = [ + base bifunctors contravariant ghc-prim linear-base profunctors + tagged transformers + ]; + testHaskellDepends = [ base contravariant HUnit ]; + description = "Constraint-based generics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "one-liner-instances" = callPackage ({ mkDerivation, base, one-liner, random }: mkDerivation { @@ -201345,23 +201370,24 @@ self: { }) {}; "openid-connect" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie - , cryptonite, http-client, http-types, jose, lens, memory, mtl - , network-uri, tasty, tasty-hunit, text, time, unordered-containers + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, cookie, cryptonite, http-client, http-types, jose + , lens, memory, mtl, network-uri, tasty, tasty-hunit, text, time + , unordered-containers }: mkDerivation { pname = "openid-connect"; - version = "0.1.1"; - sha256 = "16qqndcvbs30nraik0ida1dw40hk3k9mi318dnqnjx64x6wvcgmr"; + version = "0.1.2"; + sha256 = "1h14m0zs5smvl0fcn6anksj94qviy8k9zkhlvdnj7flk4bbi3q2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring case-insensitive cookie cryptonite + aeson base bytestring case-insensitive containers cookie cryptonite http-client http-types jose lens memory mtl network-uri text time unordered-containers ]; testHaskellDepends = [ - aeson base bytestring case-insensitive cookie cryptonite + aeson base bytestring case-insensitive containers cookie cryptonite http-client http-types jose lens memory mtl network-uri tasty tasty-hunit text time unordered-containers ]; @@ -202200,6 +202226,8 @@ self: { pname = "operational-alacarte"; version = "0.3.1"; sha256 = "0n4xjv0li4z5lvkx8z0y72dyv9aa0hc315cvpwqcfsh5wvp7fanm"; + revision = "1"; + editedCabalFile = "1ca9fms1gpqmw0q6d22smkif19avkdd629w2hgylp942f6icpmhq"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base ]; description = "A version of Operational suitable for extensible EDSLs"; @@ -202313,35 +202341,6 @@ self: { }) {}; "optics" = callPackage - ({ mkDerivation, array, base, bytestring, containers - , indexed-profunctors, inspection-testing, lens, mtl, optics-core - , optics-extra, optics-th, QuickCheck, random, tasty, tasty-bench - , tasty-hunit, tasty-quickcheck, template-haskell, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "optics"; - version = "0.4.1"; - sha256 = "068r2ldq5aysvs5gcd80xpvbmsw5vylc4x0rfsnm9k330q5vzlkx"; - libraryHaskellDepends = [ - array base containers mtl optics-core optics-extra optics-th - transformers - ]; - testHaskellDepends = [ - base containers indexed-profunctors inspection-testing mtl - optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck - template-haskell - ]; - benchmarkHaskellDepends = [ - base bytestring containers lens tasty-bench transformers - unordered-containers vector - ]; - description = "Optics as an abstract interface"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ maralorn ]; - }) {}; - - "optics_0_4_2" = callPackage ({ mkDerivation, array, base, bytestring, containers , indexed-profunctors, inspection-testing, lens, mtl, optics-core , optics-extra, optics-th, QuickCheck, random, tasty, tasty-bench @@ -202367,7 +202366,6 @@ self: { ]; description = "Optics as an abstract interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ maralorn ]; }) {}; @@ -202390,24 +202388,6 @@ self: { }) {}; "optics-extra" = callPackage - ({ mkDerivation, array, base, bytestring, containers, hashable - , indexed-profunctors, indexed-traversable-instances, mtl - , optics-core, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "optics-extra"; - version = "0.4.1"; - sha256 = "0xxsl4vkq77vnqi9s57d0kgsr4qj87zpad10ax0ywhvzzbvh98fg"; - libraryHaskellDepends = [ - array base bytestring containers hashable indexed-profunctors - indexed-traversable-instances mtl optics-core text transformers - unordered-containers vector - ]; - description = "Extra utilities and instances for optics-core"; - license = lib.licenses.bsd3; - }) {}; - - "optics-extra_0_4_2_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, hashable , indexed-profunctors, indexed-traversable-instances, mtl , optics-core, text, transformers, unordered-containers, vector @@ -202423,7 +202403,6 @@ self: { ]; description = "Extra utilities and instances for optics-core"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "optics-th" = callPackage @@ -204749,20 +204728,19 @@ self: { ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl , microlens-th, mtl, open-browser, optparse-applicative, pandoc - , pandoc-types, roman-numerals, syb, template-haskell, temporary - , text, utility-ht + , pandoc-types, syb, template-haskell, temporary, text, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.12.2"; - sha256 = "1d2g4aggv47gv83p4382bcy1x97z0bs4nqww37ay92n9r4jh6m4l"; + version = "0.3.13.0"; + sha256 = "0fn5xrsh1x1rk74vd30yvg4ha9aicqbm7r1w0nrq9fkgcmz1q01x"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers data-default directory filepath microlens - microlens-mtl microlens-th mtl pandoc pandoc-types roman-numerals - syb template-haskell text utility-ht + microlens-mtl microlens-th mtl pandoc pandoc-types syb + template-haskell text utility-ht ]; executableHaskellDepends = [ base deepseq gitrev open-browser optparse-applicative pandoc @@ -204986,8 +204964,8 @@ self: { ({ mkDerivation, base, containers, pandoc-types, relude, text }: mkDerivation { pname = "pandoc-link-context"; - version = "1.2.0.0"; - sha256 = "06yd4wp7v8p1z9jrg4rzcinkkdng94v2gpcs039brb7cb9qi4gpl"; + version = "1.4.0.0"; + sha256 = "002q0kdw3686s7yhsk1p8i6srz1wvs42pzvz7ajgnsdqcnyqh93g"; libraryHaskellDepends = [ base containers pandoc-types relude text ]; @@ -205316,8 +205294,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.5.5"; - sha256 = "0kk9v6xl3ssfsnk0ng1ar9wm6qw7qln2qcilybldkp8dhy4fvmxq"; + version = "0.5.6"; + sha256 = "05x4ihcs6j380r9g5rh6afy9zadfnrlg9si8ia4aaa7kh2jc20p9"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -208464,8 +208442,8 @@ self: { }: mkDerivation { pname = "pcre2"; - version = "2.1.1"; - sha256 = "07ls9vxj5l8wvrj75wvyrq6qsz7fz0pamx92ik50cpl71p76lc92"; + version = "2.1.1.1"; + sha256 = "1593grzraqpam646s08fi3wgwnaib3lcgyj5m7xqpbfrzyil8wsq"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -208481,6 +208459,31 @@ self: { license = lib.licenses.asl20; }) {}; + "pcre2_2_2_1" = callPackage + ({ mkDerivation, base, containers, criterion, hspec, microlens + , microlens-platform, mtl, pcre-light, regex-pcre-builtin + , template-haskell, text + }: + mkDerivation { + pname = "pcre2"; + version = "2.2.1"; + sha256 = "0w08a4gzsll0wwwkn2abjvnrxd7y1irv627v4pc5ha4gsrlqd3fl"; + libraryHaskellDepends = [ + base containers microlens mtl template-haskell text + ]; + testHaskellDepends = [ + base containers hspec microlens microlens-platform mtl + template-haskell text + ]; + benchmarkHaskellDepends = [ + base containers criterion microlens microlens-platform mtl + pcre-light regex-pcre-builtin template-haskell text + ]; + description = "Regular expressions via the PCRE2 C library (included)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "pdc" = callPackage ({ mkDerivation, aeson, base, http-query, text, time }: mkDerivation { @@ -209274,6 +209277,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "perf_0_10_0" = callPackage + ({ mkDerivation, attoparsec, base, box, box-csv, chart-svg + , containers, deepseq, formatn, gauge, mtl, numhask-space + , optics-core, optparse-applicative, rdtsc, recursion-schemes, text + , time, vector + }: + mkDerivation { + pname = "perf"; + version = "0.10.0"; + sha256 = "1igdghqn80dxgx182yb89zm685wi6xka7gjcwqws1bq8p36v7i5j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base box box-csv chart-svg containers deepseq formatn + mtl numhask-space optics-core optparse-applicative rdtsc + recursion-schemes text time vector + ]; + executableHaskellDepends = [ + base containers deepseq formatn gauge mtl optparse-applicative text + ]; + description = "Low-level run time measurement"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "perf-analysis" = callPackage ({ mkDerivation, base, containers, deepseq, optparse-generic, perf , protolude, readme-lhs, scientific, tdigest, text, text-format @@ -211055,6 +211083,8 @@ self: { pname = "phatsort"; version = "0.5.0.1"; sha256 = "14czx4s3ywfcxbw8lr60i3cdk62rcfr7m1v98mx3qm1gjinll5js"; + revision = "1"; + editedCabalFile = "06s8xg07za1d23wai8pb7gvbcri2vmbv0jks7as8d8mf82giqvz8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213514,8 +213544,8 @@ self: { }: mkDerivation { pname = "pipes-text"; - version = "1.0.0"; - sha256 = "0q01amm5813qpbkj9098mkd6h1a65vc864qjk2vgd4h80vx2a6mi"; + version = "1.0.1"; + sha256 = "1q91jsqlikrp2dj21nik5b3j8b1y996gy8rjkx8hlzrps11vrc2w"; libraryHaskellDepends = [ base bytestring pipes pipes-bytestring pipes-group pipes-parse pipes-safe streaming-commons text transformers @@ -215383,6 +215413,8 @@ self: { pname = "poly-rec"; version = "0.7.0.0"; sha256 = "0ayaz87l2rgpm4ddc7bidss042xhfcwa3sk7685ypssqvp02k5r0"; + revision = "2"; + editedCabalFile = "12cgm587k27mmjkix58qs4ihdcx1axlkp17bq7f3fhw80j64imk7"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; license = lib.licenses.gpl3Only; @@ -226837,21 +226869,21 @@ self: { "radixtree" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq - , microlens, mtl, parsers, QuasiText, smallcheck, store, tasty - , tasty-smallcheck, text, vector + , ghc-compact, microlens, mtl, parsers, QuasiText, smallcheck + , tasty, tasty-smallcheck, text, vector }: mkDerivation { pname = "radixtree"; - version = "0.4.0.0"; - sha256 = "074s2gbprpq9qvipj8hayh906pdy1jfayph82hzamnwvz4199gmj"; + version = "0.6.0.0"; + sha256 = "0l6abb72r36ihzyjw5nsnf393qhaxsvi2732h4w4brs4jhqk85hz"; libraryHaskellDepends = [ - base containers deepseq microlens mtl parsers store text vector + base containers deepseq microlens mtl parsers text vector ]; testHaskellDepends = [ attoparsec base smallcheck tasty tasty-smallcheck text ]; benchmarkHaskellDepends = [ - attoparsec base criterion deepseq QuasiText text vector + attoparsec base criterion deepseq ghc-compact QuasiText text vector ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -226929,21 +226961,21 @@ self: { "rails-session" = callPackage ({ mkDerivation, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptonite, filepath - , http-types, pbkdf, ruby-marshal, semigroups, string-conv, tasty - , tasty-hspec, transformers, vector + , hspec, http-types, pbkdf, ruby-marshal, semigroups, string-conv + , tasty, tasty-hspec, transformers, vector }: mkDerivation { pname = "rails-session"; - version = "0.1.2.0"; - sha256 = "0r1jiy7x7497zk1gvg1zbpqx2vh2i0j9x7gzscgx6gylkjkkppir"; + version = "0.1.3.0"; + sha256 = "0fybpyg5si9rizifxdghilffvqmszm8h7w5v8b7xdmsw1i5gv56m"; libraryHaskellDepends = [ base base-compat base16-bytestring base64-bytestring bytestring containers cryptonite http-types pbkdf ruby-marshal string-conv vector ]; testHaskellDepends = [ - base bytestring filepath ruby-marshal semigroups tasty tasty-hspec - transformers vector + base bytestring filepath hspec ruby-marshal semigroups tasty + tasty-hspec transformers vector ]; description = "Decrypt Ruby on Rails sessions in Haskell"; license = lib.licenses.bsd3; @@ -227476,8 +227508,8 @@ self: { pname = "random-source"; version = "0.3.0.11"; sha256 = "0lwqbd0h495srgi2p8fsmsfk5hv5m3f6cxm12j61xx94fdyn98sv"; - revision = "1"; - editedCabalFile = "1wh5acm2298bcp3r4zp7k77rrzynfgbs4s6jq6swml1p3p7yr7b9"; + revision = "2"; + editedCabalFile = "1bxw5mrrzyhd74jclgn1b6x78rsh301ys86m2jrkcy4zsxhaqr99"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -227668,8 +227700,8 @@ self: { ({ mkDerivation, base, doctest, typecheck-plugin-nat-simple }: mkDerivation { pname = "ranged-list"; - version = "0.1.1.1"; - sha256 = "0ky5jzp63565xc9qxq6717c5qbgcisgv9nadjfsqrcxwarp75i6y"; + version = "0.1.2.0"; + sha256 = "0ry2l6379g1q8y22hziqscsxv134k26a28aqvlxjyliqkx707b9i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base typecheck-plugin-nat-simple ]; testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; @@ -228239,14 +228271,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_9" = callPackage + "rattletrap_11_2_10" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.9"; - sha256 = "15afr7ncg7niwis44sr8pjlga08052gqz0bwg29zyy26kh8fll1l"; + version = "11.2.10"; + sha256 = "1iy0nkqpnwhscs98b277q6ykk7mph5a5ah8gqf4dxz58q7lwk47z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228307,8 +228339,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.4"; - sha256 = "1bx98zsykvfc72jaas3qzjm614dliij2bdvbm44fj0npd3zvbq0r"; + version = "0.4.1"; + sha256 = "04n6rhw6llgp4p53d8djwbs7qqk0yip5ml48sjx2ibswvz9ihdsb"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -228516,29 +228548,6 @@ self: { }) {}; "rcu" = callPackage - ({ mkDerivation, atomic-primops, base, containers, criterion - , deepseq, fail, ghc-prim, optparse-applicative, parallel - , primitive, rdtsc, time, transformers - }: - mkDerivation { - pname = "rcu"; - version = "0.2.5"; - sha256 = "1p2cg6xy5cjdizqialv9y8qylwdri5fhby2xh04fnhpjapsrbc7l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base fail ghc-prim parallel primitive transformers - ]; - executableHaskellDepends = [ base transformers ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq ghc-prim optparse-applicative - primitive rdtsc time transformers - ]; - description = "Read-Copy-Update for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "rcu_0_2_6" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion , deepseq, fail, ghc-prim, optparse-applicative, parallel , primitive, rdtsc, time, transformers @@ -228559,7 +228568,6 @@ self: { ]; description = "Read-Copy-Update for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rdf" = callPackage @@ -230568,6 +230576,8 @@ self: { pname = "reflex"; version = "0.8.2.0"; sha256 = "1hvagxcs413bqairxf77vp19484mxnbfckhd44wv22ncwfh5mq6d"; + revision = "1"; + editedCabalFile = "194c0y2asv8z64hxs6cppjrg0m1r3ipp9565aj6dac63dqf8j29l"; libraryHaskellDepends = [ base bifunctors comonad constraints constraints-extras containers data-default dependent-map dependent-sum exception-transformers @@ -230610,15 +230620,12 @@ self: { "reflex-backend-socket" = callPackage ({ mkDerivation, base, bytestring, containers, lens, mtl, network - , reflex, reflex-basic-host, semialign, semigroupoids, stm, these - , witherable + , reflex, semialign, semigroupoids, stm, these, witherable }: mkDerivation { pname = "reflex-backend-socket"; - version = "0.2.0.0"; - sha256 = "111kmsvxb86aphw0ascjf7p7fd0bfxs3lmvqbnvxvj3rhh19bq6c"; - revision = "1"; - editedCabalFile = "11swzj7l0wmvdv72716rmlwcvcxkj44h3jbzwyhqn8q0f9ykfggx"; + version = "0.2.0.1"; + sha256 = "1p4rzhc4c8rk4c75hdxmzjpsmfvinnvmszqzmb9a4fpw55fdwy8z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230626,8 +230633,7 @@ self: { these ]; executableHaskellDepends = [ - base bytestring containers lens network reflex reflex-basic-host - witherable + base bytestring containers lens network reflex witherable ]; description = "Reflex bindings for TCP sockets"; license = lib.licenses.bsd3; @@ -231145,16 +231151,16 @@ self: { }) {}; "reflex-libtelnet" = callPackage - ({ mkDerivation, base, bytestring, data-default, dependent-map - , dependent-sum, dependent-sum-template, lens, libtelnet, reflex + ({ mkDerivation, base, bytestring, dependent-map, dependent-sum + , dependent-sum-template, libtelnet, reflex }: mkDerivation { pname = "reflex-libtelnet"; - version = "0.1.0.0"; - sha256 = "0abqbbbzgsq2sz1yx9cjl7cjfjaygcv4vc8hp6g4gk7744xdshz3"; + version = "0.2.0.0"; + sha256 = "0kwcd001lg9fadqf4zd6z9351qrlk74fk4i8cysgkmay59n2fy85"; libraryHaskellDepends = [ - base bytestring data-default dependent-map dependent-sum - dependent-sum-template lens libtelnet reflex + base bytestring dependent-map dependent-sum dependent-sum-template + libtelnet reflex ]; description = "Reflex bindings for libtelnet"; license = lib.licenses.gpl3Plus; @@ -231629,6 +231635,8 @@ self: { pname = "regex-base"; version = "0.94.0.2"; sha256 = "1w9fxad1dwi040r3db9i2cjhhrl86p3hngj13ixbcnqgb27l16bv"; + revision = "1"; + editedCabalFile = "1k2gzjm7xz69f7zr08wh2wzb5dhb659cvimsvx0g9p8cf5f45x2g"; libraryHaskellDepends = [ array base bytestring containers text ]; description = "Common \"Text.Regex.*\" API for Regex matching"; license = lib.licenses.bsd3; @@ -231640,8 +231648,8 @@ self: { pname = "regex-compat"; version = "0.95.2.1"; sha256 = "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg"; - revision = "1"; - editedCabalFile = "1r9gvk0lifppydlns81zh8052941saaaahydvbcgnrz0jwn1di9j"; + revision = "2"; + editedCabalFile = "0ldqpdxikm17ydrkfmichflkdqdrkspv4r0qy3zbdgqf5033pj4n"; libraryHaskellDepends = [ array base regex-base regex-posix ]; description = "Replaces/enhances \"Text.Regex\""; license = lib.licenses.bsd3; @@ -231823,8 +231831,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; - revision = "3"; - editedCabalFile = "1mxy2y7dmv37hhsasm17x2mb9dhmzza13pc7jfrk77inpig78ib8"; + revision = "4"; + editedCabalFile = "07fqy6pj7zz2vqbj8y4s5npc7vk9ggzayiy31hy4ss91lys74d1j"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -231890,6 +231898,8 @@ self: { pname = "regex-posix"; version = "0.96.0.1"; sha256 = "1715b57z67q4hg0jz44wkxrxi3v7n5iagw6gw48pf8hr34wpr0n7"; + revision = "1"; + editedCabalFile = "1x5xkfddn3llxk4fngqbd8njssrwb7jlp0a0jxfrgdivbava9fwx"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -231954,6 +231964,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.2"; sha256 = "0qka53m4xirlb2cjzr68rhybm31i4x2f78b8724a0askvb4phyn4"; + revision = "1"; + editedCabalFile = "02hq7zymsybnmm9qmlsj7fdh02dch6001nm348ymabvlwjndxbwv"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -232342,8 +232354,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.3.0.3"; - sha256 = "0bbpjy5rjlmgn2jpg4fdrl15p3149y2wp5ydzpi21mzp3w0clkrp"; + version = "0.3.0.5"; + sha256 = "0q2dk0hyq6rdnvvldic4xzp0c28ky5jv7p994qhfbra8a1qkr08z"; libraryHaskellDepends = [ base containers exceptions hashable mmorph mtl protolude resourcet semigroupoids semigroups template-haskell text transformers-base @@ -232370,8 +232382,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.6.0.0"; - sha256 = "12asg2cz72an1hgy7c853z7zz7zvw54z7wa4rvw0gzg0a2z3fh0m"; + version = "0.7.0.0"; + sha256 = "00k2qsiavi3l5ksgd9xh05lachvhhm7vp7z0cmsy6y5saz5l44hh"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -232423,8 +232435,8 @@ self: { }: mkDerivation { pname = "registry-messagepack"; - version = "0.1.0.3"; - sha256 = "0i49cic87jdkfalwbyry7c6f1828vd1n33nkdjmxa73w3vhjklf5"; + version = "0.2.0.0"; + sha256 = "0hkz80kbsmvlcvy4py1vwsr4z5blmkcp6b24ay9qzayqdjx03r2w"; libraryHaskellDepends = [ base containers msgpack protolude registry template-haskell text transformers vector @@ -233712,22 +233724,6 @@ self: { }) {}; "repline" = callPackage - ({ mkDerivation, base, containers, exceptions, haskeline, mtl - , process - }: - mkDerivation { - pname = "repline"; - version = "0.4.0.0"; - sha256 = "1dspwi28krinkxdd7waq4y6plz0dfmzz72885p9pcqp1r14qrhj3"; - libraryHaskellDepends = [ - base containers exceptions haskeline mtl process - ]; - testHaskellDepends = [ base containers mtl process ]; - description = "Haskeline wrapper for GHCi-like REPL interfaces"; - license = lib.licenses.mit; - }) {}; - - "repline_0_4_2_0" = callPackage ({ mkDerivation, base, containers, exceptions, haskeline, mtl , process }: @@ -233741,7 +233737,6 @@ self: { testHaskellDepends = [ base containers mtl process ]; description = "Haskeline wrapper for GHCi-like REPL interfaces"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "repo-based-blog" = callPackage @@ -234094,8 +234089,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "requirements"; - version = "0.7.0.0"; - sha256 = "030vwfasxjdgdadcf5i68i3dc436dj6gi3ql4k8qh09yf8q1mm63"; + version = "0.7.0.1"; + sha256 = "0nikl4ga2jap95yf29z87wnazfhz7k272phjwajn1yk22shv308z"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; license = lib.licenses.gpl3Only; @@ -234996,16 +234991,16 @@ self: { ({ mkDerivation, barbies, base, clash-ghc, clash-lib, clash-prelude , containers, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, lens, lift-type, monoidal-containers - , mtl, template-haskell, transformers + , mtl, template-haskell, th-orphans, transformers }: mkDerivation { pname = "retroclash-lib"; - version = "0.1.2"; - sha256 = "11f15nhxp8aaim6yrzlh33dilp2zywdfikgdii44q0mszmm9q0vr"; + version = "0.1.2.1"; + sha256 = "0xf1prvgh41iilghi5ilr5c490xxj9b0mk1xz9is6w0c34wcppr9"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - lens lift-type monoidal-containers mtl template-haskell + lens lift-type monoidal-containers mtl template-haskell th-orphans transformers ]; description = "Code shared across the code samples in the book \"Retrocomputing with Clash\""; @@ -235040,10 +235035,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.9.2.0"; - sha256 = "1w0mlv62hrx2bi25szycg180k3mz8r9rhy53ycq0kadb8h1sw5hy"; - revision = "1"; - editedCabalFile = "1ry3r4h7xfp9r0hc5wbxz4sy9vx46gyhfqpd0lnlsa8r2c4pvb79"; + version = "0.9.2.1"; + sha256 = "0x6aa0mrj7m68wrbnml6bv852xxy5992qc69c2v5ipbjli560ak5"; libraryHaskellDepends = [ base exceptions ghc-prim mtl mtl-compat random transformers ]; @@ -238162,18 +238155,19 @@ self: { "ruby-marshal" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, fail, hspec - , mtl, string-conv, vector + , hspec-discover, mtl, string-conv, vector }: mkDerivation { pname = "ruby-marshal"; - version = "0.2.0"; - sha256 = "0cdw1m26hlpicd2wmk34zav4p4lxhnrj79s5vwqmqy9wkdj9ypdx"; + version = "0.2.1"; + sha256 = "18kdagf0lyghpaffzgw42ql1wrqkh13rfqjpj23i09i67pqrv3lk"; libraryHaskellDepends = [ base bytestring cereal containers fail mtl string-conv vector ]; testHaskellDepends = [ base bytestring cereal containers fail hspec mtl string-conv vector ]; + testToolDepends = [ hspec-discover ]; description = "Parse a subset of Ruby objects serialised with Marshal.dump."; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -238422,8 +238416,8 @@ self: { }: mkDerivation { pname = "rvar"; - version = "0.3.0.0"; - sha256 = "1lj30nl4a8fkjk88p3vdxcwwvgnqm14m8xikrx4lahh9xy6vybjn"; + version = "0.3.0.1"; + sha256 = "1wa5nxlsfm1la5s70xv3swrmidxy0h6kv9ilicwkls12gwdc2a95"; libraryHaskellDepends = [ base bytestring MonadPrompt mtl random transformers ]; @@ -238731,8 +238725,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.7.2"; - sha256 = "15a80s87f603w8l7fnaba2cyqx62042vvcidpjzyga2685wpyqv9"; + version = "0.1.7.3"; + sha256 = "1gxm61mccivrdz2qcfh5sim596nbrpapx0nli0bx7vx6z3c2ikli"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec transformers void ]; description = "Safe, consistent, and easy exception handling"; @@ -240208,7 +240202,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_2_0" = callPackage + "sbp_4_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -240217,8 +240211,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.2.0"; - sha256 = "1d9a9m41wfp3crsykdcmaki8kj1j7kdaq72l08wymkz3kqwakfr7"; + version = "4.3.0"; + sha256 = "0fr9pc4y5wmyvw3ybyl1r7ypqgz5ngki4i0qh8d6qdsqy1m0vckg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245848,36 +245842,6 @@ self: { }) {}; "servant-openapi3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , lens-aeson, openapi3, QuickCheck, servant, singleton-bool - , template-haskell, text, time, unordered-containers, utf8-string - , vector - }: - mkDerivation { - pname = "servant-openapi3"; - version = "2.0.1.4"; - sha256 = "1dlz5fsz7j5yrf6kps4j1mxlj4ww2q4szx5k6apawi06i8ibshh7"; - revision = "2"; - editedCabalFile = "1g8byg51brdpabn5kv1zpkzic84hg50w1dxs1hbkpxj5a26gbd07"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring hspec http-media - insert-ordered-containers lens openapi3 QuickCheck servant - singleton-bool text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - lens-aeson openapi3 QuickCheck servant template-haskell text time - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; - license = lib.licenses.bsd3; - }) {}; - - "servant-openapi3_2_0_1_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -245903,7 +245867,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-options" = callPackage @@ -248671,6 +248634,33 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_29" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, file-embed, ghc-prim, hspec + , HUnit, parsec, process, scientific, template-haskell, text + , th-lift, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.29"; + sha256 = "016vkhn2g91cip5w06kh0z577s90sd768rmx044n4b5sa135c89j"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions file-embed ghc-prim parsec process scientific + template-haskell text th-lift time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -249224,6 +249214,8 @@ self: { pname = "shelly"; version = "1.10.0"; sha256 = "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65"; + revision = "1"; + editedCabalFile = "07c1rjwvg2ldam6yaksvrr9f703b7d1rcw0482ns5yi2f7y1kczp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250187,6 +250179,32 @@ self: { broken = true; }) {}; + "simfin" = callPackage + ({ mkDerivation, aeson, base, bytestring, Chart, Chart-diagrams + , composition-extra, containers, exceptions, http-client + , http-client-tls, http-types, multi-containers, SVGFonts, tasty + , tasty-hunit, text, time, unordered-containers, utf8-string + }: + mkDerivation { + pname = "simfin"; + version = "1.0.0"; + sha256 = "1axrwkxa93igwr737xi98cni5s99kd29hxn3y7xbvh89wri7xcza"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring composition-extra exceptions http-client + http-client-tls http-types text time unordered-containers + utf8-string + ]; + executableHaskellDepends = [ + base Chart Chart-diagrams containers multi-containers SVGFonts text + time + ]; + testHaskellDepends = [ aeson base tasty tasty-hunit text ]; + description = "A library to fetch and parse financial data from the SimFin(+) API"; + license = lib.licenses.mit; + }) {}; + "simgi" = callPackage ({ mkDerivation, base, containers, haskell98 , mersenne-random-pure64, mtl, parsec, random @@ -250359,22 +250377,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, extra, filepath, hspec, process - , time, unix - }: - mkDerivation { - pname = "simple-cmd"; - version = "0.2.5"; - sha256 = "151js143l6b5rg6llvmcy1hcg80cmbp50ydrjhyfjqj32a1ygrsz"; - libraryHaskellDepends = [ - base directory extra filepath process time unix - ]; - testHaskellDepends = [ base hspec ]; - description = "Simple String-based process commands"; - license = lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_6" = callPackage ({ mkDerivation, base, directory, extra, filepath, hspec, process , time, unix }: @@ -250388,7 +250390,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Simple String-based process commands"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -251508,12 +251509,12 @@ self: { "sindre" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , libXft, mtl, parsec, permute, process, regex-pcre, setlocale - , text, unix, utf8-string, X11, X11-rm, x11-xim, X11-xshape + , text, unix, utf8-string, X11, X11-rm, x11-xim, X11-xshape, xext }: mkDerivation { pname = "sindre"; - version = "0.4"; - sha256 = "0p76rsk02p6rw51ppbr3j7ydk57k34684qf50nrz5qd0jrnapjm2"; + version = "0.6"; + sha256 = "0pp000cabdjphgb0panyg9nw0zgfzklkg4ink8swyxcix3r84mj9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -251521,16 +251522,16 @@ self: { process regex-pcre setlocale text unix utf8-string X11 X11-rm x11-xim X11-xshape ]; - libraryPkgconfigDepends = [ libXft ]; + libraryPkgconfigDepends = [ libXft xext ]; executableHaskellDepends = [ array attoparsec base bytestring containers mtl parsec permute process regex-pcre setlocale text unix utf8-string X11 X11-rm x11-xim X11-xshape ]; - executablePkgconfigDepends = [ libXft ]; + executablePkgconfigDepends = [ libXft xext ]; description = "A programming language for simple GUIs"; license = lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXft;}; + }) {inherit (pkgs.xorg) libXft; xext = null;}; "single-tuple" = callPackage ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, OneTuple @@ -251700,6 +251701,8 @@ self: { pname = "singletons-th"; version = "3.0"; sha256 = "1c0w7sg0lbpizrzns4g55wxsk5jm8wlqw0w9rz4jzqwy15byb572"; + revision = "1"; + editedCabalFile = "11mmccdqxplqz7mp1brxpr9hqnkqkhbwnp32mihz4ird0k8gwqij"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -251716,8 +251719,8 @@ self: { pname = "singletons-th"; version = "3.1"; sha256 = "1mhx7sadw7zxaf7qhryrhi4fiyf9v3jcaplkh1syaa7b4725dm7a"; - revision = "1"; - editedCabalFile = "1mir0m8zpnq5ckkk073nxy32mghfkbdzncvxpjdpmv2yfxl9iwgi"; + revision = "2"; + editedCabalFile = "19ac6s4k6yv0lfrhkmgpf000k32rpm91lngs4955158792pa6fi6"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -252342,27 +252345,6 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , pretty-show, skylighting-core, text - }: - mkDerivation { - pname = "skylighting"; - version = "0.12.3"; - sha256 = "04asis41pwr395246rnhg7xaxi0mwal14sv3x7rzhbs4cb9ycsqi"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary containers skylighting-core - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers pretty-show text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - }) {}; - - "skylighting_0_12_3_1" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, text }: @@ -252381,43 +252363,9 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-core" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string - , xml-conduit - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.12.3"; - sha256 = "0pv84asvpvanxxalqsxij6hymd0nv5zcpdysj35880api5k28l0w"; - revision = "1"; - editedCabalFile = "0hc6w1bi9s4gxh5ypqhh6lgrcwv3c8xcmjsg8k9p47mmrdsa0ski"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath mtl safe text transformers utf8-string xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath - pretty-show QuickCheck tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_12_3_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -252446,7 +252394,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -252470,8 +252417,8 @@ self: { ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { pname = "skylighting-lucid"; - version = "1.0.1"; - sha256 = "0igimymq8pcizl4wdmyjafjgdw8xi2059jzmcw64ij18rn6bip8d"; + version = "1.0.2"; + sha256 = "06gvc5d23aiah5yq4b9gks7x26iz6xcx0k4mfsmjv5v2ic2zrbzb"; libraryHaskellDepends = [ base containers lucid skylighting-core text ]; @@ -256801,6 +256748,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sparse-merkle-trees" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , cryptonite, deepseq, memory, QuickCheck, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "sparse-merkle-trees"; + version = "0.2.0.0"; + sha256 = "0jcysnm95kv7xw36yi02n2jp3xrbyp1g3pr141hj5zkc90ng5ds7"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory + ]; + testHaskellDepends = [ + base bytestring containers cryptonite memory smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion cryptonite deepseq memory + QuickCheck + ]; + description = "Sparse Merkle trees with proofs of inclusion and exclusion"; + license = lib.licenses.bsd3; + }) {}; + "sparse-tensor" = callPackage ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise @@ -258785,10 +258756,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.3.1"; - sha256 = "1a26pwg6y90588yf9sp18w4b2ahr64fxdhy1c3zv0c9pw7bv6k6q"; - revision = "3"; - editedCabalFile = "1di10cbxg1xkj1fwimdfqhspk084xg2a1wvff3i2q336xa6jbqfl"; + version = "2.3.2"; + sha256 = "1ya9hnxvwqh1qhlci7aqpbj9abmsi2n13251b8nffmpvlpls6lk8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -261348,6 +261317,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "storable-offset" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "storable-offset"; + version = "0.1.0.0"; + sha256 = "0m0qmnnb07vhzs1ds7h4cfhba4rzb3abpijk8vjwncanfgg2g4pj"; + libraryHaskellDepends = [ base ]; + description = "Storable offsets for record fields"; + license = lib.licenses.bsd3; + }) {}; + "storable-record" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, transformers , utility-ht @@ -261917,27 +261897,6 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim - , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit - , tasty-smallcheck, transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.2.1"; - sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet - streaming transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring resourcet smallcheck streaming tasty tasty-hunit - tasty-smallcheck transformers - ]; - description = "Fast, effectful byte streams"; - license = lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_2_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base @@ -261956,7 +261915,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -262625,22 +262583,6 @@ self: { }) {}; "streamt" = callPackage - ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty - , tasty-hunit - }: - mkDerivation { - pname = "streamt"; - version = "0.5.0.0"; - sha256 = "0r2r6ribk85hwmzdn2imgajb28q5d5gbhysr62bw2jhmd5xy7985"; - libraryHaskellDepends = [ base logict mtl ]; - testHaskellDepends = [ - async base criterion hspec mtl tasty tasty-hunit - ]; - description = "Simple, Fair and Terminating Backtracking Monad Transformer"; - license = lib.licenses.bsd3; - }) {}; - - "streamt_0_5_0_1" = callPackage ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty , tasty-hunit }: @@ -262654,7 +262596,6 @@ self: { ]; description = "Simple, Fair and Terminating Backtracking Monad Transformer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strelka" = callPackage @@ -263141,36 +263082,6 @@ self: { }) {}; "string-interpolate" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, formatting - , haskell-src-exts, haskell-src-meta, hspec, hspec-core - , interpolate, neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, split, template-haskell - , text, text-conversions, unordered-containers, utf8-string - }: - mkDerivation { - pname = "string-interpolate"; - version = "0.3.1.1"; - sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69"; - revision = "3"; - editedCabalFile = "0kpk5mwmi7qzvx0hkiq6pwfyid99ic95zmxc36xxfpw4qxfc7024"; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta split - template-haskell text text-conversions utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec hspec-core QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode template-haskell text - unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq formatting interpolate - neat-interpolation QuickCheck text - ]; - description = "Haskell string/text/bytestring interpolation that just works"; - license = lib.licenses.bsd3; - }) {}; - - "string-interpolate_0_3_1_2" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, formatting , haskell-src-exts, haskell-src-meta, hspec, hspec-core , interpolate, neat-interpolation, QuickCheck, quickcheck-instances @@ -263196,7 +263107,6 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "string-interpreter" = callPackage @@ -266938,8 +266848,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8.3"; - sha256 = "1ksznzw5g01xgbr2zs83m0lclbhvhs6lyaszhxykni10lxyxy7v8"; + version = "3.8.4"; + sha256 = "13hsv7yr35jaimag4v0c0l56clcdcny4b1m0q6h83qcidcrqxcfc"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -268711,6 +268621,8 @@ self: { pname = "talash"; version = "0.1.1.1"; sha256 = "0sa4ay2dc4srh5wbk72iznjwr5bjjhggafhf27zyyxjhnjvfgsq1"; + revision = "1"; + editedCabalFile = "0p635l2dr0wdfmqpx85wd6x2wq7n50m2n59rjin9fk1jg9qd869m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269150,6 +269062,8 @@ self: { pname = "taskwarrior"; version = "0.6.0.2"; sha256 = "16m4578ybwawiza4fg8gc6ndfc8hpvdkh5bv3ghamwpqyw0aq766"; + revision = "1"; + editedCabalFile = "10yyjis1crs60h00z0nlrq8p4hqzafjjn63fqnwf7wjq1yqmg5h5"; libraryHaskellDepends = [ aeson base bytestring containers process random text time uuid ]; @@ -269288,26 +269202,27 @@ self: { }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, containers, directory, filepath, Glob - , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit - , tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, bytestring, containers, directory, filepath + , Glob, hedgehog, hspec, hspec-core, tasty, tasty-golden + , tasty-hedgehog, tasty-hspec, tasty-hunit, tasty-quickcheck + , tasty-smallcheck }: mkDerivation { pname = "tasty-discover"; - version = "4.2.2"; - sha256 = "1j95njl3ml7cfxnwv0i17ijca84fgyrjs2cfw4g5yh1m4x2zvg34"; + version = "4.2.4"; + sha256 = "1v6ndsvz9f04gv3m41a2yqprpa7xz8d00vkws25a9n7b7h3wvj4x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath Glob + base containers directory filepath Glob tasty ]; executableHaskellDepends = [ base containers directory filepath Glob ]; testHaskellDepends = [ - base containers directory filepath Glob hedgehog tasty - tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck - tasty-smallcheck + base bytestring containers directory filepath Glob hedgehog hspec + hspec-core tasty tasty-golden tasty-hedgehog tasty-hspec + tasty-hunit tasty-quickcheck tasty-smallcheck ]; description = "Test discovery for the tasty framework"; license = lib.licenses.mit; @@ -269519,24 +269434,6 @@ self: { }) {}; "tasty-hspec" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-hspec"; - version = "1.2"; - sha256 = "0hnq6q4mk2avirb8cgibaxj5m2c4rf5xsqry04zx4nc15la5xniw"; - revision = "2"; - editedCabalFile = "0a97zm7lxc7m0qw3i3grwzdmbpar5bf2cj31ip37mh9w1x2nzqvx"; - libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck - tasty-smallcheck - ]; - description = "Hspec support for the Tasty test framework"; - license = lib.licenses.bsd3; - }) {}; - - "tasty-hspec_1_2_0_1" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck }: @@ -269550,7 +269447,6 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-html" = callPackage @@ -269610,8 +269506,8 @@ self: { }: mkDerivation { pname = "tasty-inspection-testing"; - version = "0.1"; - sha256 = "18awafrclxg8lfw8gg4ndzfwwpaz8qmad23fi24rhpdj9c7xdyhw"; + version = "0.1.0.1"; + sha256 = "0p46w44f19w7lvdzyg3vq6qzix0rjp8p23ilxz82dviq38lgmifp"; libraryHaskellDepends = [ base ghc inspection-testing tasty template-haskell ]; @@ -270303,8 +270199,8 @@ self: { pname = "tdigest"; version = "0.2.1.1"; sha256 = "1dvkf7cs8dcr13wza5iyq2qgvz75r33mzgfmhdihw62xzxsqb6d3"; - revision = "2"; - editedCabalFile = "0hcsjdd8km8dhydg4npc6mw6yy6bhv4f21zvm8is8h0ci4057asy"; + revision = "3"; + editedCabalFile = "0a39vwf37hkh06rn79blr3bw7ij05pgpxrkc9cldgdd5p4gvn1qn"; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers vector vector-algorithms @@ -272952,15 +272848,15 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder-dev_0_3_1" = callPackage + "text-builder-dev_0_3_2" = callPackage ({ mkDerivation, base, bytestring, criterion, deferred-folds , QuickCheck, quickcheck-instances, rerebase, split, tasty , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.1"; - sha256 = "18ipiiqrr0hz0yl7lqv2y730vl6mzqp0jg1yir097gp53ky6hzyw"; + version = "0.3.2"; + sha256 = "0x77y8vrsxdrmx2d6y8wxw7qmdnxdjh4rzbs3lwmharxvrqdwnxs"; libraryHaskellDepends = [ base bytestring deferred-folds split text transformers ]; @@ -272974,6 +272870,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "text-builder-linear" = callPackage + ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench + , tasty-quickcheck, text + }: + mkDerivation { + pname = "text-builder-linear"; + version = "0.1"; + sha256 = "0smhph72l0wzri8rn30sq46f53ghs6srib34w8m7350rksdwm3fc"; + libraryHaskellDepends = [ base bytestring quote-quot text ]; + testHaskellDepends = [ base tasty tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base tasty tasty-bench text ]; + description = "Builder for Text based on linear types"; + license = lib.licenses.bsd3; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -273567,6 +273478,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-rope_0_2" = callPackage + ({ mkDerivation, base, deepseq, random, tasty, tasty-bench + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "text-rope"; + version = "0.2"; + sha256 = "12z7radm15mlfz5nrpii2dkjkiis05a88x923jipbhwwbs2j4i5i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base deepseq text vector ]; + testHaskellDepends = [ base tasty tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base random tasty-bench text ]; + description = "Text lines and ropes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-short" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim , hashable, tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -273618,6 +273546,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_9_7" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers, criterion + , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.9.7"; + sha256 = "1zc47qh38jmg19fdki9isjcq4v115w2q61dnmxkypahhgiaqgkb3"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers generic-deriving ghc-boot-th ghc-prim + template-haskell text th-abstraction th-lift transformers + transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + QuickCheck quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -273653,6 +273612,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show-instances_3_9" = callPackage + ({ mkDerivation, base, base-compat-batteries, 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, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.9"; + sha256 = "1bfangk4ys6pvhrv3j7i2c29xnhgin5lma2ndw051hnmmc7v2j7l"; + libraryHaskellDepends = [ + base base-compat-batteries 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 transformers-compat unix + unordered-containers vector xhtml + ]; + testHaskellDepends = [ + base base-compat-batteries 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 vector xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -274161,17 +274154,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_13" = callPackage + "th-desugar_1_13_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction , th-lift, th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.13"; - sha256 = "03jmvlgb7h7dn5dvlb0ryy7zjvdmyp5280cbkyrvfpjw0g5c9k24"; - revision = "1"; - editedCabalFile = "1xizqmh5zj85493bnfbd2m9vd6n5cp7hlcyddwap4h0jf2r06qk5"; + version = "1.13.1"; + sha256 = "03k2kfbzfc87kibzbpp3s1l5xb0ww2vvwj9ngh0qapxm28a01rz3"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -274213,6 +274204,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-env_0_1_1" = callPackage + ({ mkDerivation, base, markdown-unlit, template-haskell, th-compat + }: + mkDerivation { + pname = "th-env"; + version = "0.1.1"; + sha256 = "01gmycna12sg2f0zslhjnjx8s86shsvmw5jpw5n5z93bvxkb20gw"; + libraryHaskellDepends = [ base template-haskell th-compat ]; + testHaskellDepends = [ base markdown-unlit ]; + testToolDepends = [ markdown-unlit ]; + description = "Template Haskell splices that expand to an environment variable"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-expand-syns" = callPackage ({ mkDerivation, base, containers, syb, template-haskell , th-abstraction @@ -274438,29 +274444,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-compat, th-expand-syns, th-lift - , th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.12"; - sha256 = "03n6qxnpxhbzyzbyrjq77d1y62dwgx39mmxfwmnc04l8pawgrxxz"; - revision = "2"; - editedCabalFile = "15660jac7m705jp6nm5lia51ifchbjrr6x3kj5sfij9dbj1f5dkj"; - libraryHaskellDepends = [ - base mtl template-haskell th-compat th-expand-syns th-lift - th-lift-instances th-reify-many - ]; - testHaskellDepends = [ - base bytestring ghc-prim hspec template-haskell th-lift - ]; - testToolDepends = [ hspec-discover ]; - description = "Orphan instances for TH datatypes"; - license = lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_13" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover , mtl, template-haskell, th-compat, th-lift, th-lift-instances , th-reify-many @@ -274479,7 +274462,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-pprint" = callPackage @@ -274504,6 +274486,8 @@ self: { pname = "th-printf"; version = "0.7"; sha256 = "1f9lw0scm2bpnhmhgvywzphxn85ln3xcn8cjyvy8h4cn2ymw4aza"; + revision = "1"; + editedCabalFile = "0q9b8xv6qf8yg5c6rn1jgmgwr4ckf4yzd9qv9ysr3c363cgnccyv"; libraryHaskellDepends = [ base charset containers dlist integer-logarithms microlens-platform mtl parsec semigroups template-haskell text th-lift transformers @@ -278973,8 +278957,8 @@ self: { pname = "trackit"; version = "0.7.2"; sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; - revision = "2"; - editedCabalFile = "0dinhqmnm23rwg9xd056idbd7351bzbyik4k708h8xlw3pgq62i9"; + revision = "3"; + editedCabalFile = "07ak29br452qssj5kik8izmny24qw1icz84dq82b5g6xhy31vdrf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -284280,8 +284264,8 @@ self: { }: mkDerivation { pname = "ulid"; - version = "0.3.0.0"; - sha256 = "1ghdh18cngwksr1vlqgdh04asm4gcivcpzhizaf6d4z9sl9qz5mp"; + version = "0.3.2.0"; + sha256 = "1zhw1n5pqmb74b4120vcg4bdpdl78qwmc3j0815c7h9s9q8kik87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -284439,28 +284423,6 @@ self: { }) {}; "unbound-generics" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant - , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, transformers-compat - }: - mkDerivation { - pname = "unbound-generics"; - version = "0.4.1"; - sha256 = "02wwn78fccb37lx95jvr0v2n55kv35nilllb0gj75y8bplya5blb"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers contravariant deepseq exceptions mtl - profunctors template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Support for programming with names and binders using GHC Generics"; - license = lib.licenses.bsd3; - }) {}; - - "unbound-generics_0_4_2" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, template-haskell @@ -284480,7 +284442,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Support for programming with names and binders using GHC Generics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unbound-kind-generics" = callPackage @@ -284891,33 +284852,6 @@ self: { }) {}; "unicode-collation" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, parsec - , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-icu - , th-lift-instances, unicode-transforms - }: - mkDerivation { - pname = "unicode-collation"; - version = "0.1.3.1"; - sha256 = "1b04ml07ghfsh9cmp6b0l8c6ywxrn3c4xs7swvlmxx64asmicf3i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers parsec template-haskell text - th-lift-instances - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ - base QuickCheck quickcheck-instances tasty-bench text text-icu - ]; - description = "Haskell implementation of the Unicode Collation Algorithm"; - license = lib.licenses.bsd2; - }) {}; - - "unicode-collation_0_1_3_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers, parsec , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit , tasty-quickcheck, template-haskell, text, text-icu @@ -284942,7 +284876,6 @@ self: { ]; description = "Haskell implementation of the Unicode Collation Algorithm"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "unicode-data" = callPackage @@ -285146,6 +285079,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "unification-fd_0_11_2" = callPackage + ({ mkDerivation, base, containers, logict, mtl }: + mkDerivation { + pname = "unification-fd"; + version = "0.11.2"; + sha256 = "1lyx3g10llkr7vl7c2j15ddlqrkz2r684d1laza7nvq97amrqnqv"; + libraryHaskellDepends = [ base containers logict mtl ]; + description = "Simple generic unification algorithms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uniform-algebras" = callPackage ({ mkDerivation, base, numeric-prelude, test-invariant }: mkDerivation { @@ -286053,6 +285998,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-bytestring_0_3_7_7" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "unix-bytestring"; + version = "0.3.7.7"; + sha256 = "1fpv8f6x2z0qncdjxpg3v3qjjs747bf3vw319c9hlygrhg5pnkx6"; + libraryHaskellDepends = [ base bytestring ]; + description = "Unix/Posix-specific functions for ByteStrings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unix-compat" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -286066,6 +286023,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-compat_0_6" = callPackage + ({ mkDerivation, base, directory, extra, hspec, HUnit + , monad-parallel, temporary, unix + }: + mkDerivation { + pname = "unix-compat"; + version = "0.6"; + sha256 = "1y6m8ix8np6vambabdaj2h7ydgda8igwy3kliv53mba3clx85kdl"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ + base directory extra hspec HUnit monad-parallel temporary + ]; + description = "Portable POSIX-compatibility layer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unix-fcntl" = callPackage ({ mkDerivation, base, foreign-var }: mkDerivation { @@ -286607,8 +286581,8 @@ self: { }: mkDerivation { pname = "unpacked-maybe-numeric"; - version = "0.1.1.0"; - sha256 = "1bhipjz20zajbkg6zjgw99w1bzdn6w6ixl34m6wnhvz8bms27lm1"; + version = "0.1.2.0"; + sha256 = "08cm7121c2ddj2fqfjhqjs3y1yskzcsxjq2q8pbq1ndicmlrw1b0"; libraryHaskellDepends = [ base primitive wide-word ]; testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "maybes of numeric values with fewer indirections"; @@ -289605,8 +289579,8 @@ self: { pname = "vector"; version = "0.12.3.1"; sha256 = "0dczbcisxhhix859dng5zhxkn3xvlnllsq60apqzvmyl5g056jpv"; - revision = "1"; - editedCabalFile = "02284cr5f5ghbz18shn8g6jvsgfs0dwgf81kxvf59r2wks8i00h4"; + revision = "2"; + editedCabalFile = "0gkzrqcx5fymkxm92gy47qj0spj79ygv1vn7kfzdg7nn284x1yzz"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -292619,6 +292593,22 @@ self: { broken = true; }) {}; + "wai-middleware-bearer" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-wai, http-types + , wai, word8 + }: + mkDerivation { + pname = "wai-middleware-bearer"; + version = "1.0.3"; + sha256 = "17vqvr9f8n4zgxhhanndkpywjmzffm06f2nbsq1wxq79qpghc44j"; + libraryHaskellDepends = [ base bytestring http-types wai word8 ]; + testHaskellDepends = [ + base bytestring hspec hspec-wai http-types wai word8 + ]; + description = "WAI Middleware for Bearer Token Authentication"; + license = lib.licenses.mit; + }) {}; + "wai-middleware-brotli" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix @@ -295853,8 +295843,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.3.0"; - sha256 = "1l3g0afb0k91qb64kpj18nb53njbv3s5w06rkjf58p7qk6ynk9ig"; + version = "2.4.0"; + sha256 = "1lwg1a4i7gb0l58bsyn1sg2q31ns79ldw4nv6hbnh4rqq1rv7vx4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -295909,6 +295899,8 @@ self: { pname = "weigh"; version = "0.0.16"; sha256 = "13pbjr7fzqy3s9c1nd2jhfwzbpccmpfwdn7y46z9k2bfkch1jam9"; + revision = "1"; + editedCabalFile = "0y71p1fg2q9ig955b21fhfaipdamdrlzfl302prqz8g0sfcxvmfg"; libraryHaskellDepends = [ base deepseq ghc mtl process split temporary ]; @@ -298160,6 +298152,8 @@ self: { pname = "writer-cps-mtl"; version = "0.1.1.6"; sha256 = "0dnx2h4pqmvbkg2hh9c6vhayn6hyzyvs12c0s7rjdba1vihgpy86"; + revision = "1"; + editedCabalFile = "0j0qmb3r1xiva0q0vh8qi0l56py1n0cj1ikd44ivdmbadm5krs92"; libraryHaskellDepends = [ base mtl transformers writer-cps-transformers ]; @@ -299090,6 +299084,8 @@ self: { pname = "xeno"; version = "0.5"; sha256 = "1i7snivbl0xby5p1wgai1g44qphj91n8chhkfg6vajcf05fr964l"; + revision = "1"; + editedCabalFile = "1f3gkprlqddvkch2qylj02xwsjjhbpgnbiira0dpvgg9hv6qxkhm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring deepseq mtl mutable-containers vector @@ -299608,6 +299604,8 @@ self: { pname = "xml-conduit"; version = "1.9.1.1"; sha256 = "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"; + revision = "1"; + editedCabalFile = "0x4is0956lfpxnxf2hqv5yvl1v8r1d41h3a22qqkvbqi13xz2hzv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup bytestring conduit @@ -303980,30 +303978,6 @@ self: { }) {}; "yesod-page-cursor" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , hspec-expectations-lifted, http-link-header, http-types, lens - , lens-aeson, monad-logger, mtl, network-uri, persistent - , persistent-sqlite, persistent-template, scientific, text, time - , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-page-cursor"; - version = "2.0.0.10"; - sha256 = "0ygj3k86lxq59pf5z671kyzgkfvc8csgsg9wb6ds9wy0vym1jd13"; - libraryHaskellDepends = [ - aeson base bytestring containers http-link-header network-uri text - unliftio yesod-core - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations-lifted - http-link-header http-types lens lens-aeson monad-logger mtl - persistent persistent-sqlite persistent-template scientific text - time unliftio unliftio-core wai-extra yesod yesod-core yesod-test - ]; - license = lib.licenses.mit; - }) {}; - - "yesod-page-cursor_2_0_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-expectations-lifted, http-link-header, http-types, lens , lens-aeson, monad-logger, mtl, network-uri, persistent @@ -304025,7 +303999,6 @@ self: { time unliftio unliftio-core wai-extra yesod yesod-core yesod-test ]; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-paginate" = callPackage @@ -307368,8 +307341,8 @@ self: { }: mkDerivation { pname = "zxcvbn-hs"; - version = "0.3.0.0"; - sha256 = "13rz0bjvcj9hrxnxqbw7bl6529yz4aqawq6abssj4nmxbmgrj7xf"; + version = "0.3.1"; + sha256 = "1x32gzgv56l6l14b5k3wa1nzs5b4wgm8a0vn6y49ks6pgi7bdzim"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 849d47a9280e059bf6a6f8762431f04d4c12f02b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 May 2022 16:38:42 +0100 Subject: [PATCH 05/27] ghc: use CXX=c++, not CXX=cxx Otherwise attempt to build ghcHEAD from local checkout fails as: $ nix build -L --impure --expr 'with import ~/nm {}; haskell.compiler.ghcHEAD.overrideAttrs (oa: { src = ./.; patches = []; nativeBuildInputs = oa.nativeBuildInputs ++ [ git ]; })' --keep-failed ... ghc> checking C++ standard library flavour... ./configure: line 11487: /nix/store/r7r10qvsqlnvbzjkjinvscjlahqbxifl-gcc-wrapper-11.3.0/bin/cxx: No such file or directory I think 'cxx' is not provided by stdenv. --- pkgs/development/compilers/ghc/8.10.7.nix | 2 +- pkgs/development/compilers/ghc/8.8.4.nix | 2 +- pkgs/development/compilers/ghc/9.0.2.nix | 2 +- pkgs/development/compilers/ghc/9.2.3.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 7a56d7c0e5c8..981dfee88b86 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation (rec { # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 907d995a250a..40dabc6c9837 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation (rec { # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 6de0f201599f..7b3f213ed333 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation (rec { # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" diff --git a/pkgs/development/compilers/ghc/9.2.3.nix b/pkgs/development/compilers/ghc/9.2.3.nix index af641ae9c59a..016b7df90ce1 100644 --- a/pkgs/development/compilers/ghc/9.2.3.nix +++ b/pkgs/development/compilers/ghc/9.2.3.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation (rec { # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4f52ba0a6182..ea7c47959a19 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation (rec { # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # and more generally have a faster linker. export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" From 1c2971c8a4a02744bd0a34d24c3998235c53a2d1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 29 May 2022 20:13:17 +0200 Subject: [PATCH 06/27] haskellPackages: use 9.2.3 releases for ghc-lib* packages --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- .../haskell-modules/configuration-ghc-9.2.x.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc20e35b753c..43ab55aa102d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2241,12 +2241,12 @@ self: super: { # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2 stylish-haskell = (super.stylish-haskell.override { - ghc-lib-parser = super.ghc-lib-parser_9_2_2_20220307; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_3; + ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; }); - ghc-lib-parser-ex_9_2_0_3 = super.ghc-lib-parser-ex_9_2_0_3.override { - ghc-lib-parser = super.ghc-lib-parser_9_2_2_20220307; + ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override { + ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220527; }; # To strict bound on hspec diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index eedb69da8e90..d734a72ec241 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -100,9 +100,9 @@ self: super: { self.data-default ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; - ghc-lib = self.ghc-lib_9_2_2_20220307; - ghc-lib-parser = self.ghc-lib-parser_9_2_2_20220307; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_3; + ghc-lib = self.ghc-lib_9_2_3_20220527; + ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220527; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_0_2; hashable-time = doJailbreak super.hashable-time; From cfb1a6cc8f6348b4e078d18f427fbf36bb75b883 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 29 May 2022 20:13:46 +0200 Subject: [PATCH 07/27] haskell.packages.ghc923.th-desugar: reflect 1.13 -> 1.13.1 update --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index d734a72ec241..ef625d0db9ab 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -146,7 +146,7 @@ self: super: { shelly = doJailbreak super.shelly; splitmix = doJailbreak super.splitmix; tasty-hspec = doJailbreak super.tasty-hspec; - th-desugar = self.th-desugar_1_13; + th-desugar = self.th-desugar_1_13_1; time-compat = doJailbreak super.time-compat; tomland = doJailbreak super.tomland; type-equality = doJailbreak super.type-equality; From 6540a11768861c99a8b9f94c1aaf0ad27e1a7142 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 30 May 2022 11:33:54 +0200 Subject: [PATCH 08/27] haskellPackages.composite-{base,aeson}: drop obsolete overrides With this, composite-aeson builds again as well. --- .../haskell-modules/configuration-common.nix | 18 ------------------ .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 43ab55aa102d..f0443a0efb50 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2209,24 +2209,6 @@ self: super: { # https://github.com/muesli4/table-layout/issues/16 table-layout = doJailbreak super.table-layout; - # Bounds on profunctors are too strict - # https://github.com/ConferOpenSource/composite/issues/50 - # Remove overrides when assert fails. - composite-base = assert super.composite-base.version == "0.7.5.0"; - overrideCabal (drv: { - patches = drv.patches or [] ++ [ - (fetchpatch { - name = "composite-base-template-haskell-2.17.patch"; - url = "https://github.com/ConferOpenSource/composite/commit/4ca7562d46a0cdfae3afacf194134db768450a02.patch"; - sha256 = "sha256-FG2t1BYfV09VENJDlh1PD88sXAGqaujhpss5DWFcbeE="; - relative = "composite-base"; - }) - ]; - jailbreak = true; - }) super.composite-base; - composite-aeson = assert super.composite-aeson.version == "0.7.5.0"; - doJailbreak super.composite-aeson; - # 2021-06-20: Outdated upper bounds # https://github.com/Porges/email-validate-hs/issues/58 email-validate = doJailbreak super.email-validate; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2ecf14912009..833ae06e2505 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -772,7 +772,6 @@ broken-packages: - complex-generic - composable-associations-aeson - compose-trans - - composite-aeson - composite-opaleye - composition-tree - comprehensions-ghc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7c59e52bef37..e77a614b27bf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62475,8 +62475,6 @@ self: { ]; description = "JSON for Vinyl records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "composite-aeson-cofree-list" = callPackage From 7badab08b5789bd6c357704b43d1e4612abafd2d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 30 May 2022 15:21:57 +0200 Subject: [PATCH 09/27] haskellPackages.tasty-discover: drop obsolete overrides Finally all the patches we applied have reached a hackage release. --- .../haskell-modules/configuration-common.nix | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f0443a0efb50..d24ae1dc49a8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -515,28 +515,8 @@ self: super: { # else dontCheck super.doctest-discover); doctest-discover = dontCheck super.doctest-discover; - # Depends on itself for testing tasty-discover = overrideCabal (drv: { - # Compatibility with tasty-hspec >= 1.1.7 requires a patch and a dependency on hspec - patches = drv.patches or [] ++ [ - # Intermediate patch so fix applies - (fetchpatch { - url = "https://github.com/haskell-works/tasty-discover/commit/67b022f5945abdfb71ca31fca7910abc7effe043.patch"; - sha256 = "1x539qa2871fiahw9zjxyyqz86v4ib7k7fv9hdvvxcrrfw3zwl66"; - }) - # Actual fix - (fetchpatch { - name = "tasty-hspec-1.1.7-compat.patch"; - url = "https://github.com/haskell-works/tasty-discover/commit/98d3c464f33129e38fa9c0fcdfb1847dfb0490b9.patch"; - sha256 = "01a8ni3lyh1wql7aghl41nd2c9m6gcn1i77bh3pygh6r403x771p"; - }) - ]; - testHaskellDepends = drv.testHaskellDepends or [] ++ [ - self.hspec - ]; - # https://github.com/haskell-works/tasty-discover/issues/17 - jailbreak = true; # allow tasty-hspec >= 1.2 - + # Depends on itself for testing preBuild = '' export PATH="$PWD/dist/build/tasty-discover:$PATH" '' + (drv.preBuild or ""); From 423a751465e74c9bfffb6649bd9d8adb800154e2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 12:33:02 +0200 Subject: [PATCH 10/27] haskellPackages.git-annex: adjust sha256 for 10.20220525 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d24ae1dc49a8..8adc4a39eea3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -99,7 +99,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-NYe34bsq2v0rlmcSMgYvU9ec94meXFFJoWo0sIjX/bY="; + sha256 = "0a0jnahljd46vzjgcwlzjhrrjgn40s0zfjklh63aa9w9x0zkvbin"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash From 5944112af71a2bb444e7f66d44ecb9c7ccd99e83 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 12:41:31 +0200 Subject: [PATCH 11/27] haskell.packages.ghc902.weeder: pin to < 2.4 weeder 2.4.0 /requires/ GHC 9.2. --- .../configuration-ghc-9.0.x.nix | 3 +++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index db38ebd8b708..127f3225c297 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -130,4 +130,7 @@ self: super: { inline-c-cpp = (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) super.inline-c-cpp; + + # 2022-05-31: weeder 2.3.0 requires GHC 9.2 + weeder = doDistribute self.weeder_2_3_1; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d295ad3d63df..15d16ff2307d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -124,6 +124,7 @@ extra-packages: - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 + - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - SVGFonts < 1.8 # 2022-03-19: Needed for Chart-diagrams 1.9.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e77a614b27bf..61a3763d6b1b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -295834,6 +295834,32 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "weeder_2_3_1" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.3.1"; + sha256 = "16hgfhchmnp32wvcx9r464azycvdq1gsjmnjmnw995y9cp27ayy1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "weeder" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl From 2d0b56360fc7a702f0c4fac5f202389a569f58c5 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Tue, 31 May 2022 12:49:00 +0200 Subject: [PATCH 12/27] glirc: unbreak via downgrade to 2.38 glirc 2.39 does not compile against any set of released packages and is unlikely to be fixed without a subsequent release (https://github.com/glguy/irc-core/issues/99). --- .../haskell-modules/configuration-common.nix | 1 - .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 4 ++ .../haskell-modules/hackage-packages.nix | 51 ++++++++++++++++++- 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8adc4a39eea3..df2574f0395c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2513,7 +2513,6 @@ self: super: { # attoparsec bump is on v2 branch, but not released yet irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core; glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc; - hookup = assert super.irc-core.version == "2.10"; doJailbreak super.hookup; # 2022-02-25: Unmaintained and to strict upper bounds paths = doJailbreak super.paths; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 833ae06e2505..fb99b68d2cda 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1744,7 +1744,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - global-variables - glob-posix diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 15d16ff2307d..84d308d40bef 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -87,6 +87,10 @@ default-package-overrides: - dhall-nix < 1.1.24 # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version - distribution-nixpkgs < 1.7.0 + # glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99 + - glirc == 2.38 + # glirc 2.38 requires hookup 0.6 + - hookup == 0.6 extra-packages: - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 61a3763d6b1b..0ac574f11052 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111055,6 +111055,37 @@ self: { }) {}; "glirc" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , bytestring, Cabal, config-schema, config-value, containers + , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL + , HUnit, irc-core, kan-extensions, lens, network, process, psqueues + , random, regex-tdfa, split, stm, template-haskell, text, time + , transformers, unix, unordered-containers, vector, vty + }: + mkDerivation { + pname = "glirc"; + version = "2.38"; + sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7"; + revision = "2"; + editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring bytestring config-schema + config-value containers directory filepath free gitrev hashable + hookup HsOpenSSL irc-core kan-extensions lens network process + psqueues random regex-tdfa split stm template-haskell text time + transformers unix unordered-containers vector vty + ]; + executableHaskellDepends = [ base lens text vty ]; + testHaskellDepends = [ base HUnit ]; + description = "Console IRC client"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ kiwi ]; + }) {}; + + "glirc_2_39" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , curve25519, directory, filepath, free, githash, hashable, hookup @@ -111083,7 +111114,6 @@ self: { license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ kiwi ]; - broken = true; }) {}; "gll" = callPackage @@ -138799,6 +138829,24 @@ self: { }) {}; "hookup" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL + , HsOpenSSL-x509-system, network, stm + }: + mkDerivation { + pname = "hookup"; + version = "0.6"; + sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528"; + revision = "1"; + editedCabalFile = "0dm7i3g8hlrg0rzfhfcryypgqlil2p8ny12bn49yir2b1qfd47dc"; + libraryHaskellDepends = [ + async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system + network stm + ]; + description = "Abstraction over creating network connections with SOCKS5 and TLS"; + license = lib.licenses.isc; + }) {}; + + "hookup_0_7" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL , HsOpenSSL-x509-system, network, stm }: @@ -138812,6 +138860,7 @@ self: { ]; description = "Abstraction over creating network connections with SOCKS5 and TLS"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; }) {}; "hoop" = callPackage From 6e267b064bd2437050c9800ddc07465875cd8752 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 14:42:54 +0200 Subject: [PATCH 13/27] release-haskell.nix: test weeder for currently working GHC versions --- pkgs/top-level/release-haskell.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0c5ac7d7514c..8de8d2fb3f4a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -376,6 +376,11 @@ let spectacle = [ compilerNames.ghc8107 ]; + weeder = [ + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc923 + ]; }) { mergeable = pkgs.releaseTools.aggregate { From ed7715885e740c71d21a5e38c31ed6b8fa6190b9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 14:56:27 +0200 Subject: [PATCH 14/27] haskellPackages.reflex: drop witherable bounds patch witherable bounds have been relaxed by upstream via a Hackage revision, so we no longer need to apply that part of the patch. --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index df2574f0395c..30f17594a158 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1685,10 +1685,19 @@ self: super: { reflex-dom-pandoc = super.reflex-dom-pandoc.override { clay = dontCheck self.clay_0_13_3; }; # 2022-03-16: Pull request for ghc 9 compat: https://github.com/reflex-frp/reflex/pull/467 - reflex = appendPatch (fetchpatch { - url = "https://github.com/reflex-frp/reflex/compare/823afd9424234cbe0134051f09a6710e54509cec...469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch"; - sha256 = "sha256-EwW7QBXHGlcJkKiLDmsXCZPwQz24+mg2Vuiu0Vb/T6w="; - }) (dontCheck super.reflex); + reflex = overrideCabal (drv: { + patches = drv.patches or [] ++ [ + (fetchpatch { + url = "https://github.com/reflex-frp/reflex/compare/469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch"; + sha256 = "04sxzxpx7xhr6p4n76rg1ci8zjfzs19lr21ziwsfig8zmdg22i7q"; + }) + ]; + doCheck = false; + # hackage revision seems to have DOS newlines + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix reflex.cabal + ''; + }) super.reflex; # 2020-11-19: jailbreaking because of pretty-simple bound out of date # https://github.com/kowainik/stan/issues/408 From 37c1c54c3efa6cabec16503ec4ed5e978570d491 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 20:43:14 +0200 Subject: [PATCH 15/27] haskellPackages.Chart-diagrams: build with up to date SVGFonts --- .../haskell-modules/configuration-common.nix | 5 ---- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 23 ------------------- 3 files changed, 29 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30f17594a158..820602415ff6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -765,11 +765,6 @@ self: super: { # https://github.com/diagrams/diagrams-braille/issues/1 diagrams-braille = doJailbreak super.diagrams-braille; - # https://github.com/timbod7/haskell-chart/pull/231#issuecomment-953745932 - Chart-diagrams = doJailbreak (super.Chart-diagrams.override { - SVGFonts = super.SVGFonts_1_7_0_1; - }); - # https://github.com/xu-hao/namespace/issues/1 namespace = doJailbreak super.namespace; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 84d308d40bef..9d4451fef68c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -131,7 +131,6 @@ extra-packages: - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - - SVGFonts < 1.8 # 2022-03-19: Needed for Chart-diagrams 1.9.3 - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0ac574f11052..4cd168ced43f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18012,29 +18012,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "SVGFonts_1_7_0_1" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , bytestring, cereal, cereal-vector, containers, data-default-class - , diagrams-core, diagrams-lib, directory, parsec, split, text - , vector, xml - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.7.0.1"; - sha256 = "06vnpkkr19s9b1wjp7l2w29vr7fsghcrffd2knlxvdhjacrfpc9h"; - revision = "2"; - editedCabalFile = "0q731cyrqq1csbid9nxh2bj6rf8yss017lz9j9zk22bw3bymzb0s"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg bytestring cereal - cereal-vector containers data-default-class diagrams-core - diagrams-lib directory parsec split text vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "SVGFonts" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class From adb86aa95d6a9cc9141f582f711f83f68b770cca Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 21:27:20 +0200 Subject: [PATCH 16/27] haskell.packages.ghc8107.purescript: clean up patch, unbreak After a dependency got unbroken recently, only a patch for LTS 18 which is now part of the release needed cleaning up and aeson 1.5.* and corresponding bower-json version to be provided. --- .../haskell-modules/configuration-common.nix | 29 +++++++------------ pkgs/top-level/release-haskell.nix | 3 ++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 820602415ff6..33326af949a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1078,26 +1078,17 @@ self: super: { purescript = lib.pipe - (super.purescript.override { - # The latest version of language-javascript is 0.7.1.0, - # but it seems to have a bug with async support: + (super.purescript.overrideScope (self: super: { + # Purescript targets Stackage LTS 18, so we need to downgrade a few things + aeson = self.aeson_1_5_6_0; + bower-json = self.bower-json_1_0_0_1; + # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, + # but it has a problem with parsing the `async` keyword. It doesn't allow + # `async` to be used as an object key: # https://github.com/erikd/language-javascript/issues/131 language-javascript = self.language-javascript_0_7_0_0; - }) - [ # This PR upgrades purescript from building with LTS-17 to building - # with LTS-18. Aside from bumping dependency bounds, there is one - # minor change that needs to be made in app/Main.hs. - # - # This patch can likely be removed when purescript-0.14.6 is released. - (appendPatch - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/purescript/purescript/pull/4199.patch"; - sha256 = "sha256-OeG30EfCHs7gttLME909WfKxkEZr7Ch3leYiw4lElGg="; - includes = [ - "app/Main.hs" - ]; - }) - ) + })) + [ # PureScript uses nodejs to run tests, so the tests have been disabled # for now. If someone is interested in figuring out how to get this # working, it seems like it might be possible. @@ -1108,6 +1099,8 @@ self: super: { doJailbreak # Generate shell completions (generateOptparseApplicativeCompletion "purs") + # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) + (if lib.versionAtLeast self.ghc.version "9.0" then markBroken else lib.id) ]; # purenix-1.0 has a strict version bound requiring purescript-0.14.4, but it diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 8de8d2fb3f4a..83b154a191ae 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -381,6 +381,9 @@ let compilerNames.ghc902 compilerNames.ghc923 ]; + purescript = [ + compilerNames.ghc8107 + ]; }) { mergeable = pkgs.releaseTools.aggregate { From 64f0689adf7cc9be1e073f9978ce578cdb9fc933 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 31 May 2022 23:31:49 +0200 Subject: [PATCH 17/27] haskell.packages.ghc8107.purescript-{a,c}st: sync with purescript Although purescript-{cst,ast} don't depend on purescript, it's important that they use the same dependencies as the latter, so packages that depend on more than one of them at the same time work, like e.g. purenix (which is broken at the moment because it doesn't support purescript 0.15). --- .../haskell-modules/configuration-common.nix | 78 +++++++++---------- .../configuration-hackage2nix/broken.yaml | 3 +- .../haskell-modules/hackage-packages.nix | 5 +- pkgs/top-level/release-haskell.nix | 6 ++ 4 files changed, 47 insertions(+), 45 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 33326af949a0..9e6fdffe0f99 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1069,44 +1069,6 @@ self: super: { # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; - # The most recent version of purescript-cst (0.4.0.0) has version - # bounds for LTS-17, so we need to jailbreak it for LTS-18. - # doJailbreak can likely be removed when the next version of - # purescript-cst is released, since the version bounds have - # been updated for LTS-18. - purescript-cst = doJailbreak super.purescript-cst; - - purescript = - lib.pipe - (super.purescript.overrideScope (self: super: { - # Purescript targets Stackage LTS 18, so we need to downgrade a few things - aeson = self.aeson_1_5_6_0; - bower-json = self.bower-json_1_0_0_1; - # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, - # but it has a problem with parsing the `async` keyword. It doesn't allow - # `async` to be used as an object key: - # https://github.com/erikd/language-javascript/issues/131 - language-javascript = self.language-javascript_0_7_0_0; - })) - [ - # PureScript uses nodejs to run tests, so the tests have been disabled - # for now. If someone is interested in figuring out how to get this - # working, it seems like it might be possible. - dontCheck - # The current version of purescript (0.14.5) has version bounds for LTS-17, - # but it compiles cleanly using deps in LTS-18 as well. This jailbreak can - # likely be removed when purescript-0.14.6 is released. - doJailbreak - # Generate shell completions - (generateOptparseApplicativeCompletion "purs") - # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) - (if lib.versionAtLeast self.ghc.version "9.0" then markBroken else lib.id) - ]; - - # purenix-1.0 has a strict version bound requiring purescript-0.14.4, but it - # works with later versions of purescript as well. - purenix = doJailbreak super.purenix; - # Generate shell completion for spago spago = generateOptparseApplicativeCompletion "spago" super.spago; @@ -2618,4 +2580,42 @@ self: super: { }) ] super.fast-tags; -} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super +} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let + # We need to build purescript with these dependencies and thus also its reverse + # dependencies to avoid version mismatches in their dependency closure. + # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? + purescriptOverlay = self: super: { + # Purescript targets Stackage LTS 18, so we need to downgrade a few things + aeson = self.aeson_1_5_6_0; + bower-json = self.bower-json_1_0_0_1; + # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, + # but it has a problem with parsing the `async` keyword. It doesn't allow + # `async` to be used as an object key: + # https://github.com/erikd/language-javascript/issues/131 + language-javascript = self.language-javascript_0_7_0_0; + }; +in { + purescript = + lib.pipe + (super.purescript.overrideScope purescriptOverlay) + [ + # PureScript uses nodejs to run tests, so the tests have been disabled + # for now. If someone is interested in figuring out how to get this + # working, it seems like it might be possible. + dontCheck + # The current version of purescript (0.14.5) has version bounds for LTS-17, + # but it compiles cleanly using deps in LTS-18 as well. This jailbreak can + # likely be removed when purescript-0.14.6 is released. + doJailbreak + # Generate shell completions + (generateOptparseApplicativeCompletion "purs") + # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) + (if lib.versionAtLeast self.ghc.version "9.0" then markBroken else lib.id) + ]; + + purescript-cst = super.purescript-cst.overrideScope purescriptOverlay; + + purescript-ast = super.purescript-ast.overrideScope purescriptOverlay; + + purenix = super.purenix.overrideScope purescriptOverlay; +}) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index fb99b68d2cda..ac63044275cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4096,8 +4096,7 @@ broken-packages: - purebred-email - pure-io - pure-priority-queue - - purescript-ast - - purescript-cst + - purenix - pure-zlib - pushbullet - pushbullet-types diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4cd168ced43f..646f51840593 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -223832,6 +223832,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ cdepillabout ]; + broken = true; }) {}; "purescheme-wai-routing-core" = callPackage @@ -223939,8 +223940,6 @@ self: { ]; description = "PureScript Programming Language Abstract Syntax Tree"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purescript-bridge" = callPackage @@ -223997,8 +223996,6 @@ self: { libraryToolDepends = [ happy ]; description = "PureScript Programming Language Concrete Syntax Tree"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "purescript-iso" = callPackage diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 83b154a191ae..0777b448d5b4 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -384,6 +384,12 @@ let purescript = [ compilerNames.ghc8107 ]; + purescript-cst = [ + compilerNames.ghc8107 + ]; + purescript-ast = [ + compilerNames.ghc8107 + ]; }) { mergeable = pkgs.releaseTools.aggregate { From 1e9aa74229641aff33afc30a5a436cd03a798bd9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 11:47:09 +0200 Subject: [PATCH 18/27] haskellPackages.pandoc-crossref: allow pandoc 2.19 Clean up override for broken & deprecated pandoc-citeproc. --- 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 9e6fdffe0f99..88802206e707 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1515,8 +1515,9 @@ self: super: { liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; Diff_0_3_4 = dontCheck super.Diff_0_3_4; - # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc - pandoc-citeproc = doJailbreak super.pandoc-citeproc; + # jailbreaking pandoc-crossref because it has not bumped its upper bound on pandoc + # https://github.com/lierdakil/pandoc-crossref/issues/350 + pandoc-crossref = doJailbreak super.pandoc-crossref; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; From 1eb05612d0b59eeb62b707f1d50a64f5f223e791 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 11:55:04 +0200 Subject: [PATCH 19/27] haskellPackages.servant-openapi3: disable false negative doctests --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 88802206e707..170d78a1d4a5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1677,6 +1677,10 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; + # Strange doctest problems + # https://github.com/biocad/servant-openapi3/issues/30 + servant-openapi3 = dontCheck super.servant-openapi3; + # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; From 9957da786e3cba723ef70f0cabcb12c280b717af Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 12:49:36 +0200 Subject: [PATCH 20/27] haskellPackages.hspec_2_10_0: provide correct dependency versions --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 170d78a1d4a5..785f2a6c1575 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1681,6 +1681,18 @@ self: super: { # https://github.com/biocad/servant-openapi3/issues/30 servant-openapi3 = dontCheck super.servant-openapi3; + # Give hspec 2.10.* correct dependency versions without overrideScope + hspec_2_10_0 = doDistribute (super.hspec_2_10_0.override { + hspec-discover = self.hspec-discover_2_10_0; + hspec-core = self.hspec-core_2_10_0; + }); + hspec-discover_2_10_0 = super.hspec-discover_2_10_0.override { + hspec-meta = self.hspec-meta_2_9_3; + }; + hspec-core_2_10_0 = super.hspec-core_2_10_0.override { + hspec-meta = self.hspec-meta_2_9_3; + }; + # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; From 56bbe95331f0a45ce2e1983f5a54115bac91f56c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 14:22:00 +0200 Subject: [PATCH 21/27] haskellPackages.sensei: break infinite recursion Not sure what exactly caused it, but we don't need to overrideScope anymore since hspec_2_10_0 works as is. Since it's usually a test dependency only we don't really risk inconsistent dependency errors if we are diligent. --- .../haskell-modules/configuration-common.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 785f2a6c1575..c6a4ae66a627 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -820,13 +820,12 @@ self: super: { sensei = overrideCabal (drv: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; - }) (super.sensei.overrideScope (self: super: { - hspec-meta = self.hspec-meta_2_9_3; + }) (super.sensei.override { hspec = self.hspec_2_10_0; - hspec-core = dontCheck self.hspec-core_2_10_0; - hspec-discover = self.hspec-discover_2_10_0; - shelly = dontCheck super.shelly; # disable checks, because the newer hspec in this overrideScope doesn‘t work with newest hspec-contrib - })); + hspec-wai = super.hspec-wai.override { + hspec = self.hspec_2_10_0; + }; + }); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; From ad720c33b51641debcb7a2d8a98d8af8d03de5c2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 19:20:59 +0200 Subject: [PATCH 22/27] haskellPackages.purescript-{c,a}st: broken for GHC >= 9.0 --- .../haskell-modules/configuration-common.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c6a4ae66a627..f707979b323b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2629,9 +2629,15 @@ in { (if lib.versionAtLeast self.ghc.version "9.0" then markBroken else lib.id) ]; - purescript-cst = super.purescript-cst.overrideScope purescriptOverlay; + purescript-cst = overrideCabal (_: { + # Doesn't support GHC >= 9.0, see purescript + broken = lib.versionAtLeast self.ghc.version "9.0"; + }) (super.purescript-cst.overrideScope purescriptOverlay); - purescript-ast = super.purescript-ast.overrideScope purescriptOverlay; + purescript-ast = overrideCabal (_: { + # Doesn't support GHC >= 9.0, see purescript + broken = lib.versionAtLeast self.ghc.version "9.0"; + }) (super.purescript-ast.overrideScope purescriptOverlay); purenix = super.purenix.overrideScope purescriptOverlay; }) From f5fee51df8c39592d1f73ce2aaf71d67c4494603 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 19:23:06 +0200 Subject: [PATCH 23/27] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh Note: bloodhound and pcre2 fail at the moment, but they should be fixed by the next Stackage / Hackage bump, so I am trying to save myself some hassle by leaving them marked incorrectly for a bit. --- .../configuration-hackage2nix/broken.yaml | 8 +++++- .../transitive-broken.yaml | 18 +++++-------- .../haskell-modules/hackage-packages.nix | 26 ++++++++++++------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ac63044275cc..9683ddb22b90 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -772,6 +772,10 @@ broken-packages: - complex-generic - composable-associations-aeson - compose-trans + - composite-cassava + - composite-dhall + - composite-ekg + - composite-lens-extra - composite-opaleye - composition-tree - comprehensions-ghc @@ -4095,8 +4099,8 @@ broken-packages: - Pup-Events-Server - purebred-email - pure-io - - pure-priority-queue - purenix + - pure-priority-queue - pure-zlib - pushbullet - pushbullet-types @@ -4596,6 +4600,7 @@ broken-packages: - signable-haskell-protoc - signed-multiset - simd + - simfin - simple-actors - simpleargs - simple-atom @@ -5076,6 +5081,7 @@ broken-packages: - text1 - text-and-plots - text-ascii + - text-builder-linear - text-containers - text-format - text-format-heavy diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index a764c828fb23..12450170b1ca 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1040,15 +1040,7 @@ dont-distribute-packages: - compdata-automata - compdata-dags - compdata-param - - compdoc - - compdoc-dhall-decoder - complexity - - composite-aeson-cofree-list - - composite-aeson-path - - composite-aeson-refined - - composite-aeson-throw - - composite-aeson-writeonly - - composite-swagger - compstrat - comptrans - computational-algebra @@ -1294,6 +1286,7 @@ dont-distribute-packages: - doc-review - dom-parser - dormouse-client + - dotparse - doublezip - dovetail - dovetail-aeson @@ -2620,7 +2613,7 @@ dont-distribute-packages: - list-witnesses - listenbrainz-client - liszt - - little-rio_1_0_0 + - little-rio_1_0_1 - live-sequencer - llvm - llvm-analysis @@ -3042,6 +3035,7 @@ dont-distribute-packages: - peparser - perdure - perf-analysis + - perf_0_10_0 - perfecthash - periodic-client - periodic-client-exe @@ -3189,6 +3183,7 @@ dont-distribute-packages: - protobuf-native - protocol-buffers-descriptor-fork - proton + - psc-ide - psql - ptera - ptera-core @@ -3200,8 +3195,8 @@ dont-distribute-packages: - puppetresources - pure-cdb - pure-priority-queue-tests - - purenix - purescript-iso + - purescript-tsd-gen - pursuit-client - push-notify - push-notify-apn @@ -3311,7 +3306,6 @@ dont-distribute-packages: - reduce-equations - refh - reflex-animation - - reflex-backend-socket - reflex-backend-wai - reflex-dom-colonnade - reflex-dynamic-containers @@ -3573,6 +3567,7 @@ dont-distribute-packages: - shapefile - shapely-data - shapes-demo + - sheets - shelduck - shellmate-extras - shine-varying @@ -4233,6 +4228,7 @@ dont-distribute-packages: - yuuko - z85 - zasni-gerna + - zephyr - zephyr-copilot - zeromq3-conduit - zeromq3-haskell diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 646f51840593..83530fcbb046 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62191,7 +62191,6 @@ self: { ]; description = "Parse a Pandoc to a composite value"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "compdoc-dhall-decoder" = callPackage @@ -62210,7 +62209,6 @@ self: { ]; description = "Allows you to write FromDhall instances for Compdoc"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "compendium-client" = callPackage @@ -62467,7 +62465,6 @@ self: { ]; description = "Print a Cofree [] as a JSON value"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-path" = callPackage @@ -62479,7 +62476,6 @@ self: { libraryHaskellDepends = [ base composite-aeson path ]; description = "Formatting data for the path library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-refined" = callPackage @@ -62495,7 +62491,6 @@ self: { ]; description = "composite-aeson support for Refined from the refined package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-throw" = callPackage @@ -62511,7 +62506,6 @@ self: { ]; description = "MonadThrow behaviour for composite-aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "composite-aeson-writeonly" = callPackage @@ -62526,7 +62520,6 @@ self: { ]; description = "WriteOnly indicators for composite-aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "composite-base" = callPackage @@ -62580,6 +62573,8 @@ self: { ]; description = "Csv parsing functionality for composite"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-dhall" = callPackage @@ -62596,6 +62591,8 @@ self: { ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-ekg" = callPackage @@ -62610,6 +62607,8 @@ self: { ]; description = "EKG Metrics for Vinyl records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-hashable" = callPackage @@ -62650,6 +62649,8 @@ self: { libraryHaskellDepends = [ base composite-base lens vinyl ]; description = "Extra lens functions for composite"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-opaleye" = callPackage @@ -62695,7 +62696,6 @@ self: { ]; description = "Swagger for Vinyl records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composite-tuple" = callPackage @@ -82828,6 +82828,7 @@ self: { ]; description = "dot language parsing and printing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "double-conversion" = callPackage @@ -222986,6 +222987,7 @@ self: { ]; description = "Language support for the PureScript programming language"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "pseudo-boolean" = callPackage @@ -224048,6 +224050,7 @@ self: { ]; description = "TypeScript Declaration File (.d.ts) generator for PureScript"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "pursuit-client" = callPackage @@ -230658,7 +230661,6 @@ self: { ]; description = "Reflex bindings for TCP sockets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflex-backend-wai" = callPackage @@ -249001,6 +249003,7 @@ self: { ]; description = "Spreadsheet type for composite"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shelduck" = callPackage @@ -250224,6 +250227,8 @@ self: { testHaskellDepends = [ aeson base tasty tasty-hunit text ]; description = "A library to fetch and parse financial data from the SimFin(+) API"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "simgi" = callPackage @@ -272904,6 +272909,8 @@ self: { benchmarkHaskellDepends = [ base tasty tasty-bench text ]; description = "Builder for Text based on linear types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-containers" = callPackage @@ -306104,6 +306111,7 @@ self: { testToolDepends = [ purescript ]; description = "Zephyr, tree-shaking for the PureScript language"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "zephyr-copilot" = callPackage From 09c8e8a3f11dafd9c4cf7d1e3d77ab1d2421db99 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Jun 2022 19:42:29 +0200 Subject: [PATCH 24/27] haskellPackages.purescript*: disable on hydra if broken To make this logic less cluttered, implement the broken/dontDistribute logic in a single function that can be reused for all purescript-related packages. --- .../haskell-modules/configuration-common.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f707979b323b..d852f058f233 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2610,6 +2610,12 @@ self: super: { # https://github.com/erikd/language-javascript/issues/131 language-javascript = self.language-javascript_0_7_0_0; }; + + # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) + purescriptBrokenFlag = drv: + if lib.versionAtLeast self.ghc.version "9.0" + then dontDistribute (markBroken drv) + else drv; in { purescript = lib.pipe @@ -2625,19 +2631,13 @@ in { doJailbreak # Generate shell completions (generateOptparseApplicativeCompletion "purs") - # Doesn't support GHC >= 9.0 (something related to instance resolution and TH) - (if lib.versionAtLeast self.ghc.version "9.0" then markBroken else lib.id) + + purescriptBrokenFlag ]; - purescript-cst = overrideCabal (_: { - # Doesn't support GHC >= 9.0, see purescript - broken = lib.versionAtLeast self.ghc.version "9.0"; - }) (super.purescript-cst.overrideScope purescriptOverlay); + purescript-cst = purescriptBrokenFlag (super.purescript-cst.overrideScope purescriptOverlay); - purescript-ast = overrideCabal (_: { - # Doesn't support GHC >= 9.0, see purescript - broken = lib.versionAtLeast self.ghc.version "9.0"; - }) (super.purescript-ast.overrideScope purescriptOverlay); + purescript-ast = purescriptBrokenFlag (super.purescript-ast.overrideScope purescriptOverlay); purenix = super.purenix.overrideScope purescriptOverlay; }) From cab946ac22cb44336ab0f2b5ed72f537ca3ebc84 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Jun 2022 23:22:57 +0200 Subject: [PATCH 25/27] lucid-htmx: jailbreak to fix build --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d852f058f233..e7dceb87370d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2596,6 +2596,18 @@ self: super: { }) ] super.fast-tags; + # lucid-htmx has restrictive upper bounds on lucid and servant: + # + # Setup: Encountered missing or private dependencies: + # lucid >=2.9.12.1 && <=2.11, servant >=0.18.3 && <0.19 + # + # Can be removed once + # + # > https://github.com/MonadicSystems/lucid-htmx/issues/6 + # + # has been resolved. + lucid-htmx = doJailbreak super.lucid-htmx; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9683ddb22b90..062e1bf820af 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3084,7 +3084,6 @@ broken-packages: - lua-bc - luautils - lucid2 - - lucid-htmx - lucid-hyperscript - luis-client - luka From 0e5d12d65c5cb5260c2f1b00d7bf90fba213cba2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 3 Jun 2022 15:45:04 +0200 Subject: [PATCH 26/27] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 2 ++ .../configuration-hackage2nix/transitive-broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 062e1bf820af..2eb715b9e0c6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -766,12 +766,14 @@ broken-packages: - compaREST - comparse - compdata + - compdoc - compendium-client - competition - compilation - complex-generic - composable-associations-aeson - compose-trans + - composite-aeson-path - composite-cassava - composite-dhall - composite-ekg diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 12450170b1ca..0b02a104030d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1040,6 +1040,7 @@ dont-distribute-packages: - compdata-automata - compdata-dags - compdata-param + - compdoc-dhall-decoder - complexity - compstrat - comptrans diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 83530fcbb046..1e8da83f8cef 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62191,6 +62191,8 @@ self: { ]; description = "Parse a Pandoc to a composite value"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "compdoc-dhall-decoder" = callPackage @@ -62209,6 +62211,7 @@ self: { ]; description = "Allows you to write FromDhall instances for Compdoc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "compendium-client" = callPackage @@ -62476,6 +62479,8 @@ self: { libraryHaskellDepends = [ base composite-aeson path ]; description = "Formatting data for the path library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "composite-aeson-refined" = callPackage @@ -176777,8 +176782,6 @@ self: { testHaskellDepends = [ base lucid servant text ]; description = "Use htmx in your lucid templates"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lucid-hyperscript" = callPackage From 2a2bb553e7ceee1325ff4323c7fb191b5222bcfe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Jun 2022 10:55:54 +0200 Subject: [PATCH 27/27] haskellPackages.{glade,webkitgtk3}: mark as broken These packages haven't been working for a while since they rely on deprecated / outdated libs and also no longer work with the Haskell gtk package we ship. Marking them as broken ensures that their reverse dependencies won't be attempted to build which declutters our build reports. --- .../configuration-hackage2nix/broken.yaml | 2 ++ .../configuration-hackage2nix/main.yaml | 4 ---- .../transitive-broken.yaml | 15 +++++++++++++++ .../haskell-modules/hackage-packages.nix | 14 ++++++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2eb715b9e0c6..e4491aca741a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1742,6 +1742,7 @@ broken-packages: - gitson - gitter - git-vogue + - glade - glapp - glaze - Gleam @@ -5563,6 +5564,7 @@ broken-packages: - webdriver - webdriver-snoy - web-encodings + - webkitgtk3 - WeberLogic - webex-teams-pipes - webfinger-client diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 9d4451fef68c..dece67d927df 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -612,12 +612,8 @@ dont-distribute-packages: - spike - web-browser-in-haskell - webkit - - webkitgtk3 - webkitgtk3-javascriptcore - websnap - # glade relies on system libglade which is deprecated - - glade - # mesos was removed from nixpkgs - hs-mesos diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 0b02a104030d..e44cbdc8571f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -142,6 +142,7 @@ dont-distribute-packages: - GrowlNotify - Gtk2hsGenerics - GtkGLTV + - GuiHaskell - GuiTV - H - HAppS-Data @@ -173,6 +174,7 @@ dont-distribute-packages: - HLearn-distributions - HNM - HPhone + - HPlot - HPong - HROOT - HROOT-core @@ -832,6 +834,7 @@ dont-distribute-packages: - blosum - bloxorz - blubber + - bluetile - blunt - bno055-haskell - bogre-banana @@ -1229,6 +1232,7 @@ dont-distribute-packages: - diagrams-pandoc - diagrams-reflex - diagrams-wx + - dialog - difference-monoid - differential - digestive-functors-hsp @@ -1594,6 +1598,7 @@ dont-distribute-packages: - ghc-tags-plugin - ghci-pretty - ghcjs-dom-hello + - ghcjs-dom-webkit - ghcjs-fetch - ghcjs-hplay - ghcprofview @@ -1617,6 +1622,7 @@ dont-distribute-packages: - gitlib-cross - gitlib-s3 - givegif + - gladexml-accessor - glazier - glazier-pipes - glazier-react @@ -1874,6 +1880,7 @@ dont-distribute-packages: - gstorable - gtfs - gtk-serialized-event + - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs - gtk2hs-cast-gtk - gtk2hs-cast-gtkglext @@ -2057,6 +2064,8 @@ dont-distribute-packages: - hbb - hbcd - hbf + - hbro + - hbro-contrib - hcg-minus-cairo - hcheat - hcheckers @@ -2251,6 +2260,7 @@ dont-distribute-packages: - hstar - hstox - hstradeking + - hstzaar - hsubconvert - hswip - hsx-jmacro @@ -2516,6 +2526,7 @@ dont-distribute-packages: - lambdaFeed - lambdaLit - lambdabot-zulip + - lambdacat - lambdacms-media - lambdacube - lambdacube-bullet @@ -2756,6 +2767,7 @@ dont-distribute-packages: - migrant-postgresql-simple - migrant-sqlite-simple - minecraft-data + - minesweeper - mini-egison - minilight-lua - minimung @@ -2950,6 +2962,7 @@ dont-distribute-packages: - nyan - nyan-interpolation - nyan-interpolation-simple + - nymphaea - oanda-rest-api - oath - obd @@ -3176,6 +3189,7 @@ dont-distribute-packages: - prolude - prometheus-effect - propane + - proplang - prosidyc - proteome - proto-lens-descriptors @@ -3573,6 +3587,7 @@ dont-distribute-packages: - shellmate-extras - shine-varying - short-vec-lens + - showdown - shpider - shuffle - si-clock diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1e8da83f8cef..135dd6ef28bd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7812,6 +7812,7 @@ self: { ]; description = "A graphical REPL and development environment for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "GuiTV" = callPackage @@ -9101,6 +9102,7 @@ self: { executablePkgconfigDepends = [ plplotd-gnome2 ]; description = "A minimal monadic PLplot interface for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {plplotd-gnome2 = null;}; "HPong" = callPackage @@ -45849,6 +45851,7 @@ self: { executablePkgconfigDepends = [ gtk2 ]; description = "full-featured tiling for the GNOME desktop environment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk2;}; "bluetileutils" = callPackage @@ -110763,6 +110766,7 @@ self: { description = "Binding to the glade library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs.gnome2) libglade;}; "gladexml-accessor" = callPackage @@ -110774,6 +110778,7 @@ self: { libraryHaskellDepends = [ base glade HaXml template-haskell ]; description = "Automagically declares getters for widget handles in specified interface file"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "glambda" = callPackage @@ -117711,6 +117716,7 @@ self: { ]; description = "A type class for cast functions of Gtk2hs: glade package"; license = "unknown"; + hydraPlatforms = lib.platforms.none; }) {}; "gtk2hs-cast-glib" = callPackage @@ -129222,6 +129228,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "hbro-contrib" = callPackage @@ -129257,6 +129264,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "hburg" = callPackage @@ -146351,6 +146359,7 @@ self: { ]; description = "A two player abstract strategy game"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsubconvert" = callPackage @@ -183766,6 +183775,7 @@ self: { ]; description = "Minesweeper game which is always solvable without guessing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "mini-egison" = callPackage @@ -199315,6 +199325,7 @@ self: { ]; description = "An interactive GUI for manipulating L-systems"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "nyx-game" = callPackage @@ -222155,6 +222166,7 @@ self: { libraryHaskellDepends = [ base glade glib gtk ]; description = "A library for functional GUI development"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "props" = callPackage @@ -249720,6 +249732,7 @@ self: { executableHaskellDepends = [ base glade gtk random ]; description = "A simple gtk based Russian Roulette game"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shower" = callPackage @@ -295537,6 +295550,7 @@ self: { description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3-javascriptcore" = callPackage