diff options
17 files changed, 1466 insertions, 556 deletions
diff --git a/lib/options.nix b/lib/options.nix index b069cfc7d4f0b..c80256c0e653b 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -123,7 +123,7 @@ rec { Example: mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc92.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/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 4843119805665..b7790c99a91e5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -2106,7 +2106,7 @@ Superuser created successfully. <literal>ghc810</literal>. Those attributes point to the same compilers and packagesets but have the advantage that e.g. <literal>ghc92</literal> stays stable when we update from - <literal>ghc924</literal> to <literal>ghc925</literal>. + <literal>ghc925</literal> to <literal>ghc926</literal>. </para> </listitem> </itemizedlist> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index bc3bd639b1ba2..5cb3731071f32 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -576,4 +576,4 @@ In addition to numerous new and upgraded packages, this release has the followin - More jdk and jre versions are now exposed via `java-packages.compiler`. -- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc924` to `ghc925`. +- The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc925` to `ghc926`. diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 07cd47d646a13..29dfcfc10cfb8 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8983027e744098e8a2fbeac09bcc6eb8a9471fff", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8983027e744098e8a2fbeac09bcc6eb8a9471fff.tar.gz", - "sha256": "1iqgakw71x8cymdifpqnv546wmmrda6w862axli4k03vj7rv91iw", - "msg": "Update from Hackage at 2022-10-27T19:26:33Z" + "commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz", + "sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm", + "msg": "Update from Hackage at 2022-11-03T21:09:38Z" } diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix new file mode 100644 index 0000000000000..b7798ad044aae --- /dev/null +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -0,0 +1,367 @@ +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.2.5"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0606797d1b38e2d88ee2243f38ec6b9a1aa93e9b578e95f0de9a9c0a4144021c"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # 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}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" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + echo -n "${buildMK}" > mk/build.mk + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix new file mode 100644 index 0000000000000..2b0f206a6fb04 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -0,0 +1,370 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.3"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "eaf63949536ede50ee39179f2299d5094eb9152d87cc6fb2175006bc98e8905a"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # 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}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" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + 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" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5e1600a73f9b5..1ca3c9efde942 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -158,7 +158,7 @@ assert !enableNativeBignum -> gmp != null; assert stdenv.hostPlatform == stdenv.targetPlatform || throw '' hadrian doesn't support building an installable GHC cross-compiler at the moment. - Consider using GHC 9.4.2 or lower which support this via the make build system. + Consider using GHC 9.4 or lower which support this via the make build system. See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090 ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad5ce6b7aea93..0c35d60f430ab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -106,7 +106,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 = "09ksaaf5kxpskq2hmi1ad35k15cnhn86j795iw6nk86gbvx5hrap"; + sha256 = "14391vj0awvkpsd32kanmc85yic5mg4pxmjhiv7wjxy7ga13wfqw"; # 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 @@ -123,6 +123,10 @@ self: super: { passthru.shellPath = "/bin/git-annex-shell"; }) super.git-annex; + # Too strict bounds on servant + # Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555 + arch-web = doJailbreak super.arch-web; + # Fix test trying to access /home directory shell-conduit = overrideCabal (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; @@ -1577,6 +1581,10 @@ self: super: { ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; }); + hledger_1_27_1 = doDistribute (super.hledger_1_27_1.override { + hledger-lib = self.hledger-lib_1_27_1; + }); + hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; @@ -1715,7 +1723,17 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; + hercules-ci-agent = lib.pipe super.hercules-ci-agent [ + (appendPatches [ + # https://github.com/hercules-ci/hercules-ci-agent/pull/446 + (fetchpatch { + url = "https://github.com/hercules-ci/hercules-ci-agent/commit/99afac77ddb84122a5321494a08e6fe2e95548a1.patch"; + sha256 = "sha256-0dtmNL1rqzeXvXWinfANc57a5LIM3uNnhR3A+p8mH0A="; + stripLen = 1; + }) + ]) + (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) + ]; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 @@ -2377,17 +2395,6 @@ self: super: { # https://github.com/kuribas/mfsolve/issues/8 mfsolve = dontCheck super.mfsolve; - # GHC 9 support https://github.com/lambdabot/dice/pull/2 - dice = appendPatch (fetchpatch { - name = "dice-ghc9.patch"; - url = "https://github.com/lambdabot/dice/commit/80d6fd443cb17b21d91b725f994ece6e8274e0a0.patch"; - excludes = [ ".gitignore" ]; - sha256 = "sha256-MtS1n7v5D6MRWWzzTyKl3Lqd/NhD1bV+g80wnhZ3P/Y="; - }) (overrideCabal (drv: { - revision = null; - editedCabalFile = null; - }) super.dice); - # GHC 9 support https://github.com/lambdabot/lambdabot/pull/204 lambdabot-core = appendPatch ./patches/lambdabot-core-ghc9.patch (overrideCabal (drv: { revision = null; @@ -2559,9 +2566,6 @@ self: super: { testTarget = "regex-tdfa-unittest"; } super.regex-tdfa; - # Missing test files https://github.com/qrilka/xlsx/issues/165 - xlsx = dontCheck super.xlsx; - # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1 xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant; @@ -2635,4 +2639,13 @@ in { # 2022-10-04: Needs newer tasty-dejafu than (currently) in stackage rec-def = super.rec-def.override { tasty-dejafu = self.tasty-dejafu_2_1_0_0; }; + + # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3 + tzdata = dontCheck super.tzdata; + + # 2022-11-04: The situation around heist-emanote is quite terrible. + # It‘s simply a heist fork because heist is unmaintained. + # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 + heist-emanote = doJailbreak (dontCheck super.heist-emanote); + }) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 2b0bb3876b2a9..420c80404ed29 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -61,13 +61,6 @@ in { # 0.30 introduced support for GHC 9.2. cryptonite = doDistribute self.cryptonite_0_30; - cabal2nix = - # cabal2nix depends on foundation, which is broken on aarch64-linux. - # https://github.com/haskell-foundation/foundation/issues/571 - overrideCabal - (drv: { badPlatforms = [ "aarch64-linux" ]; }) - super.cabal2nix; - doctest = self.doctest_0_20_1; # consequences of doctest breakage follow: @@ -78,8 +71,6 @@ in { lucid = jailbreakForCurrentVersion super.lucid "2.11.1"; invariant = jailbreakForCurrentVersion super.invariant "0.5.6"; implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0"; - # https://github.com/co-log/co-log-core/pull/22#issuecomment-1294040208 - co-log-core = jailbreakForCurrentVersion super.co-log-core "0.3.1.0"; haskell-src-meta = doJailbreak super.haskell-src-meta; @@ -206,6 +197,11 @@ in { # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 ghc-check = dontHaddock super.ghc-check; + # 2022-11-06: Override override from common, because Cabal-syntax is included since ghc 9.4. + implicit-hie = super.implicit-hie.override { + Cabal-syntax = null; + }; + # 2022-10-06: plugins disabled for hls 1.8.0.0 based on # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers haskell-language-server = super.haskell-language-server.override { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7610a82814dcc..2e16c45b37e65 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2137,7 +2137,6 @@ broken-packages: - heidi - hein - heist-async - - heist-emanote - helisp - helix - hell @@ -3777,7 +3776,6 @@ broken-packages: - pasta - pastis - pasty - - patat - patches-vector - Pathfinder - pathfindingcore @@ -5027,7 +5025,6 @@ broken-packages: - tagsoup-selection - tai - tai64 - - tailwind - tak - takahashi - Takusen diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 51e58be7f3d7d..df8fbf82107ca 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -290,6 +290,7 @@ package-maintainers: maralorn: - cabal-fmt - ema + - emanote - generic-optics - ghcid - ghcide @@ -454,6 +455,7 @@ unsupported-platforms: FTGL: [ platforms.darwin ] fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 ghcjs-dom-hello: [ platforms.darwin ] + ghc-gc-hook: [ platforms.darwin ] # requires C11 threads which Apple doesn't support gi-adwaita: [ platforms.darwin ] gi-dbusmenugtk3: [ platforms.darwin ] gi-dbusmenu: [ platforms.darwin ] @@ -520,6 +522,7 @@ unsupported-platforms: sensei: [ platforms.darwin ] synthesizer-alsa: [ platforms.darwin ] taffybar: [ platforms.darwin ] + emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 termonad: [ platforms.darwin ] tokyotyrant-haskell: [ platforms.darwin ] Unixutils-shadow: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index b210c51483bf6..b1c215ade1c69 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.30 +# Stackage LTS 19.31 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -359,7 +359,7 @@ default-package-overrides: - code-conjure ==0.5.2 - code-page ==0.2.1 - coercible-utils ==0.1.0 - - cointracking-imports ==0.1.0.1 + - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 - colonnade ==1.2.0.2 - Color ==0.3.3 @@ -729,7 +729,7 @@ default-package-overrides: - fast-builder ==0.1.3.0 - fast-logger ==3.1.1 - fast-math ==1.0.2 - - fastmemo ==0.1.0.1 + - fastmemo ==0.1.1 - fclabels ==2.0.5.1 - feature-flags ==0.1.0.1 - fedora-dists ==2.0.0 @@ -914,7 +914,7 @@ default-package-overrides: - gi-javascriptcore ==4.0.25 - ginger ==0.10.4.0 - gi-pango ==1.0.27 - - githash ==0.1.6.2 + - githash ==0.1.6.3 - github ==0.27 - github-release ==2.0.0.2 - github-rest ==1.1.2 @@ -946,7 +946,7 @@ default-package-overrides: - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - graphs ==0.7.2 - - graphula ==2.0.2.1 + - graphula ==2.0.2.2 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.1 @@ -992,8 +992,8 @@ default-package-overrides: - hashtables ==1.2.4.2 - haskeline ==0.8.2 - haskell-awk ==1.2.0.1 - - haskell-gi ==0.26.1 - - haskell-gi-base ==0.26.2 + - haskell-gi ==0.26.2 + - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1 - haskell-lsp-types ==0.24.0.0 @@ -1221,7 +1221,7 @@ default-package-overrides: - hworker ==0.1.0.1 - hw-packed-vector ==0.2.1.1 - hw-parser ==0.1.1.0 - - hw-prim ==0.6.3.1 + - hw-prim ==0.6.3.2 - hw-rankselect ==0.13.4.1 - hw-rankselect-base ==0.3.4.1 - hw-simd ==0.1.2.1 @@ -1548,7 +1548,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.1.2.2 - model ==0.5 - - modern-uri ==0.3.5.0 + - modern-uri ==0.3.6.0 - modular ==0.1.0.8 - monad-chronicle ==1.0.1 - monad-control ==1.0.3.1 @@ -1578,7 +1578,7 @@ default-package-overrides: - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - - mongoDB ==2.7.1.1 + - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.3.0 - monoid-extras ==0.6.1 - monoid-subclasses ==1.1.3 @@ -1878,13 +1878,13 @@ default-package-overrides: - postgresql-orm ==0.5.1 - postgresql-query ==3.9.0 - postgresql-schema ==0.1.14 - - postgresql-simple ==0.6.4 + - postgresql-simple ==0.6.5 - postgresql-simple-url ==0.2.1.0 - postgresql-syntax ==0.4.1 - postgresql-typed ==0.6.2.1 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - - pqueue ==1.4.2.0 + - pqueue ==1.4.3.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.3 @@ -2088,7 +2088,7 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.9 + - rpmbuild-order ==0.4.10 - rpm-nvr ==0.1.2 - rp-tree ==0.7.1 - RSA ==2.4.1 @@ -2121,8 +2121,8 @@ default-package-overrides: - say ==0.1.0.1 - sbp ==4.1.6 - sbv ==8.17 - - scalpel ==0.6.2 - - scalpel-core ==0.6.2 + - scalpel ==0.6.2.1 + - scalpel-core ==0.6.2.1 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==2.0.0.1 @@ -2156,7 +2156,7 @@ default-package-overrides: - sequenceTools ==1.5.2 - serf ==0.1.1.0 - serialise ==0.2.6.0 - - servant ==0.19 + - servant ==0.19.1 - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.0 - servant-auth-docs ==0.2.10.0 @@ -2184,7 +2184,7 @@ default-package-overrides: - servant-pipes ==0.15.3 - servant-rawm ==1.0.0.0 - servant-ruby ==0.9.0.0 - - servant-server ==0.19.1 + - servant-server ==0.19.2 - servant-static-th ==1.0.0.0 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.1.11 @@ -2342,7 +2342,7 @@ default-package-overrides: - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.4 - streaming-cassava ==0.2.0.0 - - streaming-commons ==0.2.2.4 + - streaming-commons ==0.2.2.5 - streamly ==0.8.1.1 - streamly-bytestring ==0.1.4 - streams ==3.3 @@ -2379,7 +2379,7 @@ default-package-overrides: - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - - swagger2 ==2.8.5 + - swagger2 ==2.8.6 - swish ==0.10.2.0 - syb ==0.7.2.2 - sydtest-discover ==0.0.0.2 @@ -2595,7 +2595,7 @@ default-package-overrides: - type-spec ==0.4.0.0 - typography-geometry ==1.0.1.0 - tz ==0.1.3.6 - - tzdata ==0.2.20221011.0 + - tzdata ==0.2.20221028.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.4 @@ -2634,7 +2634,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.8 - unix-compat ==0.5.4 - unix-time ==0.4.8 - - unliftio ==0.2.22.0 + - unliftio ==0.2.23.0 - unliftio-core ==0.2.0.1 - unliftio-path ==0.0.2.0 - unliftio-pool ==0.2.2.0 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e30a5aa17c4ed..8f9e6d0ce1855 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1102,6 +1102,20 @@ self: super: builtins.intersectAttrs super { broken = false; }) super.cabal-install; + tailwind = addBuildDepend + # Overrides for tailwindcss copied from: + # https://github.com/EmaApps/emanote/blob/master/nix/tailwind.nix + (pkgs.nodePackages.tailwindcss.overrideAttrs (oa: { + plugins = [ + pkgs.nodePackages."@tailwindcss/aspect-ratio" + pkgs.nodePackages."@tailwindcss/forms" + pkgs.nodePackages."@tailwindcss/line-clamp" + pkgs.nodePackages."@tailwindcss/typography" + ]; + })) super.tailwind; + + emanote = addBuildDepend pkgs.stork super.emanote; + keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; # ghcide-bench tests need network diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8e0ca37c4a2ae..3f356eefb8344 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -14281,8 +14281,8 @@ self: { ({ mkDerivation, base, doctest, hspec, process, time }: mkDerivation { pname = "Monadoro"; - version = "0.3.3.0"; - sha256 = "1zya572cc0gml4k9mm2g9z5bakjzz6ivigdc9fpv2bsrnc58a4y4"; + version = "0.3.5.0"; + sha256 = "1gj6s043241wcdx5wbc6jdihnlrcrdzxjr60g7i13k6himhbx739"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -19832,6 +19832,8 @@ self: { pname = "Spock-core"; version = "0.14.0.1"; sha256 = "0a93v9pxbvd9qqpx9rnv6gqpc5y8xh5dkfi0lkc566pj9cv8bpad"; + revision = "1"; + editedCabalFile = "1kxi4bigll1gn9rcp8x3h4waycihycvh6bhvfjzxdyzhm3ifq48a"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie hashable http-api-data http-types hvect mmorph monad-control @@ -48323,15 +48325,17 @@ self: { }) {}; "breakpoint" = callPackage - ({ mkDerivation, base, containers, ghc, haskeline, mtl, tasty - , tasty-hunit, transformers + ({ mkDerivation, ansi-terminal, base, containers, ghc, haskeline + , mtl, pretty-simple, tasty, tasty-hunit, template-haskell, text + , transformers }: mkDerivation { pname = "breakpoint"; - version = "0.1.0.0"; - sha256 = "11b2wbm8fm1zwz81hx1l3c559ad7y50d0838n94lkm1vsa39hpk7"; + version = "0.1.1.1"; + sha256 = "1hyfsn4wgiz2zzlihncq9lj18k7nzd4wq2z53xbnp1palspjqjp2"; libraryHaskellDepends = [ - base containers ghc haskeline mtl transformers + ansi-terminal base containers ghc haskeline mtl pretty-simple + template-haskell text transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit ]; description = "Set breakpoints using a GHC plugin"; @@ -49615,8 +49619,8 @@ self: { pname = "bugzilla-redhat"; version = "1.0.0"; sha256 = "1g95j03y2sg1fwdf48a05nijqllkd0m7scn1wbfyzvb57q716hlx"; - revision = "3"; - editedCabalFile = "1f5mbfskr7h14ywg3v23x3r7d0k80z4ksflvqsbzkb2z3nqikj4a"; + revision = "5"; + editedCabalFile = "13fmsnvjgg2hh5hqr5mvyykafpf770lrwiq7g67i75w6594nippn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50219,8 +50223,8 @@ self: { }: mkDerivation { pname = "by-other-names"; - version = "1.2.0.1"; - sha256 = "0lmk2nbj92kyi1h74v3f4k5zhf41zbnz8pari1rqxlf7a859c7k9"; + version = "1.2.1.0"; + sha256 = "1l6b47qxr8hidknl2r7gwp9civlz450z4nxyv98nfkh86bhsdnfm"; libraryHaskellDepends = [ aeson base indexed-traversable template-haskell text ]; @@ -51793,8 +51797,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-detailed-quickcheck"; - version = "0.1.3.2"; - sha256 = "0pxl8jf8ak9irln9vkkhb5mrbvq62c9p71gxhwzml1042gbl93x9"; + version = "0.2.0.1"; + sha256 = "0z82ira6g3mkqj9cw050s4m4nk2n5d4zx6gqlrcgszypd80h03f2"; libraryHaskellDepends = [ base Cabal QuickCheck ]; description = "QuickCheck for Cabal tests"; license = lib.licenses.mit; @@ -53811,22 +53815,23 @@ self: { broken = true; }) {}; - "call-alloy_0_4" = callPackage + "call-alloy_0_4_0_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory - , extra, filepath, hspec, mtl, process, split, trifecta, unix + , extra, filepath, hspec, mtl, process, split, transformers + , trifecta, unix }: mkDerivation { pname = "call-alloy"; - version = "0.4"; - sha256 = "1af4a6inik3dcawn4lwlk01pyx6j5a1ly07qqf0ywkz2pv4ifgdc"; + version = "0.4.0.1"; + sha256 = "0xxrin8n2kk37jip5hacyn87sxhwz4bjk6crd90yw8f1sg8n354m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base bytestring containers directory extra filepath mtl - process split trifecta unix + process split transformers trifecta unix ]; testHaskellDepends = [ async base bytestring containers directory extra filepath hspec mtl - process split trifecta unix + process split transformers trifecta unix ]; description = "A simple library to call Alloy given a specification"; license = lib.licenses.mit; @@ -56544,8 +56549,8 @@ self: { }: mkDerivation { pname = "cfn-flip"; - version = "0.1.0.2"; - sha256 = "16n45ik3g33fqfqry7l8pa0gcljymvw9wkg9n3qal8570q5k82ds"; + version = "0.1.0.3"; + sha256 = "18nfqbc0iw5zvg9krrm8wyi6x34qxf7arp4jzf1l8qabds5s5371"; libraryHaskellDepends = [ aeson base bytestring conduit libyaml text unliftio unliftio-core yaml @@ -58130,10 +58135,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.1.4"; - sha256 = "1v7h0qlckliid2zd3ff2l9l4xrdxacaw8my8bjj8grysj4vvyn5q"; - revision = "2"; - editedCabalFile = "0ixc0ng425lgsrj95zfnm2jazk19b8py845s3b02dfz7zid9q7n5"; + version = "1.1.5"; + sha256 = "0q81i9zwhsmik3j0zlgf61y48s4zhqs4d77ad4yxwvqqm8312gqi"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -61581,26 +61584,26 @@ self: { "co-log" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos - , co-log-core, containers, contravariant, directory, filepath - , hedgehog, markdown-unlit, mtl, stm, text, transformers - , typerep-map, vector + , co-log-core, containers, contravariant, directory, doctest + , exceptions, filepath, Glob, hedgehog, markdown-unlit, mtl, text + , transformers, typerep-map, vector }: mkDerivation { pname = "co-log"; - version = "0.4.0.1"; - sha256 = "08sqrsy55wrfc5bg5sz22hah0ix14wrxn20lka17ri17a818w9p7"; + version = "0.5.0.0"; + sha256 = "1afzqh3kncmlxjdsw6v0pwb24mlfa492jdryn8pr00pskrmcr8mg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring chronos co-log-core containers - contravariant directory filepath mtl stm text transformers + contravariant directory exceptions filepath mtl text transformers typerep-map vector ]; executableHaskellDepends = [ base bytestring co-log-core mtl text typerep-map ]; executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base co-log-core hedgehog ]; + testHaskellDepends = [ base co-log-core doctest Glob hedgehog ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; }) {}; @@ -61622,8 +61625,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.1.0"; - sha256 = "1v0pccm2wmvlb21g8l47qmnl7839lj2rkf17bvrqj36xa7p0nwi9"; + version = "0.3.2.0"; + sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -62391,10 +62394,8 @@ self: { }: mkDerivation { pname = "cointracking-imports"; - version = "0.1.0.1"; - sha256 = "19in8n8sigcbph29cgrbg1ccbxzadav1siryfjfc1g112p6mrf91"; - revision = "1"; - editedCabalFile = "1pcqkp1fvnwv5f4r88nva0dafgzfk2vixa5wh2q42991aj38a539"; + version = "0.1.0.2"; + sha256 = "1jf95fgzgqgr2xjbm5i0cwj1zx7zd44qpv3xqy91pk5kp33gwdjr"; libraryHaskellDepends = [ base base-compat-batteries bytestring cassava filepath lens scientific text time xlsx @@ -78471,8 +78472,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.3.5"; - sha256 = "16v61sm8vqx7wi02z68qjsvfv76g8kbag9cc8j8i0k8ixya1hddb"; + version = "0.2.3.6"; + sha256 = "1xx36h6xjpalf7xzina6yy155rhjq9iziv3gy7i3l163hcpf4l1q"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -80778,18 +80779,17 @@ self: { }) {}; "dice" = callPackage - ({ mkDerivation, base, parsec, random-fu, transformers }: + ({ mkDerivation, base, mtl, parsec, random, random-fu }: mkDerivation { pname = "dice"; - version = "0.1.0.1"; - sha256 = "1jybckq3wf3vs0d92ji6a6mlgw64afhwdr6b0w2p1d97zp2fsdn3"; - revision = "1"; - editedCabalFile = "160n5nn39in0hz60hddwds1a2z8gwk3r1llzjaj2278phig3ap7k"; + version = "0.1.1"; + sha256 = "1y4184xicjwp29cyriq3qcr066167nwfy0720dmxjbgw795jxpsb"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base parsec random-fu transformers ]; + libraryHaskellDepends = [ base mtl parsec random random-fu ]; + executableHaskellDepends = [ base mtl parsec random random-fu ]; description = "Simplistic D&D style dice-rolling system"; - license = lib.licenses.publicDomain; + license = lib.licenses.unlicense; mainProgram = "dice"; }) {}; @@ -83733,17 +83733,20 @@ self: { }) {}; "dns-patterns" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, HUnit + ({ mkDerivation, attoparsec, base, bytestring, criterion, HUnit , parser-combinators, text }: mkDerivation { pname = "dns-patterns"; - version = "0.2.2"; - sha256 = "02baslcbwf28lybqa5m5n05fsi182hpqzsrb4wfgj8gll0hm80n6"; + version = "0.2.3"; + sha256 = "0vs3qn4pdpk13imxp8pz106ra504jwx629h62vv9z5nnjwq81d6y"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; testHaskellDepends = [ attoparsec base bytestring HUnit text ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -90446,6 +90449,60 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "emanote" = callPackage + ({ mkDerivation, aeson, aeson-extra, aeson-optics, async, base + , blaze-html, bytestring, commonmark, commonmark-extensions + , commonmark-pandoc, commonmark-simple, containers, data-default + , dependent-sum, directory, ema, filepath, filepattern, fsnotify + , hedgehog, heist-emanote, heist-extra, hspec, hspec-hedgehog + , ixset-typed, lvar, map-syntax, megaparsec, monad-logger + , monad-logger-extras, mtl, neat-interpolation, optics-core + , optics-th, optparse-applicative, pandoc, pandoc-link-context + , pandoc-types, parsec, path-tree, process-extras, profunctors + , relude, shower, some, stm, tagged, tagtree, tailwind, text, time + , tomland, unionmount, unliftio, unordered-containers, uri-encode + , url-slug, uuid, which, with-utf8, xmlhtml, yaml + }: + mkDerivation { + pname = "emanote"; + version = "0.8.0.0"; + sha256 = "0w26417vx76lzi6b84c48s462bmsy28ayn8gxi9cpgqifrmydz78"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-extra aeson-optics async base blaze-html bytestring + commonmark commonmark-extensions commonmark-pandoc + commonmark-simple containers data-default dependent-sum directory + ema filepath filepattern fsnotify hedgehog heist-emanote + heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + megaparsec monad-logger monad-logger-extras mtl neat-interpolation + optics-core optics-th optparse-applicative pandoc + pandoc-link-context pandoc-types parsec path-tree process-extras + profunctors relude shower some stm tagged tagtree tailwind text + time tomland unionmount unliftio unordered-containers uri-encode + url-slug uuid which with-utf8 xmlhtml yaml + ]; + executableHaskellDepends = [ + aeson aeson-extra aeson-optics async base blaze-html bytestring + commonmark commonmark-extensions commonmark-pandoc + commonmark-simple containers data-default dependent-sum directory + ema filepath filepattern fsnotify hedgehog heist-emanote + heist-extra hspec hspec-hedgehog ixset-typed lvar map-syntax + megaparsec monad-logger monad-logger-extras mtl neat-interpolation + optics-core optics-th optparse-applicative pandoc + pandoc-link-context pandoc-types parsec path-tree process-extras + profunctors relude shower some stm tagged tagtree tailwind text + time tomland unionmount unliftio unordered-containers uri-encode + url-slug uuid which with-utf8 xmlhtml yaml + ]; + description = "Emanate a structured view of your plain-text notes"; + license = lib.licenses.agpl3Only; + badPlatforms = [ "x86_64-darwin" ]; + mainProgram = "emanote"; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "embed-config" = callPackage ({ mkDerivation, aeson, base, bytestring, file-embed, hspec , template-haskell, yaml @@ -92195,6 +92252,33 @@ self: { broken = true; }) {}; + "ersatz_0_4_13" = 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.13"; + sha256 = "0ph2ayw4vb4rrgfmm8dhwr18172igx2sczjhv2vf3b6vd5r0z1hy"; + 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-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -96454,21 +96538,6 @@ self: { }) {}; "fastmemo" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, utf8-string, vector - }: - mkDerivation { - pname = "fastmemo"; - version = "0.1.0.1"; - sha256 = "1zb8nav58svds0c88rkrwdw5cjj2a8qlgx5rypqjrdv6w85s13vi"; - libraryHaskellDepends = [ base bytestring utf8-string vector ]; - testHaskellDepends = [ - base bytestring QuickCheck utf8-string vector - ]; - description = "Memoize functions on Generic types"; - license = lib.licenses.bsd3; - }) {}; - - "fastmemo_0_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , utf8-string, vector }: @@ -96484,7 +96553,6 @@ self: { ]; description = "Memoize functions on Generic types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fastparser" = callPackage @@ -105354,8 +105422,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.22.2"; - sha256 = "027w745vs121jsah29kqgw288s40ag25jszbf0sb2dh1xb30lvpw"; + version = "0.22.3"; + sha256 = "1si1hlax2vzaqcdprvgg8bcmk1xkwny5rb30fc3n8h0i0fpdmbic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107418,8 +107486,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; - revision = "1"; - editedCabalFile = "17dfarnbv6si8rgajb3jqsbc4k1nxmvga2h1lhmpnq43n2fdkqkq"; + revision = "2"; + editedCabalFile = "0p3hk9c6qn5kbgi3a4my3rq5cc43wcl93hx6axgzi5wkvimpv653"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -109073,8 +109141,8 @@ self: { }: mkDerivation { pname = "gerrit"; - version = "0.1.5.1"; - sha256 = "1bj34cp9myz4rrbbwbh73b8wbmrgck81nsx88mi984pww1nd5fnb"; + version = "0.1.6.0"; + sha256 = "1fxbvi8a6vnry170ahphkpij5slfdwpd6hkypp069y5h1sh3k2kp"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-openssl text time @@ -109729,6 +109797,27 @@ self: { mainProgram = "ghc-events"; }) {}; + "ghc-events_0_18_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.18.0"; + sha256 = "0kwml9dgbj0px4bc3d9kqmw2ijc3y7irs4n02nzm7ilgcvy7hv6h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base bytestring containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-events"; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -109844,6 +109933,7 @@ self: { testHaskellDepends = [ base clock ]; description = "GHC garbage collection hook"; license = lib.licenses.bsd3; + badPlatforms = lib.platforms.darwin; }) {}; "ghc-gc-tune" = callPackage @@ -113435,8 +113525,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20221003"; - sha256 = "0nyhmwkzd8gyd9mvlnjyalfix32x5y4g89d5g36jp3jp1bkwg9i4"; + version = "10.20221103"; + sha256 = "0fwg74ldw2paq9dr052hqjz2x219zkkramvm8jskpnnnch9c6jgm"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -113954,26 +114044,6 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.6.2"; - sha256 = "1vkwc7j71vdrxy01vlm6xfp16kam7m9bnj9y3h217fzhq5mjywhz"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - th-compat - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary th-compat unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = lib.licenses.bsd3; - }) {}; - - "githash_0_1_6_3" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, th-compat, unliftio - }: - mkDerivation { - pname = "githash"; version = "0.1.6.3"; sha256 = "06zg1rif1rcxni1vacmr2bh1nbm6i62rjbikfr4xsyzq1sv7kfpw"; libraryHaskellDepends = [ @@ -113986,7 +114056,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "github" = callPackage @@ -118855,8 +118924,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.5.2"; - sha256 = "0wxgwgsybc9vp4v4vx6064zh27kc3gn6rfclgpfavgvk3l9y5mrq"; + version = "0.6.6.0"; + sha256 = "1pc89l3kirw7d8bzzbsivnf2mcfd15bk3kl1x2f7i0fdgk06apzy"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -120296,30 +120365,6 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.2.1"; - sha256 = "0kkjhfb9x3s0j6m0a68cblfkh70wg2vxrd1f998g20dlpx5rl27m"; - libraryHaskellDepends = [ - base containers directory generics-eot HUnit mtl persistent - QuickCheck random semigroups temporary text unliftio unliftio-core - ]; - testHaskellDepends = [ - base generic-arbitrary hspec markdown-unlit monad-logger persistent - persistent-sqlite QuickCheck resourcet transformers unliftio-core - ]; - testToolDepends = [ markdown-unlit ]; - description = "A simple interface for generating persistent data and linking its dependencies"; - license = lib.licenses.mit; - }) {}; - - "graphula_2_0_2_2" = callPackage - ({ mkDerivation, base, containers, directory, generic-arbitrary - , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl - , persistent, persistent-sqlite, QuickCheck, random, resourcet - , semigroups, temporary, text, transformers, unliftio - , unliftio-core - }: - mkDerivation { - pname = "graphula"; version = "2.0.2.2"; sha256 = "066lcn262x4l826sglybrz4mp58ishcj0h1r5h41aiy09mcf4g3v"; libraryHaskellDepends = [ @@ -120333,7 +120378,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A simple interface for generating persistent data and linking its dependencies"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "graphula-core" = callPackage @@ -122298,18 +122342,24 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11 }: + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi + , libXinerama, libXrandr + }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.1"; - sha256 = "1bb0g8gn08pp2s763d0ic7hj46whpb6xdq0hvpar26srxlkxnzjl"; + version = "4.5.0.2"; + sha256 = "0yxjr2y12fj2mhis8gy3wz0115nbiznx6llxapbylcw4zx9vnb8i"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ c libGL libX11 ]; + librarySystemDepends = [ + c libGL libX11 libXcursor libXi libXinerama libXrandr + ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;}; + }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; "h-reversi" = callPackage ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck @@ -124672,8 +124722,8 @@ self: { pname = "hakyll"; version = "4.15.1.1"; sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; - revision = "7"; - editedCabalFile = "0xgcrv98yxf7hjwq2ivg1lcipr3q5f5civp5r6kaq7ygnhggy2w9"; + revision = "8"; + editedCabalFile = "0mrgi1xjmvbjqasrchmjylp4gc63gw879flwl6r1v3nf9nv7ziwf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -128754,28 +128804,6 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.1"; - sha256 = "0272rsfhl9inrhkl0r2n5af327rk7dcy2fw77b196q8lvh2ym4c9"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_2" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; version = "0.26.2"; sha256 = "05r84czb05n69g7p7jazljh95yzdh2lpzgjjypgpg75mh83igr2w"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -128788,32 +128816,18 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.26.2"; - sha256 = "1jlc8hwpg2mbhmv6ra8b2dsf1wqsfn0hrphikrbgvbcls2wd6xw0"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_26_3" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; version = "0.26.3"; sha256 = "1n0pgyd5gm4lic3c48cvl10chk15jdd1d381f3fcizp61rhslvfs"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -135811,8 +135825,6 @@ self: { ]; description = "An Haskell template system supporting both HTML5 and XML"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "heist-extra" = callPackage @@ -143780,8 +143792,8 @@ self: { }: mkDerivation { pname = "honeycomb"; - version = "0.0.0.3"; - sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; + version = "0.1.0.0"; + sha256 = "04fv5zy7vyridxa8qkrawjp8sjhdzd57cyxm2gi4r7gv1q4pwlmc"; libraryHaskellDepends = [ aeson async auto-update base bytestring chronos http-client http-client-tls http-conduit http-types microlens mmorph @@ -146810,8 +146822,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-exporter-otlp"; - version = "0.0.1.3"; - sha256 = "0ci1c6820cq2xml5fdj04a49r78ymw0s7pdlyhkg7a0ccrxi3722"; + version = "0.0.1.4"; + sha256 = "08xjpv451mfx4gfahp6w8m49da9mzvcj59g9fq6p0k85fl9ybva2"; libraryHaskellDepends = [ base bytestring case-insensitive clock hs-opentelemetry-api hs-opentelemetry-otlp http-client http-conduit http-types microlens @@ -147019,8 +147031,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.3.3"; - sha256 = "1721786554sb0jwa8mmkcrlwci1i49mgwpaxa8xaiilw6nddmc8a"; + version = "0.0.3.4"; + sha256 = "1niyachyzj1742y8p89p2n088vs6pwplh1swjwcnri7545ldch70"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c @@ -154914,8 +154926,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "2.2.0.0"; - sha256 = "1dpmy6j8alg55x5s6rapc3cbmf2v23dwbx1hv3k6jsxz2zp3w7gp"; + version = "2.3.0.0"; + sha256 = "1kmgakji3mp3d1i1jm6w5yh412ajd42klikcz0q8f4q75zprmb6i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156042,10 +156054,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.3.1"; - sha256 = "1b3qk0w8jivbhpkxkp4b1spj1nvfjjf2k6a0ba9agjp9kjmwddni"; - revision = "3"; - editedCabalFile = "0ik3y030s6izrgvsvk7llgy8z5wkvgapii1zcrdsw25m1cqjpaz1"; + version = "0.6.3.2"; + sha256 = "07a442g1fjzrfnz3y9mx3d2hv0ffjnbfdkmbiard8bn78vf5z80z"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap transformers unliftio-core vector @@ -167956,8 +167966,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.2.0.1"; - sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi"; + version = "0.2.0.2"; + sha256 = "1kr59d21825mrfr9370f4z717gf45rcdp8jw7xw3d4mp7ba6r66b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170997,6 +171007,39 @@ self: { broken = true; }) {}; + "krank_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, process, PyF + , req, safe-exceptions, text, unordered-containers + }: + mkDerivation { + pname = "krank"; + version = "0.3.0"; + sha256 = "01ncfknvm4mndzam3q9m15p51cz8cwjds12zc74rl1p49rdp5pis"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers + ]; + executableHaskellDepends = [ + base containers mtl optparse-applicative pcre-heavy pretty-terminal + process PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers + ]; + description = "Krank checks issue tracker link status in your source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "krank"; + broken = true; + }) {}; + "krapsh" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring , binary, bytestring, containers, cryptohash-sha256, deepseq @@ -173819,16 +173862,15 @@ self: { }) {}; "language-sygus" = callPackage - ({ mkDerivation, array, base, deepseq, hashable, tasty, tasty-hunit - , text + ({ mkDerivation, alex, array, base, deepseq, happy, hashable, tasty + , tasty-hunit, text }: mkDerivation { pname = "language-sygus"; - version = "0.1.1.2"; - sha256 = "1vgd45bd866mm2w80hg8q11iz8g9ifz5ccm0sh13xrnpvfvdv862"; - revision = "3"; - editedCabalFile = "0rnvxvyiw765vmnbmix4g5v3wqp9ba3xd8llm1ajdm01rvhk4324"; + version = "0.1.1.3"; + sha256 = "15xxagcsqjchng2nr1qg6ncqch5l74m62iv58pgkcqhzqqhf3fwg"; libraryHaskellDepends = [ array base hashable text ]; + libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base deepseq tasty tasty-hunit text ]; description = "A parser and printer for the SyGuS 2.0 language."; license = lib.licenses.bsd3; @@ -185954,8 +185996,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.5"; - sha256 = "1jqa471r7r3my32lrjcrfc35259kj7afp1jgj8jr3r62dd8ckq63"; + version = "0.2.10"; + sha256 = "1p1n21hzmkk7czwnmyl4hm36jvn0m05wid3zdwiqhbxq3mw46sxa"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -192285,8 +192327,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.5.0"; - sha256 = "09pxr1im78fg8024my34qhcj25w3hjq585l3k5qxl81dcypkjhdb"; + version = "0.3.6.0"; + sha256 = "1lj3il9wg7v88l1hj08k07g3f76xas0gz20l2wy8z6xbpcn5ng6g"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged @@ -194388,38 +194430,6 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.7.1.1"; - sha256 = "186ck64vk4s9jligj6mq3qbpm1mb87m7zs8p3jbizpv0fcgnwq70"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring conduit conduit-extra containers cryptohash - data-default-class dns fail hashtables http-types lifted-base - monad-control mtl network nonce parsec pureMD5 random - random-shuffle resourcet stm tagged text time tls transformers - transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - benchmarkHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers criterion cryptohash data-default-class dns - fail hashtables http-types lifted-base monad-control mtl network - nonce parsec random random-shuffle stm text tls transformers-base - ]; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = lib.licenses.asl20; - }) {}; - - "mongoDB_2_7_1_2" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, conduit, conduit-extra, containers - , criterion, cryptohash, data-default-class, dns, fail, hashtables - , hspec, http-types, lifted-base, monad-control, mtl, network - , nonce, old-locale, parsec, pureMD5, random, random-shuffle - , resourcet, stm, tagged, text, time, tls, transformers - , transformers-base - }: - mkDerivation { - pname = "mongoDB"; version = "2.7.1.2"; sha256 = "0csjhvsvy534lq7lvqx96dw6ia3737rg7q96174067k7mhkxwf9m"; libraryHaskellDepends = [ @@ -194439,7 +194449,6 @@ self: { ]; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -195438,8 +195447,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.24.3"; - sha256 = "0z1kxwkflwzn6xqv8a046biv16a4fq8sxma7n4hbby7zqmzbwpj5"; + version = "0.25.0"; + sha256 = "08vi8g73c55ky6qrgkq57h1zbpkavv0ajfd16i86s6zdaxpk3fhm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195468,8 +195477,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.24.3"; - sha256 = "1hm4v3x6p718zjgk4svfslvqm6nca5kg30rhh2ax63gkfvp1i2xr"; + version = "0.25.0"; + sha256 = "09skrg2pasx3hdm13sq9ajka5yh5wsc1wc8rphc9g6pa7hpnnsxh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -195519,8 +195528,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.24.3"; - sha256 = "1xfwah79w0akg0fhz7xkhwmik5bfz4c9kwbscxf08w99669k1lwd"; + version = "0.25.0"; + sha256 = "01brdkc2vqipif5942hrzli45agb7rk8wlhx2m1j9zhcxhsbhlwf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -195550,8 +195559,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.24.3"; - sha256 = "040grsj1q9b2jy5y7pxy2islfaa6jd0winkg2dvzg1dwwh74rayc"; + version = "0.25.0"; + sha256 = "0hisqds2fn7m53hddvxw4glgwghqnx3qg0hhdc6c4zjafyfkbckf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195580,8 +195589,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.24.3"; - sha256 = "1ss36qkf47zgwwivi70bjq5l5mkqin5181yc7dxg865sgdm9jc5z"; + version = "0.25.0"; + sha256 = "1xnszpmzw0jl9dshzqs5vr9kjnm9sbi0jbgpjb44s9bd4hdgyxq5"; libraryHaskellDepends = [ base bytestring containers morpheus-graphql-core prettyprinter relude template-haskell text unordered-containers @@ -195599,8 +195608,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.24.3"; - sha256 = "0nh7nvdgqj95g1fafisjg9dxfk2hd9x0mb7da6lwcrsyb005iald"; + version = "0.25.0"; + sha256 = "07ay9vzhlxgsv9lw3b22c59r00b6f0w2c90qn14a349lkjhl1wfa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -195628,8 +195637,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.24.3"; - sha256 = "1xiy43pxmgh5kh2c1vk6g7ay0kinh7rx5xb1lrjw5wkl9sw2l7dg"; + version = "0.25.0"; + sha256 = "02lhrvz00l2486n7nihs8ka92hxa3idzlzx10fn142kqli65bwwi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195654,8 +195663,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.24.3"; - sha256 = "1cky0br7nkpnjgk0j0qxfz4gd7z14badhpll51yakysxz8y5clsf"; + version = "0.25.0"; + sha256 = "063gszwrjlszqg973axyig9alrix0fj7j4n2c01wdaxyjmxmzdjx"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -195682,14 +195691,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_24_3" = callPackage + "morpheus-graphql-tests_0_25_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.24.3"; - sha256 = "0kgzwjg0jr44rfa2pz9k80pvj22spj2qmp6l31fyy54bi89z98vh"; + version = "0.25.0"; + sha256 = "1gnysygk4rvcyv85f86yhcxl0rlq5hk5avanyv428fdirsjkkn5q"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -196929,14 +196938,14 @@ self: { broken = true; }) {}; - "mtl_2_2_2" = callPackage + "mtl_2_3_1" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "mtl"; - version = "2.2.2"; - sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8"; + version = "2.3.1"; + sha256 = "19ywdksxkv4gfbf05xgpjbnnxd81mgxjnyl2h2vlqapyc35z2y11"; libraryHaskellDepends = [ base transformers ]; - description = "Monad classes, using functional dependencies"; + description = "Monad classes for transformers, using functional dependencies"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -199457,6 +199466,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "mysql-simple_0_4_9" = 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.9"; + sha256 = "0hwv1hlr65m5l2zrrj5zmvrjz9y2814jy05l17l5jb4j4j5xw3z2"; + 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 @@ -210724,6 +210754,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "ordered-containers_0_2_3" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "ordered-containers"; + version = "0.2.3"; + sha256 = "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"; + libraryHaskellDepends = [ base containers ]; + description = "Set- and Map-like types that remember the order elements were inserted"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ordering-util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -212897,7 +212939,7 @@ self: { mainProgram = "pandoc-plot"; }) {}; - "pandoc-plot_1_5_4" = callPackage + "pandoc-plot_1_5_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default, directory, filepath, gitrev, hashable , hspec-expectations, lifted-async, lifted-base, mtl @@ -212907,8 +212949,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.5.4"; - sha256 = "1bmnzl5aqqhfrl7gk0083xkrckl11yhmvf2lf1w1jg4hcfknj6a8"; + version = "1.5.5"; + sha256 = "1gcs6sh8fhlmaiha5wn60z2s5an7gnawgkyzlalf8grwnjqkm77h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215447,9 +215489,7 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "patat"; - broken = true; }) {}; "patch" = callPackage @@ -218086,6 +218126,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-mtl_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers, esqueleto + , exceptions, explainable-predicates, monad-logger, mtl, persistent + , persistent-postgresql, persistent-sqlite, persistent-template + , resource-pool, resourcet, tasty, tasty-autocollect, tasty-golden + , tasty-hunit, text, transformers, unliftio, unliftio-core + , unliftio-pool + }: + mkDerivation { + pname = "persistent-mtl"; + version = "0.5.0.0"; + sha256 = "1xmn2zch7zxmjixlyjavl6wwdf0cjqzp01fp7xiy339wfd5higp2"; + libraryHaskellDepends = [ + base conduit containers exceptions monad-logger mtl persistent + resource-pool resourcet text transformers unliftio unliftio-core + unliftio-pool + ]; + testHaskellDepends = [ + base bytestring conduit containers esqueleto explainable-predicates + monad-logger persistent persistent-postgresql persistent-sqlite + persistent-template resource-pool resourcet tasty tasty-autocollect + tasty-golden tasty-hunit text unliftio + ]; + testToolDepends = [ tasty-autocollect ]; + description = "Monad transformer for the persistent API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, http-api-data, HUnit @@ -218742,10 +218811,8 @@ self: { }: mkDerivation { pname = "pg-entity"; - version = "0.0.2.0"; - sha256 = "0g8ici9l5lm4a900nyi90xvbjgy4z3zds46nn8sdw8ipnj0hkk1v"; - revision = "1"; - editedCabalFile = "03f0isq7vdjc1xbdchb5l0ggbf61jkxn2q1bii6sx8nphfgk4c9j"; + version = "0.0.3.0"; + sha256 = "047pccw7rkjscn2l209z15ddkbkwk88j948zgijzrm63ykrl114j"; libraryHaskellDepends = [ base bytestring colourista exceptions monad-control parsec pg-transact postgresql-simple resource-pool safe-exceptions @@ -226162,10 +226229,8 @@ self: { }: mkDerivation { pname = "postgresql-simple"; - version = "0.6.4"; - sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "8"; - editedCabalFile = "1qavb3qs1g307pc19k9y3yvqp0c1srwsplijvayn9ldp0bxdy6q8"; + version = "0.6.5"; + sha256 = "15jy8lp9200whyxk421yw3m671cjz41cnv2j8wll1giblyr3m9gx"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -226275,8 +226340,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-named"; - version = "0.0.3.0"; - sha256 = "19jyr3ai75hcks342yxrqsb1mklr6rjrzczs3al9666rll8silw9"; + version = "0.0.4.0"; + sha256 = "05xzvfy4j1r0zd2g3hgfk4a772vr02g8c3zd1vh6yqh71pvg5zwr"; libraryHaskellDepends = [ base bytestring mtl postgresql-simple text ]; @@ -227079,14 +227144,14 @@ self: { }) {}; "pqueue" = callPackage - ({ mkDerivation, base, deepseq, random, tasty, tasty-bench - , tasty-quickcheck + ({ mkDerivation, base, deepseq, indexed-traversable, random, tasty + , tasty-bench, tasty-quickcheck }: mkDerivation { pname = "pqueue"; - version = "1.4.2.0"; - sha256 = "1b7a0gf00aaw02vz21s7g7mni3dlx34cvl88dgm96a9jrm1djqrw"; - libraryHaskellDepends = [ base deepseq ]; + version = "1.4.3.0"; + sha256 = "0kl608jw0xz0n4ysw7p3cvlm1s71xrysw8862cddrzbr38bv8jvq"; + libraryHaskellDepends = [ base deepseq indexed-traversable ]; testHaskellDepends = [ base deepseq tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; description = "Reliable, persistent, fast priority queues"; @@ -232254,17 +232319,17 @@ self: { "purenix" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, microlens-platform, mtl, pretty-simple, purescript - , purescript-cst, text + , text }: mkDerivation { pname = "purenix"; - version = "1.0"; - sha256 = "0h6g8x9c0k2hy8jyfafdhg7lq4s5r7zfhi542mkzjqpzf7cqrxwn"; + version = "1.1"; + sha256 = "1z6kanz6i3a9nqpmymh6192g9qbpc759ixipnpqa9w1ph7aa8rv0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers directory filepath - microlens-platform mtl pretty-simple purescript purescript-cst text + microlens-platform mtl pretty-simple purescript text ]; executableHaskellDepends = [ base ]; description = "Nix backend for PureScript. Transpile PureScript code to Nix."; @@ -237918,6 +237983,8 @@ self: { pname = "readable"; version = "0.3.1"; sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h"; + revision = "1"; + editedCabalFile = "0dywlvxjszqa1dj5r1cva0viv2l1hm8mw75zddnf96pfpd00fmga"; libraryHaskellDepends = [ base bytestring text ]; description = "Reading from Text and ByteString"; license = lib.licenses.bsd3; @@ -247016,8 +247083,8 @@ self: { }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.9"; - sha256 = "1fclj2g340030y26mvlzkg9x1br1dmz1y8g5gjh3ngwjwlpy8k1q"; + version = "0.4.10"; + sha256 = "1dgl7zh8r5i8k21bgykgi30d9jbgcf9k4nnx3nyc1a594xpijab0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247025,9 +247092,11 @@ self: { simple-cmd ]; executableHaskellDepends = [ - base directory extra fgl optparse-applicative simple-cmd-args + base extra fgl optparse-applicative simple-cmd-args + ]; + testHaskellDepends = [ + base directory extra hspec simple-cmd unix ]; - testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Sort RPM packages in dependency order"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -249578,7 +249647,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_4_8_0" = callPackage + "sbp_4_9_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -249587,8 +249656,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "4.8.0"; - sha256 = "11089yi2bj495h515la8bf9pwrsgbaffnx60kw2d6zk2xc312pic"; + version = "4.9.0"; + sha256 = "14p0a23kmn9z9l8rm9q94zgyx5p0wnjrgf51shk2magjg055llkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249950,22 +250019,6 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.6.2"; - sha256 = "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch"; - libraryHaskellDepends = [ - base bytestring case-insensitive data-default http-client - http-client-tls scalpel-core tagsoup text - ]; - description = "A high level web scraping library for Haskell"; - license = lib.licenses.asl20; - }) {}; - - "scalpel_0_6_2_1" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, data-default - , http-client, http-client-tls, scalpel-core, tagsoup, text - }: - mkDerivation { - pname = "scalpel"; version = "0.6.2.1"; sha256 = "0w3l38czfsgbyd3x6yir7qw9bl8nmhclrbpbwfyhs39728jlscnc"; libraryHaskellDepends = [ @@ -249974,7 +250027,6 @@ self: { ]; description = "A high level web scraping library for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "scalpel-core" = callPackage @@ -249984,27 +250036,6 @@ self: { }: mkDerivation { pname = "scalpel-core"; - version = "0.6.2"; - sha256 = "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf"; - revision = "1"; - editedCabalFile = "1dn9ffblmfrr5ly3v1kbcmzc3z6m4x4p5mym8pfwc9p1vfxqbvz7"; - libraryHaskellDepends = [ - base bytestring containers data-default fail mtl pointedlist - regex-base regex-tdfa tagsoup text transformers vector - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - benchmarkHaskellDepends = [ base criterion tagsoup text ]; - description = "A high level web scraping library for Haskell"; - license = lib.licenses.asl20; - }) {}; - - "scalpel-core_0_6_2_1" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, mtl, pointedlist, regex-base - , regex-tdfa, tagsoup, text, transformers, vector - }: - mkDerivation { - pname = "scalpel-core"; version = "0.6.2.1"; sha256 = "1yl1lsi5xm3qdlww2sb6vyppjiisj54f4yzvffv3qg8dgkfjfdra"; libraryHaskellDepends = [ @@ -250015,7 +250046,6 @@ self: { benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "scalpel-search" = callPackage @@ -253713,10 +253743,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.19"; - sha256 = "1rahn436vc3xajn563ni25jqkg87fvhqkpswan1xy6qsfr0ikdjb"; - revision = "5"; - editedCabalFile = "0hn8qkvzazjncnawzzx7l0kdhzj35fy1387b00znirz6kx9w5vqp"; + version = "0.19.1"; + sha256 = "1gk6j39rcjpjacs351lknhrwj86yr4ifyp3qwlmiig27dxqlig3q"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive constraints deepseq http-api-data http-media @@ -253788,8 +253816,8 @@ self: { pname = "servant-auth"; version = "0.4.1.0"; sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd"; - revision = "3"; - editedCabalFile = "1gqg8hkq9gym3sd8xy2zij8lwrbiaqccdjkr6dyxqnnb71qm54bw"; + revision = "4"; + editedCabalFile = "0qgaq8if56fh1ydx8crb24p5cb5axx3n1lnx8klvvkamwrbr870a"; libraryHaskellDepends = [ aeson base containers jose lens servant text unordered-containers ]; @@ -253929,8 +253957,8 @@ self: { pname = "servant-auth-server"; version = "0.4.7.0"; sha256 = "1m145xxqg1xy7i1br9yfh3avwkb30zh808nr658ljl7j2imlknj2"; - revision = "3"; - editedCabalFile = "0niwlkkcv9q4zqh14lv5iq04qhw45xz2p2hhb56gva7cm6yhjgas"; + revision = "4"; + editedCabalFile = "1qcgm2pqi5qjqk27632h69j8ishls6cby8gghvww73wi63fqii9n"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -253955,8 +253983,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "7"; - editedCabalFile = "0qkcjp621a8vysswm5hn5zgmqgmmm9pcs7aiyax7wij25yjmv3p6"; + revision = "8"; + editedCabalFile = "19hp58cf3avq3jnzhspsxkb7vml8ch3cw7dq8qy59xp1wgci6v5m"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -254476,8 +254504,8 @@ self: { pname = "servant-docs"; version = "0.12"; sha256 = "0531jldq35sl1qlna0s1n8bakbsplg15611305dk48z80vcpa933"; - revision = "2"; - editedCabalFile = "0spgsfl1bx11yq7wivjrj3p5axszqya0pnmpcg2x5r6vm40qkzbk"; + revision = "3"; + editedCabalFile = "1brli8m3gvfji9b88xww5aifl1gq9lxacn3nhxbwndlnwznx7anz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254724,8 +254752,8 @@ self: { pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; - revision = "4"; - editedCabalFile = "1c37ks36xba26br81bbdvb9qphzsrnngrd7nb6dv194z1p51n2xs"; + revision = "5"; + editedCabalFile = "1qjj2v95k800j9w8drc4fjcbazzdh2f7dl7s99g9r48dg9dk5cfz"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -254918,8 +254946,8 @@ self: { pname = "servant-http-streams"; version = "0.18.4"; sha256 = "15f24rcgz839cb38q4gs1liqrdyqjbazcqzjdxmv4307x072pv3a"; - revision = "4"; - editedCabalFile = "1f4iki0sxxszdf7sm02gk823w08z5laimym6rrsrsff56aviz1ll"; + revision = "5"; + editedCabalFile = "1v3lgfsn8611hnvf34l79mrp77ag40xyw2r26bbq6d7hbg2l2jn5"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -255900,10 +255928,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.19.1"; - sha256 = "1g88vdwacwli79y5idqlrbhl2k9r463h560f2lk5abhqsmsm9bhd"; - revision = "3"; - editedCabalFile = "16jqzkrf9r7lz7y48dnl4v8s4hfn7hmfsmfbj7d96h53r2v4pz5g"; + version = "0.19.2"; + sha256 = "1a7msh8p59v5mgsnj5li9s3jg0jwq2zjsznr0cg7g0fncn7r1axy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256399,24 +256425,25 @@ self: { }) {}; "servant-util" = callPackage - ({ mkDerivation, aeson, base, constraints, containers, data-default - , fmt, hspec, hspec-discover, hspec-expectations, http-client - , http-types, insert-ordered-containers, lens, megaparsec, mtl - , openapi3, pretty-terminal, QuickCheck, reflection, regex-posix - , safe-exceptions, servant, servant-client, servant-client-core - , servant-openapi3, servant-server, servant-swagger - , servant-swagger-ui, servant-swagger-ui-core, swagger2, text - , text-format, time, universum, wai, wai-extra, warp + ({ mkDerivation, aeson, base, bytestring, constraints, containers + , data-default, fmt, hspec, hspec-discover, hspec-expectations + , http-client, http-types, insert-ordered-containers, lens + , megaparsec, mtl, openapi3, pretty-terminal, QuickCheck + , reflection, regex-posix, safe-exceptions, servant, servant-client + , servant-client-core, servant-openapi3, servant-server + , servant-swagger, servant-swagger-ui, servant-swagger-ui-core + , swagger2, text, text-format, time, universum, wai, wai-extra + , warp }: mkDerivation { pname = "servant-util"; - version = "0.3"; - sha256 = "1zhx8j7w5c41z6kgs2pdpv3ig8mvra5zq14kycpbznqpjcy21fma"; + version = "0.4"; + sha256 = "18v6x32kg3s6biyi6ixyg8xaks3hwvfz712gakrbyblgzk9w9zd7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base constraints containers data-default fmt http-types - insert-ordered-containers lens megaparsec mtl openapi3 + aeson base bytestring constraints containers data-default fmt + http-types insert-ordered-containers lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client servant-client-core servant-openapi3 servant-server servant-swagger servant-swagger-ui @@ -256424,8 +256451,8 @@ self: { wai ]; executableHaskellDepends = [ - aeson base constraints containers data-default fmt http-types - insert-ordered-containers lens megaparsec mtl openapi3 + aeson base bytestring constraints containers data-default fmt + http-types insert-ordered-containers lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client servant-client-core servant-openapi3 servant-server servant-swagger servant-swagger-ui @@ -256433,7 +256460,7 @@ self: { wai wai-extra warp ]; testHaskellDepends = [ - aeson base constraints containers data-default fmt hspec + aeson base bytestring constraints containers data-default fmt hspec hspec-expectations http-client http-types insert-ordered-containers lens megaparsec mtl openapi3 pretty-terminal QuickCheck reflection regex-posix safe-exceptions servant servant-client @@ -256457,8 +256484,8 @@ self: { }: mkDerivation { pname = "servant-util-beam-pg"; - version = "0.3"; - sha256 = "1f3s1af4nh6dzppxgri23jihd79zyn22c0vw4xi7frjnikmfiwvl"; + version = "0.4.1"; + sha256 = "1j1hq26bbm6iz374y2hacxnnx2xx3lm5sv7a0g0n7xydfmy9zs3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262079,15 +262106,15 @@ self: { mainProgram = "skylighting"; }) {}; - "skylighting_0_13_1" = callPackage + "skylighting_0_13_1_1" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, skylighting-format-ansi , skylighting-format-blaze-html, skylighting-format-latex, text }: mkDerivation { pname = "skylighting"; - version = "0.13.1"; - sha256 = "0azlnrms9cp6vfp33mrzlhv2vv8v3257hri8j3r37x8h2ml3i6h9"; + version = "0.13.1.1"; + sha256 = "01awb174z27iygjssrsgvrq8lapq7282vs4bf5cxdbkjcpncil4b"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -262135,7 +262162,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_13_1" = callPackage + "skylighting-core_0_13_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , bytestring, case-insensitive, colour, containers, criterion, Diff , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty @@ -262144,8 +262171,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.13.1"; - sha256 = "1cfc03684pwxydms5ld7y75msaw5w4y5hhdpyi36xj17y4wf1drw"; + version = "0.13.1.1"; + sha256 = "0cr9crylkawr1dg1aj55mbngn71nih16kfiblxi1gvizgxcrvdys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262636,6 +262663,23 @@ self: { license = lib.licenses.mpl20; }) {}; + "slist_0_2_1_0" = callPackage + ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec + , hspec-hedgehog + }: + mkDerivation { + pname = "slist"; + version = "0.2.1.0"; + sha256 = "1j52gvq42x03y7jq0pxzab98qnrsjg6qnw4ysq6cd89cx6gg04ab"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec hspec-hedgehog + ]; + description = "Sized list"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "sloane" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers @@ -265360,8 +265404,8 @@ self: { pname = "soap"; version = "0.2.3.6"; sha256 = "0xmiabnx814rwdwrcipv0kja6ljgwqr4x58sa8s07nrs3ph8xz6d"; - revision = "2"; - editedCabalFile = "04n55zcwkdc0xf9gkj4lywfx8j1xjmb9hbfl4z8fjlpwxklkwfhn"; + revision = "3"; + editedCabalFile = "1p34yyxln56n75m7hha75p1qm73vjyxbm54lwq566ayqf7dikp2y"; libraryHaskellDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -269665,6 +269709,35 @@ self: { mainProgram = "stackcollapse-ghc"; }) {}; + "stackctl" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka + , amazonka-cloudformation, amazonka-core, amazonka-ec2 + , amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip + , conduit, containers, errors, exceptions, extra, fast-logger + , filepath, Glob, hspec, lens, lens-aeson, monad-logger + , optparse-applicative, resourcet, rio, text, time, unliftio + , unliftio-core, unordered-containers, uuid, yaml + }: + mkDerivation { + pname = "stackctl"; + version = "1.1.0.1"; + sha256 = "1rhwgc6qgip3p8qvyjahpk7xbv583p35rxba2x02ig7hbx3724y7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation + amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo + bytestring cfn-flip conduit containers errors exceptions extra + fast-logger filepath Glob lens lens-aeson monad-logger + optparse-applicative resourcet rio text time unliftio unliftio-core + unordered-containers uuid yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec yaml ]; + license = lib.licenses.mit; + mainProgram = "stackctl"; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -271978,28 +272051,6 @@ self: { "streaming-commons" = callPackage ({ mkDerivation, array, async, base, bytestring, deepseq, directory - , gauge, hspec, network, process, QuickCheck, random, stm, text - , transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.2.2.4"; - sha256 = "1wnc2hi90djilj1m0la3h3xri723pbpmfdyp0kxxs33irs6418an"; - libraryHaskellDepends = [ - array async base bytestring directory network process random stm - text transformers unix zlib - ]; - testHaskellDepends = [ - array async base bytestring deepseq hspec network QuickCheck text - unix zlib - ]; - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; - description = "Common lower-level functions needed by various streaming data libraries"; - license = lib.licenses.mit; - }) {}; - - "streaming-commons_0_2_2_5" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, directory , gauge, hspec, hspec-discover, network, process, QuickCheck , random, stm, text, transformers, unix, zlib }: @@ -272019,7 +272070,6 @@ self: { benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -273323,8 +273373,8 @@ self: { }: mkDerivation { pname = "string-variants"; - version = "0.1.0.1"; - sha256 = "12frxk86kk3rmg927i381qajwsanz2iwhf5ryvdd1af2km4dl76a"; + version = "0.1.0.2"; + sha256 = "0lrcjx3ci2kd2347klkwz01cf8mhzfk91sl7301q44cf8fg42az4"; libraryHaskellDepends = [ aeson base bytestring mono-traversable QuickCheck refined refinery string-conversions template-haskell text @@ -274217,8 +274267,8 @@ self: { ({ mkDerivation, base, css-syntax, network-uri, text }: mkDerivation { pname = "stylist-traits"; - version = "0.1.0.0"; - sha256 = "17wzhd7xfbj16sa3v5zhg4h1g0czccnv3ksbx7mi56dbf6lqq5bi"; + version = "0.1.1.0"; + sha256 = "0ynnz1zy5why4h2dw50rm5cnviwqqa7s2kjmaqdhr34msdvdigzv"; libraryHaskellDepends = [ base css-syntax network-uri text ]; description = "Traits, datatypes, & parsers for Haskell Stylist"; license = lib.licenses.gpl3Only; @@ -275410,8 +275460,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.2.0.2"; - sha256 = "076znrkjpyl23qnrh1ffnxjgcinccyh6rcasn9b578di7v31amx5"; + version = "2.3.0.0"; + sha256 = "0ybnda16klwcajhhmzpiajdl39rkk52zb41k6b0qvd21dxmv2qji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275698,38 +275748,6 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.8.5"; - sha256 = "16r9657sp6zvj4jcs0yp7nvgnhjfsla29knaimkddsqa3k8qf1v6"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat-batteries bytestring containers - cookie generics-sop hashable http-media insert-ordered-containers - lens mtl network optics-core optics-th QuickCheck scientific - template-haskell text time transformers unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - aeson base base-compat-batteries bytestring containers doctest Glob - hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck - quickcheck-instances template-haskell text time - unordered-containers utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - license = lib.licenses.bsd3; - }) {}; - - "swagger2_2_8_6" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, cookie, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, optics-core - , optics-th, QuickCheck, quickcheck-instances, scientific - , template-haskell, text, time, transformers, unordered-containers - , utf8-string, uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; version = "2.8.6"; sha256 = "1cvz98cn4xzr7fx8q7rwr22l7l95z1cvq7qpm1shwca5j4gq5084"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -275749,7 +275767,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "swapper" = callPackage @@ -275772,32 +275789,34 @@ self: { "swarm" = callPackage ({ mkDerivation, aeson, array, base, brick, bytestring, clock - , containers, criterion, directory, dotgen, either, entropy, extra - , filepath, fused-effects, fused-effects-lens, githash, hashable - , hsnoise, http-client, http-client-tls, http-types, lens, linear - , lsp, megaparsec, minimorph, mtl, murmur3, optparse-applicative - , parser-combinators, prettyprinter, QuickCheck, random, servant - , servant-server, simple-enumeration, split, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, unification-fd + , containers, criterion, directory, dotgen, either, extra, filepath + , fused-effects, fused-effects-lens, githash, hashable, hsnoise + , http-client, http-client-tls, http-types, lens, linear, lsp + , megaparsec, minimorph, mtl, murmur3, natural-sort + , optparse-applicative, parser-combinators, prettyprinter + , QuickCheck, random, servant, servant-server, simple-enumeration + , split, stm, syb, tagged, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, template-haskell, text + , text-zipper, time, transformers, unification-fd , unordered-containers, vector, vty, wai, warp, witch, word-wrap , yaml }: mkDerivation { pname = "swarm"; - version = "0.1.1.0"; - sha256 = "18w84a0hb975qcwsd9kcji88h6xyrf7dbqcvfjdhhgbbd4y8pv9h"; + version = "0.2.0.0"; + sha256 = "1f1fp4yia54j5x6kxkrsdlj9y2859gz22k4r3pphfiadfiw1gww3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base brick bytestring clock containers directory dotgen - either entropy extra filepath fused-effects fused-effects-lens - githash hashable hsnoise http-client http-client-tls http-types - lens linear lsp megaparsec minimorph mtl murmur3 parser-combinators - prettyprinter random servant servant-server simple-enumeration - split stm syb template-haskell text time unification-fd - unordered-containers vector vty wai warp witch word-wrap yaml + either extra filepath fused-effects fused-effects-lens githash + hashable hsnoise http-client http-client-tls http-types lens linear + lsp megaparsec minimorph mtl murmur3 natural-sort + parser-combinators prettyprinter random servant servant-server + simple-enumeration split stm syb tagged template-haskell text + text-zipper time unification-fd unordered-containers vector vty wai + warp witch word-wrap yaml ]; executableHaskellDepends = [ base githash optparse-applicative text @@ -278875,9 +278894,7 @@ self: { ]; description = "Tailwind wrapped in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "tailwind-run"; - broken = true; }) {}; "tak" = callPackage @@ -282047,15 +282064,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "termbox_1_0_0" = callPackage - ({ mkDerivation, base, ki, termbox-bindings-hs }: + "termbox_1_1_0" = callPackage + ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.0.0"; - sha256 = "0diqjxam4vvw8prycjrq7qvn44lihda5rwibhwwp87vn840z0j3s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ki termbox-bindings-hs ]; + version = "1.1.0"; + sha256 = "0m2g3w0a0kc0a692r2mdflp1q96nycpwg80zf6lsb0z1xqvycypy"; + libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -282065,10 +282080,10 @@ self: { ({ mkDerivation, base, reactive-banana, termbox }: mkDerivation { pname = "termbox-banana"; - version = "0.4.0"; - sha256 = "13n2r3a6gw0lmgk36dsdwhz6hd8h9rn93pk62zlxcycddrwhan5p"; + version = "1.0.0"; + sha256 = "0fj9h3nbgsr9321kb4a2m0m1afmjass5x22pc2dbn602k9d9fmyy"; libraryHaskellDepends = [ base reactive-banana termbox ]; - description = "reactive-banana + termbox"; + description = "termbox + reactive-banana"; license = lib.licenses.bsd3; }) {}; @@ -282112,6 +282127,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-tea" = callPackage + ({ mkDerivation, base, ki, termbox }: + mkDerivation { + pname = "termbox-tea"; + version = "0.1.0"; + sha256 = "0qck27chphmxm5zdrbz3njix5vkry5c5liybgvrx0745ymcd231w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ki termbox ]; + description = "termbox + The Elm Architecture"; + license = lib.licenses.bsd3; + }) {}; + "termcolor" = callPackage ({ mkDerivation, base, cli }: mkDerivation { @@ -283346,6 +283374,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ansi_0_2_0" = callPackage + ({ mkDerivation, base, text, text-builder }: + mkDerivation { + pname = "text-ansi"; + version = "0.2.0"; + sha256 = "15sraxbiwwx49nz4kxhh2b45q222pcxzgm85rmaskpi7pswwj0b2"; + libraryHaskellDepends = [ base text text-builder ]; + description = "Text styling for ANSI terminals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-ascii" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, deepseq , hashable, megaparsec, optics-core, optics-extra, template-haskell @@ -283480,6 +283520,17 @@ self: { broken = true; }) {}; + "text-compression" = callPackage + ({ mkDerivation, base, containers, massiv, mtl }: + mkDerivation { + pname = "text-compression"; + version = "0.1.0.4"; + sha256 = "15bkgmlav4aybsgh7wg261fkhqg7phsc91sp1w26f9m2wb278xby"; + libraryHaskellDepends = [ base containers massiv mtl ]; + description = "A text compression library"; + license = lib.licenses.bsd3; + }) {}; + "text-containers" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , hashable, QuickCheck, quickcheck-instances, tasty @@ -286730,6 +286781,8 @@ self: { pname = "time-manager"; version = "0.0.0"; sha256 = "1nzwj0fxz370ks6vr1sylcidx33rnqq45y3q9yv9n4dj43nid9lh"; + revision = "1"; + editedCabalFile = "1hwcns6rnh27nngq616cl9x2pl6lm4zzrsbbv5vq6hl0a60qhqjv"; libraryHaskellDepends = [ auto-update base ]; description = "Scalable timer"; license = lib.licenses.mit; @@ -293601,6 +293654,30 @@ self: { license = lib.licenses.mit; }) {}; + "type-level-kv-list_2_0_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "2.0.0"; + sha256 = "0m1hyddkc7652crki2r2rd0c7mr9sqcj57vhhkn280plqpmbl1kx"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Type level Key-Value list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "type-level-kv-list-esqueleto" = callPackage + ({ mkDerivation, base, esqueleto, text, type-level-kv-list }: + mkDerivation { + pname = "type-level-kv-list-esqueleto"; + version = "0.1.0.1"; + sha256 = "0vkzrz7mgai8xprcly1vd938cdsxhpgpcmdgh823aawpdbahc7v9"; + libraryHaskellDepends = [ base esqueleto text type-level-kv-list ]; + description = "Make Esqueleto handy with type-level-kv-list"; + license = lib.licenses.mit; + }) {}; + "type-level-natural-number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -294489,8 +294566,8 @@ self: { }: mkDerivation { pname = "typerep-map"; - version = "0.5.0.0"; - sha256 = "0ash190liysilgdwd5aiv55k3jrapksdhrcf0sf5lqv5dmpq07ja"; + version = "0.6.0.0"; + sha256 = "011whbmc9157jw68mgkqxbgngl9zcc478b9fw10w5pkjb01anvz3"; libraryHaskellDepends = [ base containers deepseq ghc-prim primitive vector ]; @@ -294774,8 +294851,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.2.20221011.0"; - sha256 = "118k2zbn71cri9f7b7293hsj5vyrmz7v60a7rl0r2abgkxkf39d2"; + version = "0.2.20221028.0"; + sha256 = "1cm18g2fv8r11picmq2rf4hz77j2dgx6r6cdamdsq1ap0hv2jdqv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector @@ -297475,31 +297552,6 @@ self: { "unliftio" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.22.0"; - sha256 = "125vzwkzp53i5n0yxy7bbivpzgf3c7ynsfhn04xk1ymy9fqsvi0z"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process stm time - transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process stm - time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_23_0" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck , safe-exceptions, stm, time, transformers, unix, unliftio-core }: @@ -297522,7 +297574,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -303525,8 +303576,8 @@ self: { pname = "wai-extra"; version = "3.1.12.1"; sha256 = "1ya4m0c2p3wxzjlmk3yasc3pm61z309hzry9d39lj5wqv93a4wn6"; - revision = "1"; - editedCabalFile = "15v9m9af34s2iz9836bd1xi0s27sffviai4ywb2g3cv33fnpnljh"; + revision = "2"; + editedCabalFile = "139iqd6fqqj9xlpnbgva8y3wvakp2lyndk4bkvq46pq2xir4gqkf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -303545,6 +303596,40 @@ self: { license = lib.licenses.mit; }) {}; + "wai-extra_3_1_13_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, directory, fast-logger, hspec, hspec-discover + , http-types, HUnit, iproute, network, resourcet, streaming-commons + , temporary, text, time, transformers, unix, vault, wai, wai-logger + , warp, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.13.0"; + sha256 = "1h4cqd5akrq0vhv3l0fzryy7qw0c2jb58lngx7x8ij63bckjs3fz"; + revision = "1"; + editedCabalFile = "0dyvg2bb37im790757khncxpnf45451dd8575p736ry4g8rpqgpw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class directory + fast-logger http-types HUnit iproute network resourcet + streaming-commons text time transformers unix vault wai wai-logger + warp word8 + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie directory fast-logger + hspec http-types HUnit iproute resourcet temporary text time wai + warp zlib + ]; + testToolDepends = [ hspec-discover ]; + description = "Provides some basic WAI handlers and middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, splitmix, text , unordered-containers, wai, warp @@ -310686,20 +310771,21 @@ self: { }) {}; "xdg-basedir-compliant" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec, polysemy - , polysemy-plugin, polysemy-zoo, QuickCheck, split + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , hspec, path, polysemy, polysemy-plugin, polysemy-zoo, QuickCheck + , split }: mkDerivation { pname = "xdg-basedir-compliant"; - version = "1.0.2"; - sha256 = "0451z9w6607ci2s3bx8q73j3fw3ff3lnjf3i4h4nkscf76m84zzl"; + version = "1.1.0"; + sha256 = "15m38hhfa5bx5nsp7xmwjv4xk3rzw0ci1mnx8hivi7j7yk8xwc5s"; libraryHaskellDepends = [ - base bytestring filepath polysemy polysemy-plugin polysemy-zoo - split + base bytestring directory filepath path polysemy polysemy-plugin + polysemy-zoo split ]; testHaskellDepends = [ - aeson base bytestring filepath hspec polysemy polysemy-plugin - polysemy-zoo QuickCheck split + aeson base bytestring directory filepath hspec path polysemy + polysemy-plugin polysemy-zoo QuickCheck split ]; description = "XDG Basedir"; license = lib.licenses.bsd3; @@ -311142,8 +311228,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "1.1.0"; - sha256 = "09h2z1qys01lmddkacs4z3gm36dd1ndn0hw8cn3mmciyczawn2w1"; + version = "1.1.0.1"; + sha256 = "0av80xy6qqmsmc40h13zsdyyh9gmjj5rk07vjq5s7h1zbqxaqfwp"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary-search bytestring conduit containers data-default deepseq dlist errors exceptions extra @@ -311258,8 +311344,8 @@ self: { pname = "xml-conduit"; version = "1.9.1.1"; sha256 = "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"; - revision = "1"; - editedCabalFile = "0x4is0956lfpxnxf2hqv5yvl1v8r1d41h3a22qqkvbqi13xz2hzv"; + revision = "2"; + editedCabalFile = "0m6sknp9xxz8a3dhvyfpyjvxp8ph511w19j4vj1qsd6hl2pazjy6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base blaze-html blaze-markup bytestring conduit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70d0aa64c71ce..582e53e03f668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18646,6 +18646,8 @@ with pkgs; elfio = callPackage ../development/libraries/elfio { }; + emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; + enchant1 = callPackage ../development/libraries/enchant/1.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44ffc7335c349..bf43f22c9b49d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -17,8 +17,10 @@ let "ghc902" "ghc90" "ghc924" + "ghc925" "ghc92" "ghc942" + "ghc943" "ghc94" "ghcHEAD" ]; @@ -28,8 +30,10 @@ let "ghc902" "ghc92" "ghc924" + "ghc925" "ghc94" "ghc942" + "ghc943" "ghcHEAD" ]; @@ -164,6 +168,23 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { + bootPkgs = + # aarch64 ghc8107Binary exceeds max output size on hydra + if stdenv.hostPlatform.isAarch then + packages.ghc8107BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc810 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghc92 = ghc924; ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix { bootPkgs = @@ -189,10 +210,34 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghc94 = ghc942; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = - # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. + # For GHC 9.2 no armv7l bindists are available. if stdenv.hostPlatform.isAarch32 then packages.ghc924 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then @@ -310,13 +355,23 @@ in { ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; + ghc925 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc925; + ghc = bh.compiler.ghc925; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; + }; ghc92 = ghc924; ghc942 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc942; ghc = bh.compiler.ghc942; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94= ghc942; + ghc943 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc943; + ghc = bh.compiler.ghc943; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = ghc942; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index baa93c2bff76f..b17f89cc07012 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -53,7 +53,9 @@ let ghc8107 ghc902 ghc924 + ghc925 ghc942 + ghc943 ]; # packagePlatforms applied to `haskell.packages.*` @@ -334,7 +336,7 @@ let }; haskell.packages.native-bignum.ghc924 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) hello lens random @@ -366,6 +368,7 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 + compilerNames.ghc925 # https://github.com/ndmitchell/hlint/issues/1413 ]; hpack = released; @@ -393,9 +396,11 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc924 + compilerNames.ghc925 ]; purescript = [ compilerNames.ghc924 + compilerNames.ghc925 ]; purescript-cst = [ compilerNames.ghc8107 @@ -470,10 +475,12 @@ let jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc924 + jobs.pkgsMusl.haskell.compiler.ghc925 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.ghc924 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; |