diff --git a/.version b/.version index 62c36bbb17f..b9b543d4254 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -21.03 +21.05 diff --git a/lib/licenses.nix b/lib/licenses.nix index 830cb95aff9..ee136c7337c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -306,6 +306,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Free Documentation License v1.1 only"; }; + fdl11Plus = spdx { + spdxId = "GFDL-1.1-or-later"; + fullName = "GNU Free Documentation License v1.1 or later"; + }; + fdl12Only = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f5e4fd3846b..f46e36c9899 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9433,6 +9433,12 @@ fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; }]; }; + tmountain = { + email = "tinymountain@gmail.com"; + github = "tmountain"; + githubId = 135297; + name = "Travis Whitton"; + }; tmplt = { email = "tmplt@dragons.rocks"; github = "tmplt"; diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index bf18457c2b3..e083d51406c 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,7 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. - + diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0b1d0d509d7..a6cff1a8fae 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -6,7 +6,9 @@ Release 20.09 (“Nightingale”, 2020.10/27) - Support is planned until the end of April 2021, handing over to 21.03. + Support is planned until the end of June 2021, handing over to 21.05. + (Plans + have shifted by two months since release of 20.09.)
Specifying mailboxes in the dovecot2 module - as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the name + as a list is deprecated and will break eval in 21.05. Instead, an attribute-set should be specified where the name should be the key of the attribute. diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2105.xml similarity index 98% rename from nixos/doc/manual/release-notes/rl-2103.xml rename to nixos/doc/manual/release-notes/rl-2105.xml index b76d0930290..6dd14d6051e 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -2,14 +2,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03"> - Release 21.03 (“Okapi”, 2021.03/??) + xml:id="sec-release-21.05"> + Release 21.05 (“Okapi”, 2021.05/??)
+ xml:id="sec-release-21.05-highlights"> Highlights @@ -20,7 +20,7 @@ - Support is planned until the end of October 2021, handing over to 21.09. + Support is planned until the end of December 2021, handing over to 21.11. @@ -46,7 +46,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-new-services"> + xml:id="sec-release-21.05-new-services"> New Services @@ -82,7 +82,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-incompatibilities"> + xml:id="sec-release-21.05-incompatibilities"> Backward Incompatibilities @@ -501,7 +501,7 @@ self: super: xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-21.03-notable-changes"> + xml:id="sec-release-21.05-notable-changes"> Other Notable Changes diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 03e7e40e388..a2298152b02 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -463,7 +463,7 @@ in environment.systemPackages = [ dovecotPkg ]; warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [ - "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration." + "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.05! See the release notes for more info for migration." ]; assertions = [ diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 074830fc352..4131ff8be5d 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -140,7 +140,7 @@ in { # Try cleaning up the previously default location of cache file. # Note that /var/cache/* should always be safe to remove. - # TODO: remove later, probably between 20.09 and 21.03 + # TODO: remove later, probably between 20.09 and 21.05 systemd.tmpfiles.rules = [ "R /var/cache/kresd" ]; }; } diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 3f646d7db0c..d940f3d3dae 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -5,6 +5,10 @@ with lib; let cfg = config.services.hedgedoc; + # 21.03 will not be an official release - it was instead 21.05. This + # versionAtLeast statement remains set to 21.03 for backwards compatibility. + # See https://github.com/NixOS/nixpkgs/pull/108899 and + # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. name = if versionAtLeast config.system.stateVersion "21.03" then "hedgedoc" else "codimd"; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 47da8b9867a..92b1be963bf 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -367,6 +367,7 @@ in { '' else "") + '' EOF ''; + environment = env; serviceConfig = { Type = "oneshot"; User = cfg.user; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index c5c14050b5c..60d40355335 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -368,7 +368,7 @@ in { '') ++ (optional (versionOlder cfg.package.version "18") (upgradeWarning 17 "20.03")) ++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09")) - ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.03")); + ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05")); services.nextcloud.package = with pkgs; mkDefault ( @@ -380,6 +380,10 @@ in { '' else if versionOlder stateVersion "20.03" then nextcloud17 else if versionOlder stateVersion "20.09" then nextcloud18 + # 21.03 will not be an official release - it was instead 21.05. + # This versionOlder statement remains set to 21.03 for backwards compatibility. + # See https://github.com/NixOS/nixpkgs/pull/108899 and + # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. else if versionOlder stateVersion "21.03" then nextcloud19 else nextcloud20 ); diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 0029b2a499f..5d89813216d 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -40,5 +40,6 @@ mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 70acc81404e..aca96ef5da3 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }: stdenv.mkDerivation rec { - pname = "ncpamixer"; version = "1.3.3.1"; @@ -12,15 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z"; }; - buildInputs = [ ncurses libpulseaudio ]; nativeBuildInputs = [ cmake pkg-config ]; - configurePhase = '' - make PREFIX=$out build/Makefile - ''; + buildInputs = [ ncurses libpulseaudio ]; - buildPhase = '' - make build + configurePhase = '' + make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile ''; meta = with lib; { @@ -28,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW ]; + maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; }; } diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix new file mode 100644 index 00000000000..098a948c845 --- /dev/null +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -0,0 +1,53 @@ +{ lib +, fetchurl +, appimageTools +, tor +, trezord +}: + +let + pname = "trezor-suite"; + version = "21.2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-linux-x86_64.AppImage"; + sha256 = "0dj3azx9jvxchrpm02w6nkcis6wlnc6df04z7xc6f66fwn6r3kkw"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in + +appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources + + cp -a ${appimageContents}/locales/ $out/share/${pname} + cp -a ${appimageContents}/resources/app*.* $out/share/${pname}/resources + cp -a ${appimageContents}/resources/images/ $out/share/${pname}/resources + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png + install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/trezor-suite.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + + # symlink system binaries instead bundled ones + mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} + ln -sf ${trezord}/bin/trezord-go $out/share/${pname}/resources/bin/bridge/trezord + ln -sf ${tor}/bin/tor $out/share/${pname}/resources/bin/tor/tor + ''; + + meta = with lib; { + description = "Trezor Suite - Desktop App for managing crypto"; + homepage = "https://suite.trezor.io"; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9334a16d22d..62979b4226d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -610,7 +610,7 @@ let }; # Deprecated legacy aliases for backwards compat - aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { "auto-complete-clang-async" = "emacsClangCompleteAsync"; "vterm" = "emacs-libvterm"; "0xc" = "_0xc"; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 619b2ba9955..102e2ae9c34 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,12 +1,8 @@ { lib, fetchFromGitHub, python3Packages, file, less, highlight -, imagePreviewSupport ? true, w3m ? null}: - -with lib; - -assert imagePreviewSupport -> w3m != null; +, imagePreviewSupport ? true, w3m }: python3Packages.buildPythonApplication rec { - name = "ranger-${version}"; + pname = "ranger"; version = "1.9.3"; src = fetchFromGitHub { @@ -18,14 +14,10 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; propagatedBuildInputs = [ file ] ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; - checkPhase = '' - py.test tests - ''; - preConfigure = '' ${lib.optionalString (highlight != null) '' sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ @@ -45,7 +37,7 @@ python3Packages.buildPythonApplication rec { # give file previews out of the box substituteInPlace ranger/config/rc.conf \ --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" - '' + optionalString imagePreviewSupport '' + '' + lib.optionalString imagePreviewSupport '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m @@ -57,8 +49,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "http://ranger.github.io/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = [ maintainers.toonn maintainers.magnetophon ]; + maintainers = with maintainers; [ toonn magnetophon ]; }; } diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix new file mode 100644 index 00000000000..8740633262f --- /dev/null +++ b/pkgs/applications/misc/ssh-tools/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ssh-tools"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "vaporup"; + repo = pname; + rev = "v${version}"; + sha256 = "0m0x9383p9ab4hdirncmrfha130iasa0v4cbif2y5nbxnxgh101r"; + }; + + installPhase = '' + mkdir -p $out/bin + cp ssh-* $out/bin/ + ''; + + meta = with lib; { + description = "Collection of various tools using ssh"; + homepage = "https://github.com/vaporup/ssh-tools/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index ad107b64472..4a7b7ad63b7 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "01zydr1w8byjhxf4xj6z001q4ynq0452cn332ap1l1w0dmx9mxyr"; + sha256 = "sha256-xzMXbF0M7asZtyo8DmM5yyNoHKy0H6amRDhu6hjHgq4="; }; - vendorSha256 = "1xyai417l8q44b562ssp5qqw04klrhg5397ahr4pc3i30csz8a7a"; + vendorSha256 = "sha256-6ij0NQMjDnZJhuqkUR7MdBLAMS5Xa2HKIgQjegKJyvc="; doCheck = false; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 1c723d86f79..8207040f1b8 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.0.0"; + version = "29.0.1"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1v870kxbl7b0kazd6krjiarvbjwmv13hgwkzpi054i9cf8z7pyiv"; + sha256 = "18flr64041cvffj6jbzx0njnynvyk3k5yljb446a4lwmksvd3nmq"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index ec69b349076..a45f3553b92 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.7.6"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1bngsm2z02w9chbd65dvd1k21y16rapx6i84ac2icmc9wwpsfnls"; + sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; }; - vendorSha256 = "0pl1llj4bfxxxp49v3190vpvplv0wbw5ahj6l2045pic5yyxwrma"; + vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0f28225ad01..581af59f0c8 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -13,19 +13,26 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" + ]; nativeBuildInputs = [ installShellFiles ]; - buildPhase = '' - make bin/tkn + # third_party/VENDOR-LICENSE breaks build/check as go files are still included + # docs is a tool for generating docs + excludedPackages = "\\(third_party\\|cmd/docs\\)"; + + preCheck = '' + # Change the golden files to match our desired version + sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden ''; - installPhase = '' - install bin/tkn -Dt $out/bin - - mkdir -p "$out/share/man/man1" - cp docs/man/man1/* "$out/share/man/man1" + postInstall = '' + installManPage docs/man/man1/* installShellCompletion --cmd tkn \ --bash <($out/bin/tkn completion bash) \ @@ -34,14 +41,14 @@ buildGoModule rec { ''; meta = with lib; { - description = "The Tekton Pipelines cli project provides a CLI for interacting with Tekton"; homepage = "https://tekton.dev"; + changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; + description = "Provides a CLI for interacting with Tekton"; longDescription = '' The Tekton Pipelines cli project provides a CLI for interacting with Tekton! For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. ''; license = licenses.asl20; - maintainers = with maintainers; [ jk mstrangfeld ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 9055b51d975..e5221d861d3 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -5,12 +5,12 @@ mkDerivation rec { pname = "ripcord"; - version = "0.4.26"; + version = "0.4.28"; src = let appimage = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "0i9l21gyqga27ainzqp6icn8vbc22v1knq01pglgg1lg3p504ikq"; + sha256 = "0bczqp4kny7jlp06f4bh1xg0x17g8980dj6pk4waqc7qk88i6sfv"; name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index b9a8316794a..63642af708f 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -21,7 +21,7 @@ }: let - version = "1.6.3"; + version = "1.6.4"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0rm7w29wf3gipf69qf7s42qw8857z74gsigrpz9g6vvd1x58f03m"; + sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index d5abd0a5976..5193cd2531f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command-line tool to delete merged Git branches"; homepage = "https://pypi.org/project/git-delete-merged-branches/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 3f6ea7972ba..f2291882b2b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchzip, unixtools, which }: +{ lib, stdenv, fetchFromGitHub, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; version = "6.1.0"; - src = fetchzip { - url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "tj"; + repo = "git-extras"; + rev = version; sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; }; @@ -29,6 +31,6 @@ stdenv.mkDerivation rec { description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.spwhitt maintainers.cko ]; + maintainers = with maintainers; [ spwhitt cko ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 6ac6cde44a8..1f2a77d2019 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; + sha256 = "sha256-kkH4px34VpnO/S1VjgQGU9Mm4/VpmiOtvlz2ubtStAk="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' - rm -f contrib/config.make-* + rm contrib/config.make-* ''; enableParallelBuilding = true; @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; - maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; - license = licenses.gpl2; + maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ]; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 1a11d40e3df..d158aea83f3 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,11 +3,11 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.19"; + version = "4.19.1"; src = fetchurl { url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz"; - sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h"; + sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0="; }; meta = with lib; { diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 581d897702f..d1d8b91bdac 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f8773aba1736a7929a7262fdd6217be67f679c98.tar.gz"; - sha256 = "1flmp0r1isgp8mf85iwiwps6sa3wczb6k0zphprhnvbi2dzg9x87"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz"; + sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s"; } diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix new file mode 100644 index 00000000000..075e9bf9d54 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -0,0 +1,264 @@ +{ lib, stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # 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. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), 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 ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # 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 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.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +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 + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "8.10.4"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ] ++ lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + 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}cxx" + # 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="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + 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 && !enableIntegerSimple) [ + "--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 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ lib.optional useLLVM llvmPackages.llvm; + + 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" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7c57153b2a4..f03f4a6dcc0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1410,10 +1410,16 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; - # 2021-01-20 - # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 - # https://github.com/haskell/haskell-language-server/issues/1240 - apply-refact = super.apply-refact_0_8_2_1; + # 2021-02-08: Jailbreaking because of + # https://github.com/haskell/haskell-language-server/issues/1329 + hls-tactics-plugin = doJailbreak super.hls-tactics-plugin; + # 2021-02-11: Jailbreaking because of syntax error on bound revision + hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin; + + # 2021-02-08: Overrides because nightly is to old for hls 0.9.0 + lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7); + haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0; + haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0; # 1. test requires internet # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute @@ -1567,4 +1573,12 @@ self: super: { # Allow building with older versions of http-client. http-client-restricted = doJailbreak super.http-client-restricted; + # 2020-02-11: https://github.com/ekmett/lens/issues/969 + # A change in vector 0.2.12 broke the lens doctests. + # This is fixed on lens master. Remove this override on assert fail. + lens = assert super.lens.version == "4.19.2"; doJailbreak (dontCheck super.lens); + + # Test suite fails, upstream not reachable for simple fix (not responsive on github) + vivid-osc = dontCheck super.vivid-osc; + vivid-supercollider = dontCheck super.vivid-supercollider; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ad6c17cbd10..b695c448be4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -98,5 +98,8 @@ self: super: { # Older compilers need the latest ghc-lib to build this package. hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + vector = dontCheck super.vector; + mmorph = super.mmorph_1_1_3; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c23d875dea3..e6e0f690fe7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -127,4 +127,6 @@ self: super: { # Older compilers need the latest ghc-lib to build this package. hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers + vector = dontCheck super.vector; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 7e8546c7c7e..e3f196440ca 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -84,7 +84,7 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch"; sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh"; }); - doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_17)) (pkgs.fetchpatch { + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18)) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch"; sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62"; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3dcadefccc3..e03c9425ed2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.10.3 +compiler: ghc-8.10.4 core-packages: - array-0.5.4.0 @@ -13,17 +13,17 @@ core-packages: - directory-1.3.6.0 - exceptions-0.10.4 - filepath-1.4.2.1 - - ghc-8.10.3 - - ghc-boot-8.10.3 - - ghc-boot-th-8.10.3 + - ghc-8.10.4 + - ghc-boot-8.10.4 + - ghc-boot-th-8.10.4 - ghc-compact-0.1.0.0 - - ghc-heap-8.10.3 + - ghc-heap-8.10.4 - ghc-prim-0.6.1 - - ghci-8.10.3 + - ghci-8.10.4 - haskeline-0.8.0.1 - hpc-0.6.1.0 - integer-gmp-1.0.3.0 - - libiserv-8.10.3 + - libiserv-8.10.4 - mtl-2.2.2 - parsec-3.1.14.0 - pretty-1.1.3.6 @@ -73,12 +73,10 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - - hls-plugin-api == 0.6.0.0 # Needed for hls 0.8.0 - - hls-eval-plugin == 0.1.0.0 # Needed for hls 0.8.0 - - hls-hlint-plugin == 0.1.0.0 # Needed for hls 0.8.0 - - ghcide == 0.7.0.0 # Needed for hls 0.8.0 + - ghcide < 0.7.4 # for hls 0.9.0 + - hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0 - # Stackage Nightly 2021-02-02 + # Stackage Nightly 2021-02-10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -107,6 +105,7 @@ default-package-overrides: - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 + - Agda ==2.6.1.3 - agda2lagda ==0.2020.11.1 - al ==0.1.4.2 - alarmclock ==0.7.0.5 @@ -235,14 +234,14 @@ default-package-overrides: - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.0 + - ascii ==1.0.1.2 - ascii-case ==1.0.0.2 - ascii-char ==1.0.0.6 - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.0 + - ascii-superset ==1.0.1.2 - ascii-th ==1.0.0.2 - asif ==6.0.4 - asn1-encoding ==0.9.6 @@ -271,7 +270,7 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.19 + - autoexporter ==1.1.20 - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 @@ -358,13 +357,13 @@ default-package-overrides: - bordacount ==0.1.0.0 - boring ==0.1.3 - both ==0.1.1.1 - - bound ==2.0.2 + - bound ==2.0.3 - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.59 + - brick ==0.60.2 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -373,8 +372,8 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.3 - - bugzilla-redhat ==0.3.0 - - burrito ==1.2.0.0 + - bugzilla-redhat ==0.3.1 + - burrito ==1.2.0.1 - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 @@ -397,6 +396,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 + - cabal-appimage ==0.3.0.2 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 @@ -477,7 +477,7 @@ default-package-overrides: - cmdargs ==0.10.20 - codec-beam ==0.2.0 - codec-rpm ==0.2.2 - - code-page ==0.2 + - code-page ==0.2.1 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 @@ -493,6 +493,7 @@ default-package-overrides: - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.2.1 + - compdata ==0.12.1 - compensated ==0.8.1 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 @@ -603,7 +604,7 @@ default-package-overrides: - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.2 + - data-ascii ==1.0.0.4 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 @@ -618,7 +619,7 @@ default-package-overrides: - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - - data-fix ==0.3.0 + - data-fix ==0.3.1 - data-forest ==0.1.0.8 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 @@ -656,7 +657,7 @@ default-package-overrides: - derive-topdown ==0.0.2.2 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - - derulo ==1.0.9 + - derulo ==1.0.10 - dhall ==1.38.0 - dhall-bash ==1.0.36 - dhall-json ==1.7.5 @@ -843,7 +844,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==1.0.21 + - flow ==1.0.22 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.1.2 @@ -897,6 +898,7 @@ default-package-overrides: - generic-data ==0.9.2.0 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.13.1 + - generic-functor ==0.2.0.0 - generic-lens ==2.0.0.0 - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 @@ -939,9 +941,9 @@ default-package-overrides: - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.3.20201220 - - ghc-lib-parser ==8.10.3.20201220 - - ghc-lib-parser-ex ==8.10.0.17 + - ghc-lib ==8.10.4.20210206 + - ghc-lib-parser ==8.10.4.20210206 + - ghc-lib-parser-ex ==8.10.0.19 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.7 @@ -975,7 +977,7 @@ default-package-overrides: - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - - github-release ==1.3.5 + - github-release ==1.3.6 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -1015,7 +1017,7 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.21.0 + - hadolint ==1.22.1 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.3 - half ==0.3.1 @@ -1067,7 +1069,7 @@ default-package-overrides: - hebrew-time ==0.1.2 - hedgehog ==1.0.4 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.3 + - hedgehog-fakedata ==0.0.1.4 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.14.2 @@ -1119,7 +1121,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 - - hpack ==0.34.3 + - hpack ==0.34.4 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.1 - hpc-lcov ==1.0.1 @@ -1237,13 +1239,13 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 - - hxt ==9.3.1.18 - - hxt-charproperties ==9.4.0.0 + - hxt ==9.3.1.21 + - hxt-charproperties ==9.5.0.0 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 - hxt-http ==9.1.5.2 - - hxt-regex-xmlschema ==9.2.0.3 + - hxt-regex-xmlschema ==9.2.0.7 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 @@ -1336,7 +1338,7 @@ default-package-overrides: - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json-feed ==1.0.11 + - json-feed ==1.0.12 - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 @@ -1403,7 +1405,7 @@ default-package-overrides: - lens-family-core ==2.0.0 - lens-family-th ==0.5.1.0 - lens-misc ==0.0.2.0 - - lens-process ==0.3.0.2 + - lens-process ==0.4.0.0 - lens-properties ==4.11.1 - lens-regex ==0.1.1 - lens-regex-pcre ==1.1.0.0 @@ -1432,7 +1434,7 @@ default-package-overrides: - ListLike ==4.7.4 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-singleton ==1.0.0.4 + - list-singleton ==1.0.0.5 - list-t ==1.0.4 - ListTree ==0.2.3 - little-logger ==0.3.1 @@ -1545,7 +1547,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.1.2.1 - model ==0.5 - - modern-uri ==0.3.3.0 + - modern-uri ==0.3.3.1 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.2.3 @@ -1610,7 +1612,7 @@ default-package-overrides: - mwc-random ==0.14.0.0 - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - - mysql ==0.1.7.2 + - mysql ==0.1.7.3 - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 @@ -1644,9 +1646,9 @@ default-package-overrides: - network-simple-tls ==0.4 - network-transport ==0.5.4 - network-transport-composed ==0.2.1 - - network-uri ==2.6.3.0 + - network-uri ==2.6.4.1 - newtype ==0.2.2.0 - - newtype-generics ==0.5.4 + - newtype-generics ==0.6 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 @@ -1741,8 +1743,8 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.8 - - password ==2.1.0.0 - - password-instances ==2.0.0.1 + - password ==2.1.1.0 + - password-instances ==2.0.0.2 - path ==0.7.0 - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 @@ -1764,6 +1766,7 @@ default-package-overrides: - peano ==0.1.0.1 - pem ==0.2.4 - percent-format ==0.0.1 + - peregrin ==0.3.1 - perfect-hash-generator ==0.2.0.6 - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.5 @@ -1776,7 +1779,7 @@ default-package-overrides: - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.11.0.1 - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.0.0 + - persistent-sqlite ==2.11.1.0 - persistent-template ==2.9.1.0 - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 @@ -1861,7 +1864,7 @@ default-package-overrides: - probability ==0.2.7 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.11.0.1 + - product-profunctors ==0.11.0.2 - profiterole ==0.1 - profunctors ==5.5.2 - projectroot ==0.2.0.1 @@ -1895,7 +1898,7 @@ default-package-overrides: - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==2.0.0.3 - pvar ==1.0.0.0 - - PyF ==0.9.0.2 + - PyF ==0.9.0.3 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 @@ -1916,12 +1919,12 @@ default-package-overrides: - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 - quiet ==0.2 - - quote-quot ==0.1.0.0 + - quote-quot ==0.2.0.0 - radius ==0.7.1.0 - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.1 - - rampart ==1.1.0.1 + - rampart ==1.1.0.2 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.1 @@ -1937,9 +1940,9 @@ default-package-overrides: - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.12 + - ratel ==1.0.13 - rate-limit ==1.4.2 - - ratel-wai ==1.1.3 + - ratel-wai ==1.1.4 - rattle ==0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -2019,10 +2022,10 @@ default-package-overrides: - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - roles ==0.2.0.0 - - rope-utf16-splay ==0.3.1.0 + - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.3.1 + - rpmbuild-order ==0.4.3.2 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 @@ -2039,7 +2042,7 @@ default-package-overrides: - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 - - salve ==1.0.10 + - salve ==1.0.11 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 @@ -2188,7 +2191,7 @@ default-package-overrides: - speedy-slice ==0.3.1 - Spintax ==0.3.5 - splice ==0.6.1.1 - - splint ==1.0.1.2 + - splint ==1.0.1.3 - split ==0.2.3.4 - splitmix ==0.1.0.3 - spoon ==0.3.1 @@ -2254,7 +2257,7 @@ default-package-overrides: - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 - stripe-tests ==2.6.2 - - strive ==5.0.12 + - strive ==5.0.13 - structs ==0.1.4 - structured ==0.1 - structured-cli ==2.6.0.0 @@ -2293,7 +2296,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.7 - - tasty-bench ==0.1 + - tasty-bench ==0.2.1 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.2 @@ -2334,7 +2337,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.1 + - texmath ==0.12.1.1 - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 @@ -2358,7 +2361,7 @@ default-package-overrides: - tf-random ==0.5 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1 + - th-compat ==0.1.1 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 @@ -2406,7 +2409,7 @@ default-package-overrides: - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.0 - - tls ==1.5.4 + - tls ==1.5.5 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - tlynx ==0.5.0.1 @@ -2428,6 +2431,7 @@ default-package-overrides: - traverse-with-class ==1.0.1.0 - tree-diff ==0.1 - tree-fun ==0.8.1.0 + - tree-view ==0.5 - trifecta ==2.1 - triplesec ==0.2.2.1 - tsv2csv ==0.1.0.2 @@ -2453,7 +2457,7 @@ default-package-overrides: - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - type-natural ==1.0.0.0 - - type-of-html ==1.6.1.2 + - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - typerep-map ==0.3.3.0 @@ -2497,6 +2501,7 @@ default-package-overrides: - unliftio ==0.2.14 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 + - unliftio-streams ==0.1.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.13.0 - unsafe ==0.0 @@ -2530,12 +2535,13 @@ default-package-overrides: - valor ==0.1.0.0 - vault ==0.3.1.4 - vec ==0.3 - - vector ==0.12.1.2 + - vector ==0.12.2.0 - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.8 - vector-bytes-instances ==0.1.1 + - vector-circular ==0.1.3 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 @@ -2573,7 +2579,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.13 + - warp ==3.3.14 - warp-tls ==3.3.0 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2595,7 +2601,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.0.0.4 + - witch ==0.0.0.5 - witherable-class ==0 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2610,12 +2616,12 @@ default-package-overrides: - word-wrap ==0.4.1 - world-peace ==1.0.2.0 - wrap ==0.0.0 - - wreq ==0.5.3.2 + - wreq ==0.5.3.3 - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - - wuss ==1.1.17 + - wuss ==1.1.18 - X11 ==1.9.2 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2661,7 +2667,7 @@ default-package-overrides: - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.2 + - yesod-page-cursor ==2.0.0.3 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 @@ -2697,6 +2703,7 @@ default-package-overrides: extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. + - Cabal == 3.2.* # required for cabal-install etc. - dhall == 1.29.0 # required for ats-pkg - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 @@ -2711,8 +2718,10 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls + - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 package-maintainers: peti: @@ -5127,6 +5136,7 @@ broken-packages: - fay-websockets - fb-persistent - fbmessenger-api + - fbrnch - fca - fcache - fcd @@ -8286,9 +8296,6 @@ broken-packages: - nested-sequence - NestedFunctor - nestedmap - - net-mqtt - - net-mqtt-lens - - net-mqtt-rpc - net-spider - net-spider-cli - net-spider-pangraph @@ -11031,6 +11038,7 @@ broken-packages: - unix-fcntl - unix-handle - unix-process-conduit + - unix-simple - unlifted-list - unliftio-streams - unm-hip @@ -11201,9 +11209,6 @@ broken-packages: - visual-prof - visualize-cbn - vitrea - - vivid - - vivid-osc - - vivid-supercollider - vk-aws-route53 - VKHS - voicebase diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b1a2837ec6d..6928bba47fa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -800,12 +800,12 @@ self: { , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process , regex-tdfa, split, stm, strict, template-haskell, text, time - , unordered-containers, uri-encode, zlib + , transformers, unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; - version = "2.6.1.2"; - sha256 = "0b872fi12j316zcbwnablkg45p252a4sqca9lsgfig55qirk0w08"; + version = "2.6.1.3"; + sha256 = "1rx1r21kpgz27g2qn6fqgdpkl5b07c2fl86j3clylpp9rr0ch6xv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -815,7 +815,7 @@ self: { containers data-hash deepseq directory edit-distance equivalence exceptions filepath geniplate-mirror ghc-compact gitrev hashable hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time + regex-tdfa split stm strict template-haskell text time transformers unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; @@ -2777,6 +2777,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_4_0_0" = callPackage + ({ mkDerivation, array, async, base, base-compat, base-orphans + , binary, bytestring, clock, containers, deepseq, Diff, directory + , filepath, integer-logarithms, mtl, optparse-applicative, parsec + , pretty, process, QuickCheck, rere, stm, tagged, tar, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, text + , time, transformers, tree-diff, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.4.0.0"; + sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty process text time transformers unix + ]; + testHaskellDepends = [ + array async base base-compat base-orphans binary bytestring clock + containers deepseq Diff directory filepath integer-logarithms + optparse-applicative pretty process QuickCheck rere stm tagged tar + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text + transformers tree-diff + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -16316,8 +16346,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.9.0.2"; - sha256 = "186kxid40nsxhc4yas6a1jk6ndsycsfrc5k9pfvyhgw720rx2p2c"; + version = "0.9.0.3"; + sha256 = "1x1zryq3di5z3mc1wind6ma1b7cpsvf90y7k5dyvwkn1kisz3jf8"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text @@ -21959,8 +21989,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.6.0.0"; - sha256 = "1s7vdmp2i89c2rvcifn6znwl167ji8x3yrvk19rrkqpamdy9m3m3"; + version = "0.6.1.0"; + sha256 = "0m0qvamvixxm9yd45393j44mnnlnw2672gcdv7kaqw4hjczlddmq"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -22006,17 +22036,18 @@ self: { }) {}; "Z-YAML" = callPackage - ({ mkDerivation, base, primitive, scientific, transformers + ({ mkDerivation, base, hspec, primitive, scientific, transformers , unordered-containers, Z-Data, Z-IO }: mkDerivation { pname = "Z-YAML"; - version = "0.3.0.0"; - sha256 = "1z5k6qd9hsbwlvxcmy442g8fk7707fccwa9l8b518psp29nd7kzm"; + version = "0.3.2.0"; + sha256 = "01v0vza54lpxijg4znp2pcnjw2z6ybvx453xqy7ljwf9289csfq8"; libraryHaskellDepends = [ base primitive scientific transformers unordered-containers Z-Data Z-IO ]; + testHaskellDepends = [ base hspec Z-Data ]; description = "YAML tools"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -23930,6 +23961,8 @@ self: { pname = "acts"; version = "0.3.1.0"; sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; + revision = "2"; + editedCabalFile = "1xc061cj6wxqyr79hdakmc3nnzdh46sj2sd7j9gfrvgmbipl895q"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -23949,6 +23982,8 @@ self: { pname = "ad"; version = "4.4.1"; sha256 = "1afpqk0my4n50xvq9f0rhcs8kzy3w1xxjql462xc0mvvhsgp6s6g"; + revision = "1"; + editedCabalFile = "1sprgwc6niixmc3p073al3bm3ff873h6zjgizdz2wpqm0b6rfmka"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -25298,6 +25333,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.0"; sha256 = "1kyrh2w3qpzwm7kpb4rkrzi22kqqz1vcjw1f59wdkl8a5hffkv6y"; + revision = "1"; + editedCabalFile = "167gfgmy1pq50rh3rszj01ch4qy3jl4lpl3g8yq300kffrfs882a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29578,6 +29615,27 @@ self: { license = lib.licenses.gpl3; }) {}; + "amqp-utils_0_4_5_0" = callPackage + ({ mkDerivation, amqp, base, bytestring, connection, containers + , data-default-class, directory, hinotify, magic, network, process + , text, time, tls, unix, utf8-string, x509-system + }: + mkDerivation { + pname = "amqp-utils"; + version = "0.4.5.0"; + sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + amqp base bytestring connection containers data-default-class + directory hinotify magic network process text time tls unix + utf8-string x509-system + ]; + description = "AMQP toolset for the command line"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "amqp-worker" = callPackage ({ mkDerivation, aeson, amqp, base, bytestring, data-default , exceptions, monad-control, monad-loops, mtl, resource-pool @@ -31739,37 +31797,6 @@ self: { broken = true; }) {}; - "apply-refact_0_8_2_1" = callPackage - ({ mkDerivation, base, containers, directory, extra, filemanip - , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative - , process, refact, silently, syb, tasty, tasty-expected-failure - , tasty-golden, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.8.2.1"; - sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory extra filemanip ghc ghc-exactprint - process refact syb transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact syb transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact silently syb - tasty tasty-expected-failure tasty-golden transformers unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -33274,8 +33301,8 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.1.0"; - sha256 = "0px41v49i3czchlv09dnbivlrk1zci4b2mg0xkrp6nwyzb9z4xyr"; + version = "1.0.1.2"; + sha256 = "051q0gamgvgd4j1bzqxww7qy4syx21s0vqhfihwlb2ypxf2s2fqa"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text @@ -33284,6 +33311,24 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii_1_0_1_4" = callPackage + ({ mkDerivation, ascii-case, ascii-char, ascii-group + , ascii-predicates, ascii-superset, ascii-th, base, bytestring + , data-ascii, text + }: + mkDerivation { + pname = "ascii"; + version = "1.0.1.4"; + sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; + libraryHaskellDepends = [ + ascii-case ascii-char ascii-group ascii-predicates ascii-superset + ascii-th base bytestring data-ascii text + ]; + description = "The ASCII character set and encoding"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-art-to-unicode" = callPackage ({ mkDerivation, base, comonad, doctest, strict }: mkDerivation { @@ -33310,6 +33355,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.4"; + sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { @@ -33321,6 +33378,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-char_1_0_0_8" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.8"; + sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; + libraryHaskellDepends = [ base hashable ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -33359,6 +33428,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.4"; + sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -33385,6 +33466,18 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-predicates_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, base }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.0.4"; + sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; + libraryHaskellDepends = [ ascii-char base ]; + description = "Various categorizations of ASCII characters"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -33433,8 +33526,8 @@ self: { ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; - version = "1.0.1.0"; - sha256 = "1d4yfcy8yr6zimpv8mq8lsf8sd85rg4m8x7l81lr6wan2wx54gh6"; + version = "1.0.1.2"; + sha256 = "0hx5kh6h239hqrnqyda55769jfbxjxcr4mihya1djl7ls1fy493v"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; @@ -33442,6 +33535,20 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-superset_1_0_1_4" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.1.4"; + sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + description = "Representing ASCII with refined supersets"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -33474,6 +33581,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_4" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.4"; + sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -34903,6 +35025,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_5" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.5"; + sha256 = "0vv88m5m7ynjrg114psp4j4s69f1a5va3bvn293vymqrma7g7q11"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + description = "Fast combinator parsing for bytestrings and text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -35519,8 +35670,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.19"; - sha256 = "0hgxfd5pykl6y1v3asnh46abfmi5fsdp0hs1kf6a2acqsnx9vad7"; + version = "1.1.20"; + sha256 = "1aciwnsxb76hl2yx1n8mbmd6rhl41f1axq3c2djdc6mkkiyh9qc1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -38777,8 +38928,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.0"; - sha256 = "0dbbpxjhsm17xhqp2a4vvwb0rq3v33wmb84rqdcjr6j8d54wnq5f"; + version = "0.2.0.1"; + sha256 = "1hrqszdzr15p45wbbnpdkairmqwz8giyb0gn727wgxflh75a84xr"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -38798,8 +38949,8 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.1"; - sha256 = "0phw6hsrhya93w7zlrl7866zgpa62pscicjdb5lllpdqfcwl4jl2"; + version = "0.1.0.2"; + sha256 = "0rgr1p8dn54j432hfwg361dhsd4ngwvy3h8wx094m0kb6vjix9l6"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent text @@ -42622,8 +42773,8 @@ self: { pname = "bits"; version = "0.5.2"; sha256 = "1q5grjma421qiwjkwvnsakd4hxnf02bavfinky2skfhqvg63hkav"; - revision = "1"; - editedCabalFile = "0yjx0rixg51bhhddhb7m4g2ryp1qqj70j4bj6ggj0wpzmzazq5aa"; + revision = "2"; + editedCabalFile = "0zcxzi3afs2vxmm2mc9l65br5qym2ah9q3671f4ckzn0h0hcqw2n"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -42908,15 +43059,15 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; - "bitvec_1_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, integer-gmp, primitive, quickcheck-classes, random - , tasty, tasty-hunit, tasty-quickcheck, vector + "bitvec_1_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , integer-gmp, primitive, quickcheck-classes, random, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "bitvec"; - version = "1.1.0.0"; - sha256 = "1blfi62immsx7hvg9krdbcp9n1p2a9qyhm9j30lc0g2jcl1n11mz"; + version = "1.1.1.0"; + sha256 = "0652dxx19g26jlx945qas09jhbcy17yw4visk9qhi9fbjl53v3yv"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp primitive vector ]; @@ -42925,7 +43076,7 @@ self: { tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - base containers gauge integer-gmp random vector + base containers integer-gmp random tasty-bench vector ]; description = "Space-efficient bit vectors"; license = lib.licenses.bsd3; @@ -44971,33 +45122,6 @@ self: { }) {}; "bound" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, Cabal - , cabal-doctest, cereal, comonad, deepseq, deriving-compat, doctest - , functor-classes-compat, hashable, mmorph, profunctors - , template-haskell, th-abstraction, transformers - , transformers-compat, vector, void - }: - mkDerivation { - pname = "bound"; - version = "2.0.2"; - sha256 = "14kl0aak48m1sbvi0g772hfmn6w984yc4j9p4ljxq6bfb2q4gqax"; - revision = "1"; - editedCabalFile = "1349bq2vrmhr63r1iqwfcb1sxm7yyf0641wsqmzd332g3aad159w"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bifunctors binary bytes cereal comonad deepseq hashable mmorph - profunctors template-haskell th-abstraction transformers - transformers-compat - ]; - testHaskellDepends = [ - base deriving-compat doctest functor-classes-compat transformers - transformers-compat vector void - ]; - description = "Making de Bruijn Succ Less"; - license = lib.licenses.bsd3; - }) {}; - - "bound_2_0_3" = callPackage ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad , deepseq, deriving-compat, functor-classes-compat, hashable , mmorph, profunctors, template-haskell, th-abstraction @@ -45018,7 +45142,6 @@ self: { ]; description = "Making de Bruijn Succ Less"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bound-extras" = callPackage @@ -45214,8 +45337,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "box-tuples"; - version = "0.2.0.3"; - sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; + version = "0.2.0.4"; + sha256 = "02f3ll6qghs36sill1pznj2354cliq5kh5rbg19lsnykvqimca0i"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = lib.licenses.mit; @@ -45433,8 +45556,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.59"; - sha256 = "1nkx7b6688ba0h8kw8xzqamj9zpdjyrdpmg8h18v3l03hw5jcszf"; + version = "0.60.2"; + sha256 = "1fcpbm58fikqv94cl97p6bzhyq07kkp3zppylqwpil2qzfhvzb3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45450,33 +45573,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_0_60_1" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.60.1"; - sha256 = "017zhf5frk1dx5brjnz101pr9hyz4m03sw54gvlx7qv58r4prvjx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -46457,10 +46553,8 @@ self: { }: mkDerivation { pname = "bugzilla-redhat"; - version = "0.3.0"; - sha256 = "1d751f1219ivx9bfdl7xb89w2vns07ciqp4cqcykixnllx2jx18y"; - revision = "1"; - editedCabalFile = "145sdnk28sxwz4s1gh0qq6vzm9q6s5433q6w1199cv9585b53kcx"; + version = "0.3.1"; + sha256 = "088ya35lwxnvg0x996agy2ky8kp4r3j2i1ja15fy3afcqfpvbqiv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46735,8 +46829,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.2.0.0"; - sha256 = "1nrb08czlnfcgb7v59vzkffik2w5yp833la4mq6sp6sgnm0ylgya"; + version = "1.2.0.1"; + sha256 = "0swxc78vz1rj3q994cdnadgkanzcpm8rshvs2q49534rc2s6gq4g"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -47206,8 +47300,8 @@ self: { pname = "bytes"; version = "0.17"; sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3"; - revision = "4"; - editedCabalFile = "0vxmahjxskyddq3gmr2b2ix5h33ywk6fmv17vqfbh8mhfbb26113"; + revision = "5"; + editedCabalFile = "0a089bz9sjnmv3f5w9jsm1b7g60qx8qxqj76lwjj0mslzi9iajk2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable @@ -48148,8 +48242,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.3.0.1"; - sha256 = "0cl588kqsmq8vpnd96knqp6bllbc1kznfgs786vccvq7s4zxna6v"; + version = "0.3.0.2"; + sha256 = "0hyjb8y4zf7qccyzsms98sd0kgz83q1aqfhgx2f3dq1nprhbg9ld"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3; @@ -48751,8 +48845,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.4"; - sha256 = "12z9gz1afra0fqd79j1r9fsdc7k8r6v1saw14l42kd2dqxdjqwcf"; + version = "0.4.1"; + sha256 = "1djw4l0z8nsaby2qcm08kvn2p1c35ynzdg25vc815dx2wpw38bh3"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49668,8 +49762,8 @@ self: { }: mkDerivation { pname = "caerbannog"; - version = "0.6.0.3"; - sha256 = "0mv10cc50365kz2ad36wivvhcyl43bwxjp71f0n9vq2ndrmb4dna"; + version = "0.6.0.4"; + sha256 = "0zm6vdbsb947nd3wcniyk8mjs52r6hwyyp64w1abnazajraqask8"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec QuickCheck random @@ -49936,8 +50030,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.24.2"; - sha256 = "03z9wkvb75vib5m15ml2mrkdq2jgdnjnjp77wdb494xj50g3wgqn"; + version = "0.1.25.1"; + sha256 = "17i8l2p314bifa5cfqvpy89m0yh9m1m4120cjc71ir2lb35wj9lf"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -53124,23 +53218,22 @@ self: { "chart-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Color, concurrency - , cubicbezier, doctest, foldl, generic-lens, JuicyPixels, lens - , linear, lucid, numhask, numhask-space, reanimate, reanimate-svg - , scientific, tagsoup, text, time, transformers - , unordered-containers, vector + , containers, cubicbezier, doctest, foldl, generic-lens + , JuicyPixels, lens, linear, lucid, numhask, numhask-space + , reanimate, reanimate-svg, scientific, tagsoup, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "chart-svg"; - version = "0.2.0"; - sha256 = "1w7381r9zfj02c5r6fbza1x2qdxyqpgb3dj2wld73pzcladszp34"; - revision = "1"; - editedCabalFile = "18ilaajn42jni3pgzyc9f7z6ph3jyf0wrjfv9jnsp3ypyjj7yjn3"; + version = "0.2.2"; + sha256 = "184hpqkc9fvn64bg550clwxvjg2ii8igcl7nq3895pgi0cxxr0p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base Color cubicbezier foldl generic-lens JuicyPixels - lens linear lucid numhask numhask-space reanimate reanimate-svg - scientific tagsoup text time transformers unordered-containers + attoparsec base Color containers cubicbezier foldl generic-lens + JuicyPixels lens linear lucid numhask numhask-space reanimate + reanimate-svg scientific tagsoup text time transformers + unordered-containers ]; executableHaskellDepends = [ attoparsec base bytestring concurrency foldl JuicyPixels lens @@ -54132,6 +54225,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "chronos_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, HUnit, old-locale, primitive + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, thyme, time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.1.2"; + sha256 = "0izzg5cnnw53m3pfxglpj96i88h1qx75w04n6a67855xly4dfyxa"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq hashable primitive + semigroups text torsor vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring deepseq doctest HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text thyme time vector + ]; + description = "A high-performance time library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -54160,8 +54281,8 @@ self: { pname = "chs-cabal"; version = "0.1.1.0"; sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5"; - revision = "1"; - editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10"; + revision = "2"; + editedCabalFile = "1axn8xmnrk42j1b8bxykbrqjy1ia0ajg27jirjb2gix1vvvpxb1d"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = lib.licenses.bsd3; @@ -56031,8 +56152,8 @@ self: { }: mkDerivation { pname = "clickhouse-haskell"; - version = "0.1.2.3"; - sha256 = "1sa9jbiw8j04plk26p7n25plq0ymzsw7vqln0y6kbn3k30panyqg"; + version = "0.1.2.4"; + sha256 = "0c9847024crxiql09l55cx4881sv6lpzhhrwvhvb6f5548403iqg"; libraryHaskellDepends = [ aeson array async attoparsec base binary bytestring bytestring-to-vector call-stack containers data-default-class @@ -57404,8 +57525,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.13"; - sha256 = "0qi07canqwnwfvmbsp1j9lyklnn8h909r6js94xlpin1qa7dpjda"; + version = "0.1.3.14"; + sha256 = "1vkjnyzcl44h9b24k1h5mz61gdz42bs64ifxwijx8a2a72mwmaa6"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57463,8 +57584,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.2"; - sha256 = "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz"; + version = "0.2.1"; + sha256 = "1aiavczjk6f2kc1cdwjc1mwkr4d9shiz3xwmfbzsdn0yqqchxydj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Windows code page library for Haskell"; @@ -58850,8 +58971,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.1.3"; - sha256 = "1hwbii1d56979l0svvjayzhmwa25s66l36bb08hjq6p36lkv2a1v"; + version = "0.1.1.4"; + sha256 = "0dpm110svgdf21lf5sfbzjcfryn0v6hhjcs8kkyf167kng2sclfn"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -61639,6 +61760,8 @@ self: { pname = "config-schema"; version = "1.2.1.0"; sha256 = "1p5nhvhq7q5s67l4h4zb19ali5jbxrz9mb5cwzhykqmqji56n5vf"; + revision = "1"; + editedCabalFile = "056iks8k9lhbv34pqk8nisqc7vwzqq0shknixbpkd3vgbd3yksyf"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -61673,6 +61796,8 @@ self: { pname = "config-value"; version = "0.8.1"; sha256 = "086jv01a737547w6x9w1951vq0p7mx6vqw9ifw5kcs5nvhj5rx2q"; + revision = "1"; + editedCabalFile = "0wa3grq566fpkq5g9bcszwjv96drq6b3qg2w32rv8m00pd1j0n27"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -67211,28 +67336,28 @@ self: { }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, curry-base - , directory, extra, file-embed, filepath, mtl, network-uri, pretty - , process, set-extra, template-haskell, transformers + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , directory, extra, file-embed, filepath, mtl, network-uri, parsec + , pretty, process, set-extra, template-haskell, time, transformers }: mkDerivation { pname = "curry-frontend"; - version = "1.0.4"; - sha256 = "1dfljqyrp9w0sw3zmyy9rglpnjv14qj8ky1yjslmiaanjnl0m07b"; + version = "2.0.0"; + sha256 = "0bfqb922drarbjig3a35frf29cc4qa9mw789p5m0d88iwgkhvqnr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed + base binary bytestring containers directory extra file-embed + filepath mtl network-uri parsec pretty process set-extra + template-haskell time transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring Cabal containers directory extra file-embed filepath mtl network-uri pretty process set-extra template-haskell transformers ]; - executableHaskellDepends = [ - base bytestring containers curry-base directory extra file-embed - filepath mtl network-uri pretty process set-extra template-haskell - transformers - ]; - testHaskellDepends = [ base Cabal curry-base filepath ]; description = "Compile the functional logic language Curry to several intermediate formats"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -68391,8 +68516,8 @@ self: { }: mkDerivation { pname = "data-ascii"; - version = "1.0.0.2"; - sha256 = "03lxcybzamd1d5lrd1i9ygr5s094cr9ch2jdk5fx5hjg4bkigdds"; + version = "1.0.0.4"; + sha256 = "17pb1kmqln7cswsc4c7xipq619aj2y0kjhrcm23r8b39c0g02scy"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text @@ -68401,6 +68526,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-ascii_1_0_0_6" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , hashable, semigroups, text + }: + mkDerivation { + pname = "data-ascii"; + version = "1.0.0.6"; + sha256 = "0j8mk1gdxcczhwcs75rx50zh6vxv2vkd1rf5n6q4ryn8wm5r3gcr"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive hashable semigroups + text + ]; + description = "Type-safe, bytestring-based ASCII values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-aviary" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -69089,17 +69231,6 @@ self: { }) {}; "data-fix" = callPackage - ({ mkDerivation, base, deepseq, hashable }: - mkDerivation { - pname = "data-fix"; - version = "0.3.0"; - sha256 = "184rz8ypgrb3sxy9wiaq321d82p689w7dcwkc0qkjlabd7nv6ncy"; - libraryHaskellDepends = [ base deepseq hashable ]; - description = "Fixpoint data types"; - license = lib.licenses.bsd3; - }) {}; - - "data-fix_0_3_1" = callPackage ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "data-fix"; @@ -69108,7 +69239,6 @@ self: { libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-fix-cse" = callPackage @@ -70054,8 +70184,8 @@ self: { }: mkDerivation { pname = "data-validation"; - version = "0.1.2.4"; - sha256 = "1ck7grirqv0hbi973fgbgwzflsmz8diwi1rmjmfxz1f3915vi1yz"; + version = "0.1.2.5"; + sha256 = "0xma425fsnqczw2csknms75zx9i5nfnjc3nqcxlqi9xbxv2fksi6"; libraryHaskellDepends = [ base containers template-haskell ]; testHaskellDepends = [ base containers hspec regex-tdfa template-haskell @@ -72334,8 +72464,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.4.0.2"; - sha256 = "0jnby6k89ink5dh12y5cc4ws8nn2cwhchnqqxyxwd29pwrx0vmx6"; + version = "0.4.4.0"; + sha256 = "1qknqh9j7nvyy15zfi3prx6bifp2nd72kgfd085p478z887i71r4"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ base doctest mtl rank2classes sop-core tasty tasty-hunit @@ -72346,17 +72476,18 @@ self: { }) {}; "dep-t-advice" = callPackage - ({ mkDerivation, base, criterion, dep-t, doctest, mtl, rank2classes - , sop-core, tasty, tasty-hunit, template-haskell, transformers + ({ mkDerivation, barbies, base, criterion, dep-t, doctest, mtl + , rank2classes, sop-core, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "dep-t-advice"; - version = "0.4.0.1"; - sha256 = "11qjlidmjn2z1gnngrssdzm8hqiq9a54jksp9al8wzflf31jgh0i"; + version = "0.4.6.0"; + sha256 = "1v1nn0qbr3l7hh3f5aw6ril8ifzg6r8im7gpyj5plfbp272v4gs9"; libraryHaskellDepends = [ base dep-t sop-core transformers ]; testHaskellDepends = [ - base dep-t doctest mtl rank2classes sop-core tasty tasty-hunit - template-haskell transformers + barbies base dep-t doctest mtl rank2classes sop-core tasty + tasty-hunit template-haskell transformers ]; benchmarkHaskellDepends = [ base criterion dep-t mtl rank2classes sop-core template-haskell @@ -72940,8 +73071,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "derulo"; - version = "1.0.9"; - sha256 = "1rpxbg0g44813b0mlkifiav2w04wy56n1zlnqk5jcibdbmi6yagi"; + version = "1.0.10"; + sha256 = "0mdmrzypl0hjbnwn9ij1bjfk4j07r0c9gw7h3wdhl82a8zcxggpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -73572,6 +73703,8 @@ self: { pname = "dhall-docs"; version = "1.0.4"; sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; + revision = "2"; + editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73637,6 +73770,8 @@ self: { pname = "dhall-json"; version = "1.7.5"; sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; + revision = "1"; + editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73686,6 +73821,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.13"; sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; + revision = "2"; + editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73711,6 +73848,8 @@ self: { pname = "dhall-nix"; version = "1.1.20"; sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; + revision = "1"; + editedCabalFile = "16hz1i0vkp1qsqf9dm0d9pc1kap02nzdalzjpiw2r8p3qbykaann"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74926,8 +75065,8 @@ self: { }: mkDerivation { pname = "differential"; - version = "0.2.0.0"; - sha256 = "1dzxqva176dw22bb4hlv8dfizkzqsj5z9qdv7piwdh171nd9bwqd"; + version = "0.2.0.1"; + sha256 = "0xmsrc92jxd78b3vri3sf37w1w7c8nl7wc36gsqamd00laia95xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75957,8 +76096,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.2"; - sha256 = "0gw2c5fb4i6j5prmbj20fsnmci34kbzx3gk8pv93i33jndbs6g6h"; + version = "1.8.3"; + sha256 = "0adpb7wzij9n5f2xxqy9j8n3rx0bjg7z1lk0p212zkygabw297mi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77975,7 +78114,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest_0_17" = callPackage + "doctest_0_18" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery , process, QuickCheck, setenv, silently, stringbuilder, syb @@ -77983,8 +78122,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.17"; - sha256 = "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz"; + version = "0.18"; + sha256 = "1yqrmjg3rn1vy0p6a6j78gnnl8lx4hzi0rwhpl5ljb4q6kzyc3x4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78458,6 +78597,59 @@ self: { broken = true; }) {}; + "dormouse-client" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, dormouse-uri, hedgehog, hspec + , hspec-discover, hspec-hedgehog, http-api-data, http-client + , http-client-tls, http-types, mtl, safe-exceptions, scientific + , streamly, streamly-bytestring, template-haskell, text, vector + }: + mkDerivation { + pname = "dormouse-client"; + version = "0.1.0.1"; + sha256 = "033299c0rc6hsg51pg7igb5fnf8w200ckazmyjk23d1h48mz7gcg"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + dormouse-uri http-api-data http-client http-client-tls http-types + mtl safe-exceptions streamly streamly-bytestring template-haskell + text + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + dormouse-uri hedgehog hspec hspec-discover hspec-hedgehog + http-api-data http-client http-client-tls http-types mtl + safe-exceptions scientific streamly streamly-bytestring + template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Simple, type-safe and testable HTTP client"; + license = lib.licenses.bsd3; + }) {}; + + "dormouse-uri" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, case-insensitive + , containers, hedgehog, hspec, hspec-discover, hspec-hedgehog + , http-types, safe-exceptions, scientific, template-haskell, text + , vector + }: + mkDerivation { + pname = "dormouse-uri"; + version = "0.1.0.1"; + sha256 = "04ps9k4dhg9xk7al12y757lxl45dfa0aczirdkyks28cavlpr07b"; + libraryHaskellDepends = [ + attoparsec base bytestring case-insensitive containers http-types + safe-exceptions template-haskell text + ]; + testHaskellDepends = [ + attoparsec base bytestring case-insensitive containers hedgehog + hspec hspec-discover hspec-hedgehog http-types safe-exceptions + scientific template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for type-safe representations of Uri/Urls"; + license = lib.licenses.bsd3; + }) {}; + "dot" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -79005,22 +79197,24 @@ self: { "dprox" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, dns - , hspec, iproute, network, optparse-applicative, streaming-commons - , unix, unordered-containers + , hashable, hspec, iproute, network, optparse-applicative, psqueues + , streaming-commons, time, unix, unordered-containers }: mkDerivation { pname = "dprox"; - version = "0.1.2.1"; - sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz"; + version = "0.2.0"; + sha256 = "0hylymdpvnh353rg9gh8d9m9ag8hfxjh2ndrdxvhapbpddbbz3qm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base bytestring containers dns iproute network - optparse-applicative streaming-commons unix unordered-containers + attoparsec base bytestring containers dns hashable iproute network + optparse-applicative psqueues streaming-commons time unix + unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers dns hspec iproute network - optparse-applicative streaming-commons unix unordered-containers + attoparsec base bytestring containers dns hashable hspec iproute + network optparse-applicative psqueues streaming-commons time unix + unordered-containers ]; description = "a lightweight DNS proxy server"; license = lib.licenses.bsd3; @@ -81789,10 +81983,12 @@ self: { pname = "either-result"; version = "0.3.1.0"; sha256 = "1l4539j0ynn5jl0rh9bhjxlgvr0sn3bf8ws1zrlbfk15524znqhm"; + revision = "1"; + editedCabalFile = "1bmcvhjw53nhkzm99dzjq1mvj8s7b27ji2h8av5zy2wsniknrzbm"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; - description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’"; + description = "The simplest ‘MonadFail’ instance"; license = lib.licenses.asl20; }) {}; @@ -88177,8 +88373,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.5"; - sha256 = "0v7hd609315lvkkvk00f0q6jkp87hi0zy9zf18b5rkbwalx12avp"; + version = "1.0.1.6"; + sha256 = "1yqld2b6lbxl9sw9yp3dy184189nhfs7q4shnyrzc0m000hxgwkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88446,6 +88642,8 @@ self: { pname = "fast-tags"; version = "2.0.0"; sha256 = "0q2ijh1pdxzm57557vln195mmxs15wra9159vpsjvjda4gnd7bs6"; + revision = "1"; + editedCabalFile = "18q3hzl178a3hzxmvb79y1g9r29b6dxfq9nczwk2g3pqmi9qnbmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88947,6 +89145,38 @@ self: { broken = true; }) {}; + "fbrnch" = callPackage + ({ mkDerivation, aeson, async, base, bugzilla-redhat, bytestring + , config-ini, directory, email-validate, extra, filepath, haxr + , http-conduit, http-directory, http-query, lens, lens-aeson, mtl + , network-uri, optparse-applicative, pretty-terminal, process + , rpmbuild-order, simple-cmd, simple-cmd-args, text, time + , typed-process, unordered-containers, utf8-string, xdg-basedir + }: + mkDerivation { + pname = "fbrnch"; + version = "0.7.1"; + sha256 = "05gs3r9c67xvpkpg968aj0ym39qakazbycjlb8wnys5ijc0iwa7w"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory filepath haxr http-query lens + lens-aeson mtl text time unordered-containers + ]; + executableHaskellDepends = [ + aeson async base bugzilla-redhat bytestring config-ini directory + email-validate extra filepath http-conduit http-directory + http-query network-uri optparse-applicative pretty-terminal process + rpmbuild-order simple-cmd simple-cmd-args text time typed-process + utf8-string xdg-basedir + ]; + doHaddock = false; + description = "Build and create Fedora package repos and branches"; + license = lib.licenses.gpl2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fca" = callPackage ({ mkDerivation, base, bytestring, containers, cryptohash, hashable , text, unordered-containers @@ -90918,8 +91148,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "2.0.0.0"; - sha256 = "19b0sm9lb5k459bhq51srx5rcdgk9rjhfha34a3kcsmlqam9fak7"; + version = "2.1.1.0"; + sha256 = "1ip1l809d7wnhiyz522g34kzsvv2r9hz1l065jqlrwf1pnhgsv0c"; libraryHaskellDepends = [ base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell @@ -90938,20 +91168,21 @@ self: { ({ mkDerivation, base, binary, bitvec, coercible-utils, deepseq , finitary, finite-typelits, ghc-typelits-extra , ghc-typelits-knownnat, hashable, hedgehog, hedgehog-classes - , transformers, vector, vector-binary-instances, vector-instances + , integer-gmp, primitive, vector, vector-binary-instances + , vector-instances }: mkDerivation { pname = "finitary-derive"; - version = "2.2.0.0"; - sha256 = "11nkryzbhkbz4v2i4kwaggw67nlhs5jljqczmvliyz1df75f5kh3"; + version = "3.0.0.1"; + sha256 = "1l8xh7azssfgwvr78jaklj6dagmjpbx5ad4j6kzx104khj0skpqy"; libraryHaskellDepends = [ base binary bitvec coercible-utils deepseq finitary finite-typelits - ghc-typelits-extra ghc-typelits-knownnat hashable transformers - vector vector-binary-instances vector-instances + ghc-typelits-extra ghc-typelits-knownnat hashable integer-gmp + primitive vector vector-binary-instances vector-instances ]; testHaskellDepends = [ base binary deepseq finitary finite-typelits hashable hedgehog - hedgehog-classes + hedgehog-classes vector ]; description = "Flexible and easy deriving of type classes for finitary types"; license = lib.licenses.gpl3Plus; @@ -90967,6 +91198,8 @@ self: { pname = "finitary-optics"; version = "1.0.0.0"; sha256 = "0is930yhcd1iqgbxn42ldzbh408inpsprw9psvnx61j6qm6p4cd7"; + revision = "2"; + editedCabalFile = "17qm24b8v61h9m0vjxcx6c89qm93c5lc5y3nb79b7xzfzx3y4zv4"; libraryHaskellDepends = [ base finitary finite-typelits optics-core ]; @@ -92378,8 +92611,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; - version = "1.0.21"; - sha256 = "1zig5jwqflcs6akhxqkn9h7iwq7ypaz4cx7zwbqfy7sap6sdq2il"; + version = "1.0.22"; + sha256 = "1xsifahlma8x130d8hc1k5hzcf1kr8qg8xxh67lshbvarrg19air"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; @@ -98455,6 +98688,21 @@ self: { license = lib.licenses.mit; }) {}; + "generic-labels" = callPackage + ({ mkDerivation, base, Cabal, generic-lens-core, inspection-testing + }: + mkDerivation { + pname = "generic-labels"; + version = "0.1.0.1"; + sha256 = "0wv4wsg53zrj01d6ddz6vpdjy427ag76snm1m14775vqq4n00v3z"; + revision = "1"; + editedCabalFile = "0kdxjh0sa16l1gcgdw9mnpd1zs0w1al47mvy912bzmm2m1dmbjdk"; + libraryHaskellDepends = [ base generic-lens-core ]; + testHaskellDepends = [ base Cabal inspection-testing ]; + description = "Generically extract and replace collections of record fields"; + license = lib.licenses.bsd3; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text @@ -100498,8 +100746,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.3.20201220"; - sha256 = "04df1j997m48vjxkfcp07d9vsxgpqi315zvfri1y1qxdg5g4vlmb"; + version = "8.10.4.20210206"; + sha256 = "1zzglnpbnj9ijna6g3rmykqir3iqcg2afmjg9q0ng3imbv40slhs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100510,15 +100758,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_0_1_20210205" = callPackage + "ghc-lib_9_0_1_20210207" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "9.0.1.20210205"; - sha256 = "1kj69qbz7yv943ybbnmk2xvrba9220ky4cmx3d1vxzjg951x1ici"; + version = "9.0.1.20210207"; + sha256 = "1fi62pq18s63w4y6xrjq9zlcra8dk5xqjax8kyyvfrjaaxqci8qk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -100538,8 +100786,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.3.20201220"; - sha256 = "0k68w2v5x68sxqcd7xm94khmr4gqxbj4jdsaac3m1wcy66bjriir"; + version = "8.10.4.20210206"; + sha256 = "07j3j67hxz43l1kkdfanghd935wiccvmw7sgk47fjymw6fdx92p2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100550,15 +100798,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_0_1_20210205" = callPackage + "ghc-lib-parser_9_0_1_20210207" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.0.1.20210205"; - sha256 = "1lzqbm1nrnw1bydjd9py82rlzznxnnbplzjx80sn966kyyxmlr8v"; + version = "9.0.1.20210207"; + sha256 = "1gikdcgcgw1paxs5igxgxdfvpjp23963f6vn83m0a6vr88n2haah"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -100578,8 +100826,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.17"; - sha256 = "16qbyvczncdb25g7mjdvxsn7m3j98649jy1pnv90vmyrn8l4m897"; + version = "8.10.0.19"; + sha256 = "0qdkqv7ss9b2mnf39gpbq7i50ypccnl3wdmxiq148zrxbglzfqw9"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-boot-th uniplate ]; @@ -100591,21 +100839,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_9_0_0_1" = callPackage + "ghc-lib-parser-ex_9_0_0_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra - , filepath, ghc, ghc-boot, ghc-boot-th, ghc-lib-parser, tasty - , tasty-hunit, uniplate + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.0.0.1"; - sha256 = "03a98bn50bhqvfrchd5fx0w2x4ddb3ap78wikbb3hfhcgq4843nl"; + version = "9.0.0.3"; + sha256 = "1kc6p5ciymq8rbgk4jj1hawmjhkj1yjzkxj9jjyqlgzs09i3dsw3"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; testHaskellDepends = [ - base directory extra filepath ghc ghc-boot ghc-boot-th tasty - tasty-hunit uniplate + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate ]; description = "Algorithms on GHC parse trees"; license = lib.licenses.bsd3; @@ -101209,6 +101456,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_7_5" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.7.5"; + sha256 = "1xraiil3nq02jdb4blkmsrdp36qhykv2xvwg3kaiyw5bgfl15gl3"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra , integer-gmp, tasty, tasty-hunit, template-haskell, transformers @@ -101267,15 +101535,16 @@ self: { }) {}; "ghc-vis" = callPackage - ({ mkDerivation, base, cairo, containers, deepseq, fgl - , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers - , xdot + ({ mkDerivation, base, Cabal, cairo, containers, deepseq, fgl + , filepath, ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text + , transformers, xdot }: mkDerivation { pname = "ghc-vis"; - version = "0.9.1"; - sha256 = "1sqs6hkc2yf7nlbawadzychni8hbl6h9qclf7k11dfrfaqj10f4z"; + version = "0.9.2"; + sha256 = "1i7sx0ffbgfskhj27wnh9f8qldf4fqxmshlmqvajsrg9n5v5i772"; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl svgcairo text transformers xdot @@ -101494,65 +101763,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, case-insensitive, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, fingertree - , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hls-plugin-api, hslogger, implicit-hie-cradle, lens, lsp-test - , mtl, network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake - , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure - , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time - , transformers, unix, unordered-containers, utf8-string, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "0.7.0.0"; - sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - case-insensitive containers cryptohash-sha1 data-default deepseq - directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types heapsize hie-bios hie-compat hls-plugin-api - hslogger implicit-hie-cradle lens mtl network-uri opentelemetry - parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa - rope-utf16-splay safe safe-exceptions shake sorted-list stm syb - text time transformers unix unordered-containers utf8-string - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hls-plugin-api lens lsp-test optparse-applicative process - safe-exceptions shake text unordered-containers - ]; - testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library - haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test - network-uri optparse-applicative process QuickCheck - quickcheck-instances record-dot-preprocessor record-hasfield - rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text - ]; - benchmarkHaskellDepends = [ - aeson base directory filepath shake shake-bench text yaml - ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ maralorn ]; - broken = true; - }) {shake-bench = null;}; - - "ghcide_0_7_3_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, case-insensitive, containers, cryptohash-sha1 , data-default, deepseq, directory, dlist, extra, filepath @@ -101615,6 +101825,72 @@ self: { broken = true; }) {shake-bench = null;}; + "ghcide_0_7_4_0" = callPackage + ({ mkDerivation, aeson, array, async, base, base16-bytestring + , binary, bytestring, bytestring-encoding, case-insensitive + , containers, cryptohash-sha1, data-default, deepseq, Diff + , directory, dlist, extra, filepath, fingertree, fuzzy, ghc + , ghc-boot, ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat + , hiedb, hls-plugin-api, hp2pretty, hslogger, implicit-hie-cradle + , lens, lsp-test, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unordered-containers + , utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "0.7.4.0"; + sha256 = "00f2p18g6w7vf2a344fr4k0rg7spnbri76d1by7403g1daqwkar9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq Diff directory dlist extra filepath fingertree + fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths + Glob haddock-library hashable haskell-lsp haskell-lsp-types + heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger + implicit-hie-cradle lens mtl network-uri opentelemetry parallel + prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + rope-utf16-splay safe safe-exceptions shake sorted-list + sqlite-simple stm syb text time transformers unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath ghc gitrev hashable haskell-lsp haskell-lsp-types heapsize + hie-bios hiedb hls-plugin-api lens lsp-test optparse-applicative + process safe-exceptions shake text unordered-containers + ]; + testHaskellDepends = [ + aeson base binary bytestring containers data-default directory + extra filepath ghc ghc-typelits-knownnat haddock-library + haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test + network-uri optparse-applicative process QuickCheck + quickcheck-instances record-dot-preprocessor record-hasfield + rope-utf16-splay safe safe-exceptions shake tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text + ]; + benchmarkHaskellDepends = [ + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml + ]; + benchmarkToolDepends = [ hp2pretty ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + broken = true; + }) {shake-bench = null;}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -103965,8 +104241,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.3.5"; - sha256 = "0z2sb9avhkq2mgj0pwlji5c2sjxd71628q1i3nhlbajfyms1bsqz"; + version = "1.3.6"; + sha256 = "07cxai2h6alyka0bsfch7vfjsvp3s9d48jw4n6z74kmxq3zdrgxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108097,8 +108373,8 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.1.2"; - sha256 = "1qbh23sqx0jvwrmhb88683z3rx31jy99xh8h24iqv1ykmjvmqwvf"; + version = "0.1.3"; + sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109636,8 +109912,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.11.0.0"; - sha256 = "1jg0cdyq0z1r752cx9mnbxj2rxd5s723zfvpk3mwcsvx5ygkhm0p"; + version = "0.11.1.0"; + sha256 = "093gk2w2qrvarcv7xn0d0saa1j35cy0isw5vz04h08gy37s2nspc"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers @@ -109805,8 +110081,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.0.2"; - sha256 = "1fqrjfr9pl9619fhrkl3khpb2lg3svzp644hvzn0bpcnxqj5p41z"; + version = "2.0.0.3"; + sha256 = "1hmay1g8j1b8pq98blq1sizc61h7lj782sajlwrllgvxc826rjm2"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text transformers unliftio @@ -110149,6 +110425,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell_1_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.2.0.1"; + sha256 = "13hshwnhl0wdnnkqamgdgw2awsh1pynwfg35c34m5fcphbmxwmms"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -110170,6 +110468,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, hspec-discover, QuickCheck + , scientific, semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.6"; + sha256 = "1mfdi9sr0ic15bck6dv1k70cd0lnvimap9lqyhim2piz0f8jr53k"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + testToolDepends = [ doctest doctest-discover hspec-discover ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -110675,8 +110996,8 @@ self: { ({ mkDerivation, base, generic-data, groups }: mkDerivation { pname = "groups-generic"; - version = "0.1.0.0"; - sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad"; + version = "0.2.0.0"; + sha256 = "0a13x4dc114qz5r97cpg2bbdch1kn6gfmndf9glqx2nbhx6qg654"; libraryHaskellDepends = [ base generic-data groups ]; description = "Generically derive Group instances"; license = lib.licenses.bsd3; @@ -113500,8 +113821,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.21.0"; - sha256 = "1hxp8wl0jh30njd2z5g339qi3zlszy3br21d1pzarziwdabi9vcg"; + version = "1.22.1"; + sha256 = "0138hn6c7lrq9xjsmngdj1h2m2ayxx6wqqgjw66pv7sgxsfy0zji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118000,12 +118321,13 @@ self: { "haskell-language-server" = callPackage ({ mkDerivation, aeson, base, binary, blaze-markup, brittany , bytestring, containers, data-default, deepseq, directory, extra - , filepath, floskell, fourmolu, ghc, ghc-boot-th, ghc-paths, ghcide - , gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin - , hls-eval-plugin, hls-explicit-imports-plugin, hls-hlint-plugin - , hls-plugin-api, hls-retrie-plugin, hls-tactics-plugin, hslogger - , hspec, hspec-core, hspec-expectations, lens, lsp-test, mtl - , optparse-applicative, optparse-simple, ormolu, process + , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths + , ghcide, gitrev, hashable, haskell-lsp, hie-bios, hls-class-plugin + , hls-eval-plugin, hls-explicit-imports-plugin + , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api + , hls-retrie-plugin, hls-splice-plugin, hls-tactics-plugin + , hslogger, hspec, hspec-core, hspec-expectations, lens, lsp-test + , mtl, optparse-applicative, optparse-simple, ormolu, process , regex-tdfa, safe-exceptions, shake, stm, stylish-haskell, tasty , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit , tasty-rerun, temporary, text, transformers, unordered-containers @@ -118013,8 +118335,8 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "0.8.0.0"; - sha256 = "0s02llij5qb1z3na43zg51p5r80jpgwxkdv4mzi6m5xb7pppax42"; + version = "0.9.0.0"; + sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118024,17 +118346,18 @@ self: { ]; executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory - extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin - hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens - mtl optparse-applicative optparse-simple ormolu process regex-tdfa - safe-exceptions shake stylish-haskell temporary text transformers - unordered-containers with-utf8 + extra filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths + ghcide gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin + hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api + hls-retrie-plugin hls-splice-plugin hls-tactics-plugin hslogger + lens mtl optparse-applicative optparse-simple ormolu process + regex-tdfa safe-exceptions shake stylish-haskell temporary text + transformers unordered-containers with-utf8 ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default - directory extra filepath haskell-lsp hie-bios hls-plugin-api + directory extra filepath ghcide haskell-lsp hie-bios hls-plugin-api hslogger hspec hspec-core hspec-expectations lens lsp-test process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit tasty-rerun temporary text transformers @@ -118085,6 +118408,36 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp_0_23_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.23.0.0"; + sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -118154,6 +118507,24 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp-types_0_23_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , deepseq, filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.23.0.0"; + sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7"; + libraryHaskellDepends = [ + aeson base binary bytestring data-default deepseq filepath hashable + lens network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text @@ -118628,8 +118999,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "2"; - editedCabalFile = "1qrhcyr0y7j8la3970pg80w3h3pprsp3nisgg1l41wfsr2m7smnf"; + revision = "3"; + editedCabalFile = "0hjridmgm95lrb9qs972zicipsqcfwpr35gwkzxncpgwcm0vn0b6"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -120285,43 +120656,44 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring - , cereal, conduit, containers, data-default, deepseq, filepath - , hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis - , hspec, hspec-discover, http-types, lens, monad-logger, mtl - , network, nqe, optparse-applicative, QuickCheck, random - , rocksdb-haskell-jprupp, rocksdb-query, scotty, string-conversions - , text, time, transformers, unliftio, unordered-containers, wai - , warp, wreq + , cereal, conduit, containers, data-default, deepseq, ekg-core + , ekg-statsd, filepath, foldl, hashable, haskoin-core, haskoin-node + , haskoin-store-data, hedis, hspec, hspec-discover, http-types + , lens, monad-control, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp + , rocksdb-query, scotty, stm, string-conversions, text, time + , transformers, unliftio, unordered-containers, wai, warp, wreq }: mkDerivation { pname = "haskoin-store"; - version = "0.40.18"; - sha256 = "13zpl2kkirq0nl0sjblllm6gzfj82ghm3i18rh7ak9dxzavjnphy"; + version = "0.42.2"; + sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types lens monad-logger mtl network - nqe random rocksdb-haskell-jprupp rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp wreq + data-default deepseq ekg-core ekg-statsd foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe random + rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions + text time transformers unliftio unordered-containers wai warp wreq ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers - data-default deepseq filepath hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types lens monad-logger mtl network - nqe optparse-applicative random rocksdb-haskell-jprupp - rocksdb-query scotty string-conversions text time transformers - unliftio unordered-containers wai warp wreq + data-default deepseq ekg-core ekg-statsd filepath foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis http-types lens + monad-control monad-logger mtl network nqe optparse-applicative + random rocksdb-haskell-jprupp rocksdb-query scotty stm + string-conversions text time transformers unliftio + unordered-containers wai warp wreq ]; testHaskellDepends = [ aeson aeson-pretty base base64 bytestring cereal conduit containers - data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis hspec http-types lens monad-logger mtl - network nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers wai warp wreq + data-default deepseq ekg-core ekg-statsd foldl hashable + haskoin-core haskoin-node haskoin-store-data hedis hspec http-types + lens monad-control monad-logger mtl network nqe QuickCheck random + rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions + text time transformers unliftio unordered-containers wai warp wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -120339,8 +120711,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.40.2"; - sha256 = "08c2ga6j5himcprsyyd2jw3mygsj7if6i9h4mrg4m4v8x31vhg3f"; + version = "0.42.1"; + sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -123873,20 +124245,6 @@ self: { }) {}; "hedgehog-fakedata" = callPackage - ({ mkDerivation, base, containers, fakedata, hedgehog, random }: - mkDerivation { - pname = "hedgehog-fakedata"; - version = "0.0.1.3"; - sha256 = "0h0cf4y25453n52d4y1ximzdc9l04b17byd9kgjvc3c279866f1i"; - libraryHaskellDepends = [ base fakedata hedgehog random ]; - testHaskellDepends = [ base containers fakedata hedgehog ]; - description = "Use 'fakedata' with 'hedgehog'"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hedgehog-fakedata_0_0_1_4" = callPackage ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; @@ -128544,17 +128902,19 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, exceptions, foldl, HUnit - , optparse-applicative, path, path-io, stm, text, time, turtle + ({ mkDerivation, base, containers, exceptions, filepath, foldl + , gitrev, HUnit, optparse-applicative, path, path-io, stm, text + , time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.14.2.0"; - sha256 = "17a21rf2gj9hp7q0q7gg4znwa2j8xgrlxaq15akjn20sqp8l23ni"; + version = "0.14.3.0"; + sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions foldl path path-io stm text time turtle + base containers exceptions filepath foldl gitrev path path-io stm + text time turtle ]; executableHaskellDepends = [ base optparse-applicative path text turtle @@ -129063,28 +129423,6 @@ self: { }) {}; "hls-eval-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory - , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable - , haskell-lsp, haskell-lsp-types, hls-plugin-api - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-eval-plugin"; - version = "0.1.0.0"; - sha256 = "1rghn0p8qqh9vh0x1ib2w00vv74y8j9qj2ydhwc68viii03wpjan"; - libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers - ]; - description = "Eval plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-eval-plugin_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens @@ -129105,7 +129443,6 @@ self: { ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-exactprint-utils" = callPackage @@ -129134,6 +129471,8 @@ self: { pname = "hls-explicit-imports-plugin"; version = "0.1.0.0"; sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2"; + revision = "1"; + editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide haskell-lsp-types hls-plugin-api shake text unordered-containers @@ -129142,6 +129481,24 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-explicit-imports-plugin_0_1_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , haskell-lsp-types, hls-plugin-api, shake, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "0.1.0.1"; + sha256 = "0n36yk21wh9wklp8bnrg4b6qck2nf34m8p3fpilwpnzfchk6wr1y"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide haskell-lsp-types + hls-plugin-api shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-haddock-comments-plugin" = callPackage ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide , haskell-lsp-types, hls-plugin-api, text, unordered-containers @@ -129159,29 +129516,6 @@ self: { }) {}; "hls-hlint-plugin" = callPackage - ({ mkDerivation, aeson, apply-refact, base, binary, bytestring - , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghcide, hashable, haskell-lsp, hlint - , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq"; - revision = "1"; - editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghcide hashable - haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake - temporary text transformers unordered-containers - ]; - description = "Hlint integration plugin with Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-hlint-plugin_0_2_0_0" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp @@ -129200,30 +129534,9 @@ self: { ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, Diff - , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake - , text, unix, unordered-containers - }: - mkDerivation { - pname = "hls-plugin-api"; - version = "0.6.0.0"; - sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi"; - revision = "2"; - editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji"; - libraryHaskellDepends = [ - aeson base containers data-default Diff hashable haskell-lsp - hslogger lens process regex-tdfa shake text unix - unordered-containers - ]; - description = "Haskell Language Server API for plugin communication"; - license = lib.licenses.asl20; - }) {}; - - "hls-plugin-api_0_7_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default, Diff , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake , text, unix, unordered-containers @@ -129239,7 +129552,6 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage @@ -129250,8 +129562,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "0.1.0.0"; - sha256 = "1h928dvycyj4lxhn73zv58hgvc4yccr5dv7bbc6nsq62762f75j4"; + version = "0.1.1.0"; + sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions @@ -129290,6 +129602,8 @@ self: { pname = "hls-tactics-plugin"; version = "0.5.1.0"; sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52"; + revision = "1"; + editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -131489,8 +131803,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.7.0"; - sha256 = "1kj72jn0sfvf68lf9n2v7v2qqw1g3kjyr6s6zlyvs6p2k3fw4ync"; + version = "0.8.0"; + sha256 = "122caz296w8sfc0ma4zigssha8vbr8abgj9ajsr83jh9k68jy3d9"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -131506,8 +131820,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.7.1"; - sha256 = "1fhqlckfznmd5dhzsxgm40lynm790j8g4srf6y3g632dv7lccjwn"; + version = "0.8.0"; + sha256 = "0vkf5ajmdy7h88vfz2aq5zzq4mrnl4wi0dqn0rzzbr3rjpip42j6"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -131519,13 +131833,15 @@ self: { }) {}; "hoppy-runtime" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath }: + ({ mkDerivation, base, Cabal, containers, directory, filepath + , hoppy-generator + }: mkDerivation { pname = "hoppy-runtime"; - version = "0.7.0"; - sha256 = "0rkyili7kbxj22rvs4056vhcgwpjzgigmwcrj6iph5pfzxnnl40q"; + version = "0.8.0"; + sha256 = "123mn1sfwy01jyb803r4rhdqpdafmbkyip149ga1pvlaj272mlqy"; libraryHaskellDepends = [ - base Cabal containers directory filepath + base Cabal containers directory filepath hoppy-generator ]; description = "C++ FFI generator - Runtime support"; license = lib.licenses.asl20; @@ -131537,8 +131853,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.7.1"; - sha256 = "1y7xi347xq60p66avxgjyzxn9q7amjg1s43b9fln4v8f9ca0pwn7"; + version = "0.8.0"; + sha256 = "0ysbnhabnrr0jb8f9a06fqqxv2sy7ahj92jhw2bifnvjffk1pnqd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -132002,8 +132318,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.34.3"; - sha256 = "0gwqmv3p3g9551n405bxrwm7a5ysx3q72q04k5qmicb3mxwwxnff"; + version = "0.34.4"; + sha256 = "1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133139,6 +133455,24 @@ self: { license = lib.licenses.bsd3; }) {GeoIP = null;}; + "hs-aws-lambda" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, deepseq, http-client, http-types, safe-exceptions + , text, unliftio + }: + mkDerivation { + pname = "hs-aws-lambda"; + version = "0.1.0.2"; + sha256 = "078qkvxbjdsqgjmfq4fcpndb8c8cyz4g8s1q0ankpy359dvgxkv8"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers deepseq + http-client http-types safe-exceptions text unliftio + ]; + testHaskellDepends = [ base ]; + description = "A modern and easy-to-use wrapper for Docker-based Lambda implementations"; + license = lib.licenses.publicDomain; + }) {}; + "hs-bibutils" = callPackage ({ mkDerivation, base, syb }: mkDerivation { @@ -135196,8 +135530,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.2"; - sha256 = "1zw26rp206w5wq3qb2y35wjis2a3qvyip7k35f3ls4y530gw39bq"; + version = "0.1.2.4"; + sha256 = "17dhhjbynr7afjibv6fys45m2al422b6q3z7ncfycpwp6541qifm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -135749,15 +136083,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_3_0" = callPackage + "hslua_1_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.3.0"; - sha256 = "1dfh1jax6yrk5sf9q8qnq1qgr541xkwwnz9y3q6r8wflvwlj7cal"; + version = "1.3.0.1"; + sha256 = "1mz8zk13dhgaf24hmmjqnn5hcln96iw73mcjwjilag8388wq72k7"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -135815,8 +136149,8 @@ self: { }: mkDerivation { pname = "hslua-module-path"; - version = "0.1.0"; - sha256 = "18z6k9nlba0a1f0fdfw0cr0y5daa381dfmrinfp70c8r3dh7w7ny"; + version = "0.1.0.1"; + sha256 = "1zxfljcn74rky26ijqmba6grpj0h9plgr47wxdaf7gcz1y8dhn68"; libraryHaskellDepends = [ base filepath hslua text ]; testHaskellDepends = [ base filepath hslua tasty tasty-hunit tasty-lua text @@ -136671,6 +137005,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-need-env_0_1_0_6" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , hspec-expectations, setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.6"; + sha256 = "0drbjdm6wld2bnfmv2jqhw4ija9v85pa4p5aq9qgh1gs6c5d50bq"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + testToolDepends = [ hspec-discover ]; + description = "Read environment variables for hspec tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-parsec" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, parsec }: mkDerivation { @@ -142103,8 +142453,8 @@ self: { }: mkDerivation { pname = "hxt"; - version = "9.3.1.18"; - sha256 = "0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j"; + version = "9.3.1.21"; + sha256 = "1y2kyb7hyhx0vpkfyd0f11v2v7khk57qyfgqzk442x8qcibm3d9a"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri @@ -142151,8 +142501,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hxt-charproperties"; - version = "9.4.0.0"; - sha256 = "1bk88hj2pqlvcnyfncqyb9j7w9vvdxcq3cgr0w2l09c0abas23pm"; + version = "9.5.0.0"; + sha256 = "0jm98jddbsd60jc2bz8wa71rslagbaqf00ia7fvfsaiaa54nk0r8"; libraryHaskellDepends = [ base ]; description = "Character properties and classes for XML and Unicode"; license = lib.licenses.mit; @@ -142259,10 +142609,8 @@ self: { }: mkDerivation { pname = "hxt-regex-xmlschema"; - version = "9.2.0.3"; - sha256 = "1c4jr0439f5yc05h7iz53fa47g6l2wrvqp6gvwf01mlqajk3nx7l"; - revision = "1"; - editedCabalFile = "0vg9vnfjmq1ma6zwwv4yvfih6wbslksvsvy9b41i4f81l0hh7ia8"; + version = "9.2.0.7"; + sha256 = "0ynrf65m7abq2fjnarlwq6i1r99pl89npibxx05rlplcgpybrdmr"; libraryHaskellDepends = [ base bytestring hxt-charproperties parsec text ]; @@ -142967,8 +143315,8 @@ self: { pname = "hyphenation"; version = "0.8"; sha256 = "09c9xpygjnq7kqcaybls91s7g1cv40rg54dn9w1svk973h0lgyii"; - revision = "2"; - editedCabalFile = "0y10glmsgnc67f2y8d6irgwyz9fahg9dv2sidqx1r6rfbs02416i"; + revision = "3"; + editedCabalFile = "0krjvrk5hzcs101b5h95ai51wwq1fj04q1ryn63j1qmj22jpn4ki"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -146119,8 +146467,8 @@ self: { }: mkDerivation { pname = "inline-asm"; - version = "0.4.0.1"; - sha256 = "19djbqfidl8spii2y5a4qi5a6k2dhh9kg4lafxx58w60118rsv6z"; + version = "0.4.0.2"; + sha256 = "01npi02i8wf9b0pa18cgl78ma6r9xqz0i7dc3khkj1725w5wkhvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146412,21 +146760,21 @@ self: { ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring , containers, directory, ekg-core, exceptions, hslogger , http-client, http-client-tls, http-types, HUnit, network, process - , random, regex-base, regex-tdfa, retry, scientific, servant - , servant-server, stm, sysinfo, text, time, transformers, unix - , unordered-containers, wai, warp + , random, regex-base, regex-compat, regex-pcre, regex-tdfa, retry + , scientific, servant, servant-server, stm, sysinfo, text, time + , transformers, unix, unordered-containers, wai, warp }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.4.0.0"; - sha256 = "0cg1i7whiwg07zsby5zr3q3pqg24js3zvrd2rwlpfvqx1pkf3qxh"; + version = "0.5.0.1"; + sha256 = "1414c9jahmkszpag40iyzrr0g346dp9l1ssz60693ivcm0q16pii"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-extra base bytestring containers directory ekg-core exceptions hslogger http-client http-client-tls http-types network - process random regex-base regex-tdfa retry scientific stm sysinfo - text time unix unordered-containers wai + process random regex-base regex-compat regex-pcre regex-tdfa retry + scientific stm sysinfo text time unix unordered-containers wai ]; executableHaskellDepends = [ aeson base binary bytestring hslogger http-client http-types @@ -146436,7 +146784,8 @@ self: { testHaskellDepends = [ aeson aeson-extra base bytestring directory ekg-core exceptions hslogger http-client http-types HUnit process random regex-base - regex-tdfa retry scientific text unix unordered-containers + regex-compat regex-pcre regex-tdfa retry scientific text unix + unordered-containers ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = lib.licenses.mit; @@ -147273,8 +147622,8 @@ self: { pname = "intervals"; version = "0.9.1"; sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z"; - revision = "1"; - editedCabalFile = "0fz1g5nlh87qznpm5cnj6rn65wi9nw8k7daw43jng1f2v0svvxng"; + revision = "2"; + editedCabalFile = "1nrpc95wwifnlk7p9nw6xgcc74zw1k6krhvll7rr18ddjgfgv07x"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -147469,6 +147818,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "invert" = callPackage + ({ mkDerivation, base, containers, criterion, generic-deriving + , hashable, unordered-containers, vector + }: + mkDerivation { + pname = "invert"; + version = "1.0"; + sha256 = "18q070bawfnyi4wl6rxb6l5ihda0xzmlb8g1z0sg46vghvbs985v"; + revision = "2"; + editedCabalFile = "1829iy3jg0zwms16cqd4rdg5khl348ih44b3mz7l7cy9wlci3cli"; + libraryHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Automatically generate a function's inverse"; + license = lib.licenses.asl20; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -151296,8 +151665,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.11"; - sha256 = "1h9v71pvzi761ml0dpkmhd7w2l36s1v3rsq9zbshw87762710fy1"; + version = "1.0.12"; + sha256 = "0baav0mvprja5jdmndan6psxqm37173yvrjrr04kfxs9568dvzyf"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -155381,8 +155750,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.13"; - sha256 = "1a3gpr0gf1dhvy6lcqbgkf0iznjg62yav2xfnzps48wba5585dj0"; + version = "1.0.14"; + sha256 = "01yi2si0gakmjk66jmm93hz50nl7xa1zhmhcrhqn8ip0mkpncnqk"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -159182,8 +159551,8 @@ self: { pname = "lens"; version = "4.19.2"; sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; - revision = "4"; - editedCabalFile = "013cfgb5q2zq02pb8dlyzmb6sfp8k82af609srmqda26kccbyci2"; + revision = "5"; + editedCabalFile = "1r9rhblsw1g2y2lyf8vhps05hvx6jxs5r6y1rf868hxz0z242i7q"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -159247,8 +159616,8 @@ self: { pname = "lens-aeson"; version = "1.1"; sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; - revision = "3"; - editedCabalFile = "10zm8r29c3hb5saxv3ryr67nsg8rf4dk67yjwysasd3jpkxghj5p"; + revision = "4"; + editedCabalFile = "1wgk0nd0fxgdbqb6mkslj3gyrs9vdxpb83hvj2n2dcswg3ahwdsy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -159447,25 +159816,6 @@ self: { }) {}; "lens-process" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest, filepath - , lens, process, tasty, tasty-hunit - }: - mkDerivation { - pname = "lens-process"; - version = "0.3.0.2"; - sha256 = "1bv6z7309bq9jv2lzr79bcbwg1pkhy728pnrjnl3c3nv807a3igk"; - revision = "2"; - editedCabalFile = "1l71hi0a5yn5x9w4br5bzypa25zdlqw6jcb69z3bhb6dx53197ma"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base filepath lens process ]; - testHaskellDepends = [ - base doctest filepath lens process tasty tasty-hunit - ]; - description = "Optics for system processes"; - license = lib.licenses.bsd3; - }) {}; - - "lens-process_0_4_0_0" = callPackage ({ mkDerivation, base, filepath, lens, process, tasty, tasty-hunit }: mkDerivation { @@ -159478,7 +159828,6 @@ self: { ]; description = "Optics for system processes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lens-properties" = callPackage @@ -161164,21 +161513,17 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, containers, directory - , process - }: + ({ mkDerivation, base, Cabal, containers, directory, process }: mkDerivation { pname = "licensor"; - version = "0.4.2"; - sha256 = "1knmd13plijk4f1pzk8h3br69agjqzajgr9n3d180w6ask1iaz4z"; + version = "0.4.3"; + sha256 = "19ydisxc5yzm0ccj76p7sg39cpjg5c57wd3gaybc5k7bqrlv14c6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers directory process ]; - executableHaskellDepends = [ - base Cabal cmdargs containers directory - ]; + executableHaskellDepends = [ base Cabal containers directory ]; description = "A license compatibility helper"; license = lib.licenses.mit; }) {}; @@ -161857,6 +162202,32 @@ self: { broken = true; }) {}; + "linear-base" = callPackage + ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim + , hashable, hashtables, hedgehog, mmorph, primitive, random + , random-shuffle, storable-tuple, tasty, tasty-hedgehog, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "linear-base"; + version = "0.1.0"; + sha256 = "00n7rmvkjg42n1pba1y1lziw9a8gyhix15rw13qsyymi8bdr8k82"; + libraryHaskellDepends = [ + base containers ghc-prim hashable primitive storable-tuple text + transformers vector + ]; + testHaskellDepends = [ + base containers hedgehog mmorph storable-tuple tasty tasty-hedgehog + text vector + ]; + benchmarkHaskellDepends = [ + base deepseq gauge hashable hashtables random random-shuffle + unordered-containers + ]; + description = "Standard library for linear types"; + license = lib.licenses.mit; + }) {}; + "linear-circuit" = callPackage ({ mkDerivation, base, comfort-array, comfort-graph, containers , lapack, netlib-ffi, non-empty, QuickCheck, transformers @@ -163053,8 +163424,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-singleton"; - version = "1.0.0.4"; - sha256 = "0mb2kwj3gvykwh0iywwzqdnma27nxs1hl1rvnp3qxi893p4ikyiw"; + version = "1.0.0.5"; + sha256 = "1vbhg04dral59b6f43xcykgi6war5mcflmczwcmqfhy7lgb86r3n"; libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; license = lib.licenses.isc; @@ -164495,8 +164866,8 @@ self: { pname = "log-domain"; version = "0.13"; sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv"; - revision = "2"; - editedCabalFile = "1dylv7gijrm3jn9d1gab9xfqk7xpfb9qrlkaaqpf7b3q8qdswqzs"; + revision = "3"; + editedCabalFile = "10ajmxkjbbkdrkasgfd5hhjcbggrylrg00m1lafac53v97hqpyp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -164974,21 +165345,6 @@ self: { broken = true; }) {}; - "logict_0_7_0_3" = callPackage - ({ mkDerivation, base, mtl, tasty, tasty-hunit }: - mkDerivation { - pname = "logict"; - version = "0.7.0.3"; - sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; - revision = "1"; - editedCabalFile = "13hxmzaxd5iv9hjad5kw9infq0lxsgypqqb2z1i1939604a90qp4"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base mtl tasty tasty-hunit ]; - description = "A backtracking logic-programming monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "logict" = callPackage ({ mkDerivation, async, base, mtl, tasty, tasty-hunit }: mkDerivation { @@ -165852,6 +166208,24 @@ self: { broken = true; }) {}; + "lsfrom" = callPackage + ({ mkDerivation, base, directory, filepath, simple-cmd + , simple-cmd-args + }: + mkDerivation { + pname = "lsfrom"; + version = "0.1"; + sha256 = "04cv4x88r10b9zkfiy1kclq3dm79akg1p16djfad8h5x988c7bq1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath simple-cmd simple-cmd-args + ]; + testHaskellDepends = [ base directory filepath simple-cmd ]; + description = "List dir files starting from a specific name"; + license = lib.licenses.bsd3; + }) {}; + "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, dependent-map, directory, filepath @@ -165909,6 +166283,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_11_0_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.11.0.7"; + sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test_0_12_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -167028,6 +167430,8 @@ self: { pname = "machines"; version = "0.7.1"; sha256 = "0ayajyzaczdazfsmamlm5vap43x2mdm4w8v5970y1xlxh4rb3bs1"; + revision = "1"; + editedCabalFile = "1cp850vwzn213n0k9s5i62889a1wvmyi05jw6kmazaczcbcs7jsq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -174512,32 +174916,6 @@ self: { }) {}; "modern-uri" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-discover - , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck - , reflection, tagged, template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; - version = "0.3.3.0"; - sha256 = "184vhcnpwjsvxwbdsipz7kc2xylfwfqflbbbyipag610w07a3qk2"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = lib.licenses.bsd3; - }) {}; - - "modern-uri_0_3_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck @@ -174561,7 +174939,6 @@ self: { ]; description = "Modern library for working with URIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -178567,8 +178944,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.4.0.3"; - sha256 = "01sygrx80jfi6xygrgj2chqjr0fllld807p26rggfdzwp9p6pc9b"; + version = "0.4.0.4"; + sha256 = "06f3l7fwgx17cfa80a2inzx9255nqvk5q5fnlzvwhslymi8mb6xd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -180809,21 +181186,6 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql - }: - mkDerivation { - pname = "mysql"; - version = "0.1.7.2"; - sha256 = "0vkc39hx55hqwgkhqm80ckabbjaq4f9840msznf71glzihzg8k0n"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; - testHaskellDepends = [ base bytestring hspec ]; - description = "A low-level MySQL client library"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; - - "mysql_0_1_7_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql }: mkDerivation { @@ -180836,7 +181198,6 @@ self: { testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage @@ -182570,8 +182931,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.5"; - sha256 = "0y5jkkixrbm25z1vyhk5qmql1962jhhl6ifz8ba7fiwdv8qi1ndk"; + version = "0.4.3.6"; + sha256 = "1whi7v16zqa26c8a4a36g5p8gddk69acnxar3pgybyc58y9af0i1"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -182594,8 +182955,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.5"; - sha256 = "011s533mv5flvmq58vsr2fnydk954lkyfif6d9fs87555dwiskyd"; + version = "0.2.0.6"; + sha256 = "0byd87p7h6vrdmg7j7ypjq2mcks8a7axi9j9qnjv283y4n56nxw1"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -182615,8 +182976,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.3"; - sha256 = "0mjp5mvfp4hq8kna5f0pwmyc7s43ghhw91hc94n6xf6y4dnx0c2c"; + version = "0.2.0.4"; + sha256 = "13kw1yvppkh2z6zzlf5qfyfw2yyyvn48dr49ijvdrh0c11n4125l"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -184177,18 +184538,20 @@ self: { "network-uri" = callPackage ({ mkDerivation, base, criterion, deepseq, HUnit, parsec - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, th-compat }: mkDerivation { pname = "network-uri"; - version = "2.6.3.0"; - sha256 = "08x7myvjasm326byi3jz1hgv2fqk0vvkfiwi8zlc4b2xy64i6750"; - libraryHaskellDepends = [ base deepseq parsec template-haskell ]; - testHaskellDepends = [ - base criterion deepseq HUnit test-framework test-framework-hunit - test-framework-quickcheck2 + version = "2.6.4.1"; + sha256 = "111m485rx2kyqdymi1x6sl08hi6lp34q3f41yqcx99086swnv1ap"; + libraryHaskellDepends = [ + base deepseq parsec template-haskell th-compat ]; + testHaskellDepends = [ + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq HUnit ]; description = "URI manipulation"; license = lib.licenses.bsd3; }) {}; @@ -184623,24 +184986,6 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups - , transformers - }: - mkDerivation { - pname = "newtype-generics"; - version = "0.5.4"; - sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0"; - revision = "1"; - editedCabalFile = "1id9a6prj2bzdsyfsfr0pnfy9p8v9wlw59x12fny6y2szfcxcrv7"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base gauge semigroups ]; - description = "A typeclass and set of functions for working with newtypes"; - license = lib.licenses.bsd3; - }) {}; - - "newtype-generics_0_6" = callPackage ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups , transformers }: @@ -184654,7 +184999,6 @@ self: { benchmarkHaskellDepends = [ base gauge semigroups ]; description = "A typeclass and set of functions for working with newtypes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -192645,15 +192989,15 @@ self: { }) {}; "pandoc-sidenote" = callPackage - ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }: + ({ mkDerivation, base, mtl, pandoc-types, text }: mkDerivation { pname = "pandoc-sidenote"; - version = "0.19.0.0"; - sha256 = "0vz8w1dgzm0hipwfz5a1m41xkjdindr3373x6ip6vqv9h2gzzbb3"; + version = "0.22.1.0"; + sha256 = "1ci30gav385ygcvqs2x3w7lp8y1m7myf9jci3idxrd4w7csdg7f3"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ]; - executableHaskellDepends = [ base pandoc-types ]; + libraryHaskellDepends = [ base mtl pandoc-types text ]; + executableHaskellDepends = [ base mtl pandoc-types text ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -192767,8 +193111,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.5"; - sha256 = "1cw6wm122zwbn61980vqr2prsc3qpnnaqgk0m3wvxs03dygarpja"; + version = "0.3.6"; + sha256 = "12slj2jy688k4ndngwmjjkdvl2ryljv3siwal874pdficx0dffxg"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -194202,6 +194546,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "parser-combinators_1_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "1.3.0"; + sha256 = "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k"; + libraryHaskellDepends = [ base ]; + description = "Lightweight package providing commonly useful parser combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "parser-combinators-tests" = callPackage ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations , hspec-megaparsec, megaparsec, megaparsec-tests @@ -194226,6 +194582,28 @@ self: { broken = true; }) {}; + "parser-combinators-tests_1_3_0" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations + , hspec-megaparsec, megaparsec, megaparsec-tests + , parser-combinators, QuickCheck + }: + mkDerivation { + pname = "parser-combinators-tests"; + version = "1.3.0"; + sha256 = "0sw6ws7za93y3lbmxp6jp1k17zi3wdg7698ab133kcw82f6mzba2"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hspec hspec-expectations hspec-megaparsec megaparsec + megaparsec-tests parser-combinators QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Test suite of parser-combinators"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -194655,8 +195033,8 @@ self: { }: mkDerivation { pname = "password"; - version = "2.1.0.0"; - sha256 = "1v8hbjy0r6l0c6r0l4832z9whadx195fzxpn9l19zjb5ylz1zmqc"; + version = "2.1.1.0"; + sha256 = "1x3nv3bn0rp0f6rayrzp7yvw7x1ly7vjygcl6wdq86y0k1ca2wby"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory template-haskell text @@ -194678,8 +195056,8 @@ self: { }: mkDerivation { pname = "password-instances"; - version = "2.0.0.1"; - sha256 = "1az6j3yh92nr1ksh4f966y7v8v81l9l14r8qfakf5h62iznwqv2q"; + version = "2.0.0.2"; + sha256 = "03dl3b530m02y7mv2lvssamhakswa3d9bj2r2ndvg78wi0vm5xp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base http-api-data password persistent text @@ -197410,30 +197788,30 @@ self: { "persistent-sqlite" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers - , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger - , persistent, persistent-template, persistent-test, QuickCheck - , resource-pool, resourcet, sqlite, system-fileio, system-filepath - , temporary, text, time, transformers, unliftio-core - , unordered-containers + , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th + , monad-logger, mtl, persistent, persistent-template + , persistent-test, QuickCheck, resource-pool, resourcet, sqlite + , system-fileio, system-filepath, temporary, text, time + , transformers, unliftio-core, unordered-containers }: mkDerivation { pname = "persistent-sqlite"; - version = "2.11.0.0"; - sha256 = "1kfijsn00brqm42ypaa66bmwq41r9n6h66r6jmgldhzpcbv46sfv"; + version = "2.11.1.0"; + sha256 = "04rdzcckdkvs8nisx0hh96sdfyly82yr8c0mx6nsxpyi7m52by9j"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring conduit containers microlens-th monad-logger - persistent resource-pool resourcet text time transformers + mtl persistent resource-pool resourcet text time transformers unliftio-core unordered-containers ]; librarySystemDepends = [ sqlite ]; testHaskellDepends = [ - base bytestring containers exceptions fast-logger hspec HUnit - monad-logger persistent persistent-template persistent-test - QuickCheck resourcet system-fileio system-filepath temporary text - time transformers unliftio-core + base bytestring conduit containers exceptions fast-logger hspec + HUnit microlens monad-logger mtl persistent persistent-template + persistent-test QuickCheck resourcet system-fileio system-filepath + temporary text time transformers unliftio-core ]; description = "Backend for the persistent library using sqlite3"; license = lib.licenses.mit; @@ -199337,6 +199715,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes_4_3_15" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.15"; + sha256 = "01hvzm7cp6y3wrdhca3wlb99y0az0rjy5lscmnds0v6i767kyxk1"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -202375,6 +202777,21 @@ self: { broken = true; }) {}; + "polysemy-mocks" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, polysemy + , template-haskell + }: + mkDerivation { + pname = "polysemy-mocks"; + version = "0.1.0.0"; + sha256 = "04cgajjrlbiqij54k6agm1p6h4hv5lldb9f9yrzbwm0v69d02bs7"; + libraryHaskellDepends = [ base polysemy template-haskell ]; + testHaskellDepends = [ base hspec polysemy ]; + testToolDepends = [ hspec-discover ]; + description = "Mocking framework for polysemy effects"; + license = lib.licenses.bsd3; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -202651,10 +203068,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.2.0.0"; - sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; - revision = "1"; - editedCabalFile = "1srihzg6wm2ydg6kr3q2n7pqk4wp4mhqscansi670pdzblv7ljkn"; + version = "0.2.0.1"; + sha256 = "199yq3nzdhdglggk1pfayv8p6rahs9xzzm1hjkjd74asfbkf9wqg"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -202813,8 +203228,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.5"; - sha256 = "0y1plyfvjfbm4xwmc3khd4h089pk96p1krxchv5pnwqf0agxi5sv"; + version = "0.1.0.6"; + sha256 = "12av8vgnj9iy0bdcb13gc4x28n3c7ahb3221xla78sss5r4rhq0z"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -207143,16 +207558,15 @@ self: { "product-profunctors" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion - , deepseq, profunctors, tagged, template-haskell + , deepseq, profunctors, tagged, template-haskell, th-abstraction }: mkDerivation { pname = "product-profunctors"; - version = "0.11.0.1"; - sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; - revision = "1"; - editedCabalFile = "07k4g2jpxdh2n60b2wkngw6pklfh5fwf9360ih9m88dr7mi5c88n"; + version = "0.11.0.2"; + sha256 = "13q1zq5gli21khsxrgiwqilqfasb16hks5w0ikkm1i735z0pf97l"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell + th-abstraction ]; testHaskellDepends = [ base profunctors ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -210660,9 +211074,11 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.7.0"; - sha256 = "1i5h5j7cy94ab41x9aqkiv7vyx5h7cda8v1jccpna8lr7ccicczp"; - setupHaskellDepends = [ base Cabal directory filepath process ]; + version = "0.8.0"; + sha256 = "0k8zl9gzwfnnxkfclb20v0q3rl42bs1g9iw9vm5j0fhr934w38gs"; + setupHaskellDepends = [ + base Cabal directory filepath process qtah-generator + ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; description = "Qt bindings for Haskell - C++ library"; @@ -210677,8 +211093,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.7.0"; - sha256 = "09svfzi73gjy4bsz4snp1mciqin25xqr6n3kya8367q4j01mdrrv"; + version = "0.8.0"; + sha256 = "0wn0514xckbsj1phndb2b924lxh24sbngjgrvsn3sjg305vzizvr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -210691,23 +211107,21 @@ self: { }) {}; "qtah-generator" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, haskell-src, hoppy-generator, hoppy-std, mtl, process + ({ mkDerivation, base, bytestring, containers, directory, filepath + , haskell-src, hoppy-generator, hoppy-std, mtl, process , transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.7.1"; - sha256 = "0iizb1af1j9g4lvdz81c2cl57r6ffv07kqgls6cl9pgp43ikrjjb"; + version = "0.8.0"; + sha256 = "1s782f1gagj1av8xv30qjqs5r05i3fr7a05dp213i6p818kj20r1"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ + libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src hoppy-generator hoppy-std mtl process transformers ]; - doHaddock = false; + executableHaskellDepends = [ base ]; description = "Generator for Qtah Qt bindings"; license = lib.licenses.lgpl3; hydraPlatforms = lib.platforms.none; @@ -210721,9 +211135,11 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.7.0"; - sha256 = "0wndmrrz4c3gfx9wjj9v13zjjpjandg2qkq7fkxp5z3rgw4hmm8f"; - setupHaskellDepends = [ base Cabal directory filepath ]; + version = "0.8.0"; + sha256 = "187x961030hfw79xs0m9xgplm8jlglynya4ndsax378vdpnbrrgw"; + setupHaskellDepends = [ + base Cabal directory filepath qtah-generator + ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -212261,16 +212677,18 @@ self: { }) {}; "quote-quot" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, template-haskell }: + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck + , template-haskell + }: mkDerivation { pname = "quote-quot"; - version = "0.1.0.0"; - sha256 = "124rgim8bb4x9rqsvc05dcbz739anj2xg8q9v9s0fpjkv6qwl79b"; + version = "0.2.0.0"; + sha256 = "0sj862037gdljwiv5s4yh0vjfppzf226z7sxb5f7y1k23rijsx0w"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base tasty tasty-quickcheck template-haskell ]; - benchmarkHaskellDepends = [ base template-haskell ]; + benchmarkHaskellDepends = [ base tasty-bench template-haskell ]; description = "Divide without division"; license = lib.licenses.bsd3; }) {}; @@ -212859,12 +213277,12 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.1.0.1"; - sha256 = "0b0c8qkkj2xqmdd53q198kwm0n7qvdyh6qxmp24mqkpjcrskh6vl"; + version = "1.1.0.2"; + sha256 = "1lvzgdagjzvkxcdbc43n144vbva5vlvsjziz80rjzm7kg3mslg1r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; - description = "🏰 Determine how intervals relate to each other"; + description = "Determine how intervals relate to each other"; license = lib.licenses.isc; }) {}; @@ -213788,8 +214206,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.12"; - sha256 = "00xhs04jrrbi1n2sx86v4pd3sggyk2682s3zxfmhb16zysh3hdx2"; + version = "1.0.13"; + sha256 = "0ydg5xlf10g1wp18bwpr3mg9x29fyc1c5g22rn4szy0cs6hvqx6m"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -213805,8 +214223,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.1.3"; - sha256 = "154zxrv9w904bgrgwb623zkqxzp200ivhwfpcwlb8r2903jmw7vq"; + version = "1.1.4"; + sha256 = "1b2d5agip0zw10nmkr45gwhzpaga9nsdqv62xil11gadhaqji2f7"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -213945,8 +214363,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.3.3"; - sha256 = "0c2q48vbqkvhd0m3sahn7ja8bxpj9xkgw2hkg9chrhj0amyp5xzk"; + version = "9.4.1"; + sha256 = "1m8bqjqp413sm86v0i2083hnsq7h11hlmmqch1pxbgpv5678jq0q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214230,8 +214648,8 @@ self: { pname = "rcu"; version = "0.2.4"; sha256 = "1zl6gl6b9x2ppxzrvb356216f7gi1kpwxsqb0w220f86wyzf9gbr"; - revision = "1"; - editedCabalFile = "07blx598aqwkfgicsl7g7i9gf49550ln8zz0gp4g3kyxq8pvmphb"; + revision = "2"; + editedCabalFile = "1lblpsgprk26nplfzxkclvj6gsaim1b97njvrq564crryn6hn2wz"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -215621,6 +216039,17 @@ self: { broken = true; }) {}; + "redesigned-carnival" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "redesigned-carnival"; + version = "1.0.0.0"; + sha256 = "0qgb6w402fbpilb3gwa7r5v1lxx6dzk8g66cigsw062jfhdiy1hx"; + libraryHaskellDepends = [ base ]; + description = "Package for dependency confusion"; + license = lib.licenses.publicDomain; + }) {}; + "redis" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , exceptions, mtl, network, old-time, utf8-string @@ -222242,8 +222671,8 @@ self: { }: mkDerivation { pname = "rope-utf16-splay"; - version = "0.3.1.0"; - sha256 = "1ilcgwmdwqnp95vb7652fc03ji9dnzy6cm24pvbiwi2mhc4piy6b"; + version = "0.3.2.0"; + sha256 = "0yacy3iqx52nz2ja6fx5di7z3xjzakcmld2l1gixyawfvhavh17p"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -222827,32 +223256,6 @@ self: { }) {}; "rpmbuild-order" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, extra, fgl, filepath, hspec, optparse-applicative - , process, simple-cmd, simple-cmd-args, unix - }: - mkDerivation { - pname = "rpmbuild-order"; - version = "0.4.3.1"; - sha256 = "01k1lw0gxxsnl4wqzsynl6xkrnim5fjmdj6jb6b0bgd5jd1y0fyj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base case-insensitive containers directory extra fgl filepath - process - ]; - executableHaskellDepends = [ - base bytestring directory extra fgl optparse-applicative - simple-cmd-args - ]; - testHaskellDepends = [ base extra hspec simple-cmd unix ]; - description = "Order RPM packages by dependencies"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "rpmbuild-order_0_4_3_2" = callPackage ({ mkDerivation, base, case-insensitive, containers, directory , extra, fgl, filepath, hspec, optparse-applicative, process , simple-cmd, simple-cmd-args, unix @@ -224372,8 +224775,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; - version = "1.0.10"; - sha256 = "01i74s62kp9gbwj4jwphvn8z7gsbryczx5gn9a6cd92r29393bkm"; + version = "1.0.11"; + sha256 = "00haa87rpwhy89zg31k0fwizg97i65kqx5gzikm4fjxr7j8ds1xb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; @@ -240858,8 +241261,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.2"; - sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; + version = "1.0.1.3"; + sha256 = "1ji0jnq6d0c0yn4ka8pj838ff04ynj6d3vcv6xy3dl8v3si1mybd"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; @@ -246548,8 +246951,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.4"; - sha256 = "0gkagcq2brl4kav6ha333fyl9npgllwws4ixz0z6nas6xf2953pk"; + version = "1.0.0.6"; + sha256 = "1x7dsk2m66ka8qd76mj5aww52rjs0b49vx1lws5bl2xl0asyb03v"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -246616,8 +247019,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.4"; - sha256 = "08c5jkxri3ix19m04w6md1mwc9wd8fgsqr7v3dxzab51ylfivdcr"; + version = "1.0.1.6"; + sha256 = "1lwwyzj4gi6rav8al3mkld4vq8rdvi4ir1y51nywflkcfiqjjjsx"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -246661,19 +247064,17 @@ self: { "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers }: mkDerivation { pname = "strive"; - version = "5.0.12"; - sha256 = "1fdwmcpgfw7maw4lf4mw3qs8fiwxdsv518xjjmrp5w3hfjdlqgmz"; + version = "5.0.13"; + sha256 = "137kqb3lvqyzvarcgvc8ifphj2927z01pcl752sna9vcvj7q7wp6"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; }) {}; @@ -251520,15 +251921,15 @@ self: { license = lib.licenses.mit; }) {}; - "tasty_1_4_0_3" = callPackage + "tasty_1_4_1" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4.0.3"; - sha256 = "044kxp33qnsaxh8s1ja73149acf9xys36x4fs6lz6nyd8id3w497"; + version = "1.4.1"; + sha256 = "0ixfsjjdps0an6iy8cqb41h6kjjli9sg0xw531jwci8xlr7g0a17"; libraryHaskellDepends = [ ansi-terminal base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -251623,12 +252024,12 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, deepseq, tasty }: + ({ mkDerivation, base, containers, deepseq, tasty }: mkDerivation { pname = "tasty-bench"; - version = "0.1"; - sha256 = "0dc1fbsxxbdj90dihx8nv587pfds3s9si81i2qx438gkh3pyinmi"; - libraryHaskellDepends = [ base deepseq tasty ]; + version = "0.2.1"; + sha256 = "0gw0hlpkpwn7hpvwn9i8zqghrzjvhdrhr2q9y4r4ykhqv7y95zy3"; + libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; }) {}; @@ -253012,17 +253413,17 @@ self: { }) {}; "telegraph" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, deriving-aeson + ({ mkDerivation, aeson, base, bytestring, conduit , generic-data-surgery, http-client, http-client-tls, http-conduit , in-other-words, mtl, optics-th, text }: mkDerivation { pname = "telegraph"; - version = "1.1.1"; - sha256 = "031p8qpz7gw86qy8iy5syp9g074ksfvkqv0rmv52hn2y1489hzng"; + version = "1.2.0"; + sha256 = "158wbdzgs4dnrfhhds1dbpmrns8p29qbg5sfph2qaigs1ygf3z58"; libraryHaskellDepends = [ - aeson base bytestring conduit deriving-aeson generic-data-surgery - http-client http-conduit in-other-words mtl optics-th text + aeson base bytestring conduit generic-data-surgery http-client + http-conduit in-other-words mtl optics-th text ]; testHaskellDepends = [ base http-client http-client-tls in-other-words @@ -254106,23 +254507,26 @@ self: { }) {}; "tesla" = callPackage - ({ mkDerivation, aeson, base, bytestring, casing, containers - , exceptions, generic-deriving, HUnit, lens, lens-aeson - , monad-logger, mtl, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, unliftio-core, vector, wreq + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing + , containers, cryptonite, exceptions, generic-deriving, HUnit, lens + , lens-aeson, memory, monad-logger, mtl, random, retry, tagsoup + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.3.0.1"; - sha256 = "0idn4pgzkg1n1xq5z3qihrb7nrpaxba3y98vcx52nl35c4flps4p"; + version = "0.3.1.0"; + sha256 = "1fwrhmxqpliyq92v1j6jcqxi5iyh7s8rj17mybvgkwh5aprwsdp8"; libraryHaskellDepends = [ - aeson base bytestring casing containers exceptions generic-deriving - lens lens-aeson monad-logger mtl template-haskell text time + aeson base base64-bytestring bytestring casing containers + cryptonite exceptions generic-deriving lens lens-aeson memory + monad-logger mtl random retry tagsoup template-haskell text time unliftio-core vector wreq ]; testHaskellDepends = [ - aeson base bytestring casing containers exceptions generic-deriving - HUnit lens lens-aeson monad-logger mtl tasty tasty-hunit + aeson base base64-bytestring bytestring casing containers + cryptonite exceptions generic-deriving HUnit lens lens-aeson memory + monad-logger mtl random retry tagsoup tasty tasty-hunit tasty-quickcheck template-haskell text time unliftio-core vector wreq ]; @@ -254877,8 +255281,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.1"; - sha256 = "1pp52g4jwyf0w0xpja7gamd39g3acfclc3q29ldpzpfbhnl23n27"; + version = "0.12.1.1"; + sha256 = "04clgbbzva9yxzkn9nf176mqj1lrv64h13awk86l4lrcfbb7kgh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -254979,6 +255383,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-ascii" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, optics-core + , parsec, template-haskell, text + }: + mkDerivation { + pname = "text-ascii"; + version = "1.0.0"; + sha256 = "1mwm3ss54c927rdj8dlfw7v2l0maz12mkxb5ss3g1ngdkiwd0bsx"; + libraryHaskellDepends = [ + base bytestring deepseq hashable optics-core parsec + template-haskell text + ]; + description = "ASCII string and character processing"; + license = lib.licenses.asl20; + }) {}; + "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { @@ -255626,6 +256046,8 @@ self: { pname = "text-show-instances"; version = "3.8.4"; sha256 = "1vsrf4vjq4z759srnzvyk3hn90ck4k91vy8cn625m8hy1zddqj2q"; + revision = "1"; + editedCabalFile = "1z7kgnxm9r9dgnqn4fyrfv3k8k2dac7g2hsf649jaxhh898z6dm6"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -256069,8 +256491,8 @@ self: { }: mkDerivation { pname = "th-compat"; - version = "0.1"; - sha256 = "11v1mdm0pf6wnbsvccm1gnziinabgdpp7qdrcmm53yv3pj8yaalw"; + version = "0.1.1"; + sha256 = "1y83yq5ac067a631bd4kg0d14yp8hc23a0dsqsgbqdn279c21ylm"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -257520,15 +257942,15 @@ self: { license = lib.licenses.gpl3; }) {}; - "tidal_1_7" = callPackage + "tidal_1_7_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, vector, weigh }: mkDerivation { pname = "tidal"; - version = "1.7"; - sha256 = "1kqk9ny1fvgzkmv0kiprbi7l5pwmwkz8f7zycyksqxb6wkrs3v1k"; + version = "1.7.1"; + sha256 = "0fksrydrmjph3ghggijr9hq3xa5wfnqgzm4qxiqravsj70s9m2n4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -259097,8 +259519,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.5.4"; - sha256 = "0dx436m7rb52s1dgkckcpi8imfwf8234pnl1cmvn43x5h6jvyhnf"; + version = "1.5.5"; + sha256 = "0j1rxxq5lzs584nk19610mk7mmsqqkgfxw2qj74ibb1zsk7baj4a"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class hourglass memory mtl network transformers x509 @@ -260296,40 +260718,39 @@ self: { , containers, criterion, data-default, data-default-class , data-interval, deepseq, directory, extended-reals, filepath , finite-field, ghc-prim, hashable, hashtables, haskeline, heaps - , intern, lattices, log-domain, loop, megaparsec, mtl, multiset - , mwc-random, OptDir, optparse-applicative, parsec, pretty, primes - , primitive, process, pseudo-boolean, queue, QuickCheck, scientific - , semigroups, sign, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, temporary, text, time, transformers - , transformers-compat, unbounded-delays, unordered-containers - , vector, vector-space, xml-conduit, zlib + , intern, lattices, log-domain, loop, megaparsec, MIP, mtl + , multiset, mwc-random, OptDir, optparse-applicative, parsec + , pretty, primes, primitive, process, pseudo-boolean, queue + , QuickCheck, scientific, semigroups, sign, stm, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, temporary, text + , time, transformers, transformers-compat, unbounded-delays + , unordered-containers, vector, vector-space, xml-conduit, zlib }: mkDerivation { pname = "toysolver"; - version = "0.6.0"; - sha256 = "0hd3rwbv8k62qnw9spwx6gl0j4syivvrigjcdgc53llbqzdjr0v1"; - revision = "3"; - editedCabalFile = "02dmyy2agp6x59dcagqmbwk46bn8q1y4ragk5yggajsw4gbm5gvn"; + version = "0.7.0"; + sha256 = "1r8z8fg3iyz5cc7cmwv29i7gwdcb789s7p6yklfgmz8w314m83gj"; + revision = "1"; + editedCabalFile = "1gnpyqjrcpsc2qjnnajr77j5x0xnyxpsmcxqa2qfbahw0r9qvmfw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring bytestring-builder bytestring-encoding - case-insensitive clock containers data-default-class data-interval - deepseq extended-reals filepath finite-field ghc-prim hashable - hashtables heaps intern lattices log-domain loop megaparsec mtl - multiset mwc-random OptDir pretty primes primitive process - pseudo-boolean queue scientific semigroups sign stm - template-haskell temporary text time transformers - transformers-compat unordered-containers vector vector-space - xml-conduit zlib + case-insensitive clock containers data-default data-default-class + data-interval deepseq directory extended-reals filepath + finite-field ghc-prim hashable hashtables heaps intern lattices + log-domain loop megaparsec MIP mtl multiset mwc-random OptDir + pretty primes primitive process pseudo-boolean queue scientific + semigroups sign stm template-haskell temporary text time + transformers transformers-compat unordered-containers vector + vector-space xml-conduit zlib ]; executableHaskellDepends = [ ansi-wl-pprint array base bytestring bytestring-builder clock - containers data-default data-default-class directory filepath - haskeline intern megaparsec mtl mwc-random OptDir - optparse-applicative parsec process pseudo-boolean scientific - temporary text time transformers transformers-compat - unbounded-delays vector + containers data-default-class filepath haskeline intern megaparsec + MIP mtl mwc-random OptDir optparse-applicative parsec + pseudo-boolean scientific text time transformers + transformers-compat unbounded-delays vector ]; testHaskellDepends = [ array base bytestring bytestring-builder containers @@ -260623,8 +261044,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.7"; - sha256 = "0v0f1a4p1602jgz5iik7mxxnld61ai7saan0brqry2sd6a8cjw43"; + version = "0.7.2"; + sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -262087,8 +262508,8 @@ self: { pname = "trifecta"; version = "2.1"; sha256 = "0fr326lzf38m20h2g4189nsyml9w3128924zbd3cd93cgfqcc9bs"; - revision = "3"; - editedCabalFile = "0ag08di787zqzz70nwhsfigsvqbmbg7bkq011znq145yg750jcwl"; + revision = "4"; + editedCabalFile = "0frzfh7xmaypbxcmszjvzbakz52p0fx79jg6ng0ygaaj62inv4ss"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup @@ -264307,6 +264728,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "type-natural_1_1_0_0" = callPackage + ({ mkDerivation, base, constraints, equational-reasoning, ghc + , ghc-typelits-knownnat, ghc-typelits-natnormalise + , ghc-typelits-presburger, integer-logarithms, QuickCheck + , quickcheck-instances, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "type-natural"; + version = "1.1.0.0"; + sha256 = "0asyjp426931j4ym2qvx5xy9fjyf734sy02gscpd1d0fa8d1xbjm"; + libraryHaskellDepends = [ + base constraints equational-reasoning ghc ghc-typelits-knownnat + ghc-typelits-natnormalise ghc-typelits-presburger + integer-logarithms template-haskell + ]; + testHaskellDepends = [ + base equational-reasoning integer-logarithms QuickCheck + quickcheck-instances tasty tasty-discover tasty-hunit + tasty-quickcheck template-haskell + ]; + testToolDepends = [ tasty-discover ]; + description = "Type-level natural and proofs of their properties"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim @@ -264314,8 +264762,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.6.1.2"; - sha256 = "0dgfj4jk9bs6fjmmvsjxjpnvrd4nxmrnhdgvmawlfs5nib4r4al6"; + version = "1.6.2.0"; + sha256 = "18cwsblbmdh301d4jy3b70rnfni2vf3yzg71353hahv2rgfilh3j"; libraryHaskellDepends = [ base bytestring containers double-conversion ghc-prim text ]; @@ -265475,6 +265923,20 @@ self: { broken = true; }) {}; + "ucl" = callPackage + ({ mkDerivation, base, bytestring, containers, libucl, text, time + }: + mkDerivation { + pname = "ucl"; + version = "0.2.0.0"; + sha256 = "1ccf9zavmsk0msq4gz6alv5z32qwnap8a4zvajmqps69bh66b9wv"; + libraryHaskellDepends = [ base bytestring containers text time ]; + libraryPkgconfigDepends = [ libucl ]; + testHaskellDepends = [ base containers ]; + description = "Datatype and parser for the Universal Configuration Language (UCL) using libucl"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) libucl;}; + "uconv" = callPackage ({ mkDerivation, base, icu }: mkDerivation { @@ -267347,6 +267809,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-simple" = callPackage + ({ mkDerivation, base, bytestring, zenhack-prelude }: + mkDerivation { + pname = "unix-simple"; + version = "0.1.0.0"; + sha256 = "0f6hvfs651ciwnpshh9n2655jl8yddwhbpw7gqbn0fa3y6b214kc"; + libraryHaskellDepends = [ base bytestring zenhack-prelude ]; + testHaskellDepends = [ base bytestring zenhack-prelude ]; + description = "Straightforward bindings to the posix API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "unix-time" = callPackage ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover , old-locale, old-time, QuickCheck, time @@ -269749,18 +270225,16 @@ self: { }) {}; "validate-input" = callPackage - ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy - , QuickCheck, semigroups, string-conversions, text + ({ mkDerivation, base, bytestring, hspec, mtl, pcre-heavy + , QuickCheck, semigroups, string-conversions, text, transformers }: mkDerivation { pname = "validate-input"; - version = "0.4.0.0"; - sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0"; - revision = "1"; - editedCabalFile = "0qfwr05111adjfy6j0cbhrzyxgl3ngfpm0irf1hcgmfxnb8psqli"; + version = "0.5.0.0"; + sha256 = "09bp771b4ccm3r635i5cdkcrqlfkd5rlgrh9ijknd42bpw9byvzi"; libraryHaskellDepends = [ - base bytestring either mtl pcre-heavy semigroups string-conversions - text + base bytestring mtl pcre-heavy semigroups string-conversions text + transformers ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Input validation combinator library"; @@ -270572,24 +271046,6 @@ self: { }) {}; "vector" = callPackage - ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit - , primitive, QuickCheck, random, semigroups, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, transformers - }: - mkDerivation { - pname = "vector"; - version = "0.12.1.2"; - sha256 = "1g8i806ph9l789pv2k665bbxlmsbwfwzml1mi9xv683g7xl2fviv"; - libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - testHaskellDepends = [ - base base-orphans HUnit primitive QuickCheck random semigroups - tasty tasty-hunit tasty-quickcheck template-haskell transformers - ]; - description = "Efficient Arrays"; - license = lib.licenses.bsd3; - }) {}; - - "vector_0_12_2_0" = callPackage ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit , primitive, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, template-haskell, transformers @@ -270605,7 +271061,6 @@ self: { ]; description = "Efficient Arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vector-algorithms" = callPackage @@ -270616,6 +271071,8 @@ self: { pname = "vector-algorithms"; version = "0.8.0.4"; sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn"; + revision = "1"; + editedCabalFile = "10zjr2cdsaxb71z9svl7h2bxrxbhr19ckqy9p2mhkvhg7ar60ixz"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -272089,8 +272546,6 @@ self: { ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-osc" = callPackage @@ -272103,8 +272558,6 @@ self: { testHaskellDepends = [ base bytestring cereal microspec time ]; description = "Open Sound Control encode/decode"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vivid-supercollider" = callPackage @@ -272124,8 +272577,6 @@ self: { ]; description = "Implementation of SuperCollider server specifications"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "vk-aws-route53" = callPackage @@ -272174,6 +272625,77 @@ self: { license = lib.licenses.publicDomain; }) {}; + "vocoder" = callPackage + ({ mkDerivation, base, random, vector, vector-fftw }: + mkDerivation { + pname = "vocoder"; + version = "0.1.0.0"; + sha256 = "04j0rrf7i1cghk53dwy5y5s3igxsqa6ih94rgfrjf2prx3rwmbr2"; + libraryHaskellDepends = [ base random vector vector-fftw ]; + description = "Phase vocoder"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-audio" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, containers + , mono-traversable, vector, vector-fftw, vocoder, vocoder-conduit + }: + mkDerivation { + pname = "vocoder-audio"; + version = "0.1.0.0"; + sha256 = "1hwnsmnqxwrbfjgv9rvprxnzpyb3w4nybzsz98fqvh9lslajrq4p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base conduit conduit-audio containers mono-traversable vector + vector-fftw vocoder vocoder-conduit + ]; + description = "Phase vocoder for conduit-audio"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-conduit" = callPackage + ({ mkDerivation, base, conduit, gauge, hspec, mono-traversable + , QuickCheck, vector, vector-fftw, vocoder + }: + mkDerivation { + pname = "vocoder-conduit"; + version = "0.1.0.0"; + sha256 = "0a1zhxzypxik62rzk5l6crv1413662gjq31qslvavwd248xn00dk"; + libraryHaskellDepends = [ + base conduit mono-traversable vector vector-fftw vocoder + ]; + testHaskellDepends = [ + base conduit hspec QuickCheck vector vector-fftw vocoder + ]; + benchmarkHaskellDepends = [ + base conduit gauge vector vector-fftw vocoder + ]; + description = "Phase vocoder for Conduit"; + license = lib.licenses.bsd2; + }) {}; + + "vocoder-dunai" = callPackage + ({ mkDerivation, base, dunai, gauge, hspec, QuickCheck, vector + , vector-fftw, vocoder + }: + mkDerivation { + pname = "vocoder-dunai"; + version = "0.1.0.0"; + sha256 = "1bns914d8yxyj9mblknw7n5xijf6vn8y099vzp3f9grjls81y4pw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai vector vector-fftw vocoder ]; + testHaskellDepends = [ + base dunai hspec QuickCheck vector vector-fftw vocoder + ]; + benchmarkHaskellDepends = [ + base dunai gauge vector vector-fftw vocoder + ]; + description = "Phase vocoder for Dunai and Rhine"; + license = lib.licenses.bsd2; + }) {}; + "voicebase" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL , hspec, http-client, http-client-openssl, lens, lens-aeson @@ -272459,8 +272981,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.9"; - sha256 = "00k23g4qszrhwbbc746y1z50mcnxw9b99rqfdqx6ncnzblc6b63z"; + version = "3.9.1"; + sha256 = "1rdhkxrjxcvdx3hd74xcgx28nd8ca8la5kclbxwbgciby8plpymv"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274607,39 +275129,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, lifted-base, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; - version = "3.3.13"; - sha256 = "1yqgfx7bsjk97dxcrqwddfhi8mdw0q6cbgs5abaxqjlxh3rhihdx"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute lifted-base - network process QuickCheck simple-sendfile stm streaming-commons - text time time-manager unix unix-compat vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - }) {}; - - "warp_3_3_14" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -274670,7 +275159,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -276473,36 +276961,37 @@ self: { }) {}; "what4" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors - , bimap, bv-sized, bytestring, containers, data-binary-ieee754 + ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized + , bytestring, config-value, containers, data-binary-ieee754 , deepseq, deriving-compat, directory, exceptions, extra, filepath , fingertree, ghc-prim, hashable, hashtables, hedgehog, io-streams - , lens, mtl, panic, parameterized-utils, process, QuickCheck - , scientific, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, text, th-abstraction, transformers + , lens, libBF, mtl, panic, parameterized-utils, prettyprinter + , process, QuickCheck, scientific, tasty, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-abstraction, th-lift, th-lift-instances, transformers , unordered-containers, utf8-string, vector, versions, zenc }: mkDerivation { pname = "what4"; - version = "1.0"; - sha256 = "0yyyq2gzl7srjq6inj1dqdhpxd58r1rhjajwxi0gr5pmxfzv7k8w"; - revision = "1"; - editedCabalFile = "04ab8nvnngb3bjv94mkcr17hh2m943m4pyk3klbnmpwyp9ip6pmf"; + version = "1.1"; + sha256 = "1656h3865vzd96ggibm1wkhnpmjrx6crv87kgmwphfy8hgl5j8kq"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bifunctors bimap bv-sized bytestring + attoparsec base bifunctors bimap bv-sized bytestring config-value containers data-binary-ieee754 deepseq deriving-compat directory exceptions extra filepath fingertree ghc-prim hashable hashtables - io-streams lens mtl panic parameterized-utils process scientific - template-haskell temporary text th-abstraction transformers - unordered-containers utf8-string vector versions zenc + io-streams lens libBF mtl panic parameterized-utils prettyprinter + process scientific template-haskell temporary text th-abstraction + th-lift th-lift-instances transformers unordered-containers + utf8-string vector versions zenc ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ base bv-sized bytestring containers data-binary-ieee754 hedgehog - parameterized-utils QuickCheck tasty tasty-hedgehog tasty-hunit - tasty-quickcheck text transformers versions + libBF parameterized-utils QuickCheck tasty tasty-hedgehog + tasty-hunit tasty-quickcheck text transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -276681,6 +277170,8 @@ self: { pname = "wide-word"; version = "0.1.1.2"; sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; + revision = "1"; + editedCabalFile = "1gqw8d8j3wml0431lq1ygl5a3n36ymp1i77m7qaw0mz3ss982gl2"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -277046,8 +277537,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "0.0.0.4"; - sha256 = "1mph0zaz2dnhpchyiyspqsjghd8kn8sbqnhbyjmag51l2wr418vb"; + version = "0.0.0.5"; + sha256 = "1j12mh8zap8c0lb358bzk4sq29h64lv0jrwq9r4nssx4yybrz9gg"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring containers hspec QuickCheck text @@ -278178,10 +278669,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.2"; - sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; - revision = "1"; - editedCabalFile = "0gz674sb266hv6si9l79c3bv7n2nbssl1262c24in79sk27887gb"; + version = "0.5.3.3"; + sha256 = "0zv51048p0r7vhamml3ps9nr11yi9fxz2w31qcz053bw3z9ivwxw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -278795,8 +279284,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.17"; - sha256 = "03raxspm7k5byx2gg5a2avgf7c3idcjq0vd7jh01vpv1mamap712"; + version = "1.1.18"; + sha256 = "0idxk1q0gsh1hq56w8jxnsb58p8z8d45qgj6zqzsszlccwzgr24f"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -283243,6 +283732,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-bin_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.1"; + sha256 = "0saz5dcygyf91f8hqvsy9wpcc5pg7vd9gcp891fiz4cywsrqpzwx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -283986,8 +284503,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.2"; - sha256 = "1wlwzxc2amnq1ma2lvclrc3dzhh8s6d8ffz6yk9rq88aijgvw35m"; + version = "2.0.0.3"; + sha256 = "1qj3qsrzjh0w0hc9ngbxd82pkwb8jylhf0nihhnk4dvrdqm2yvyb"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core @@ -286727,8 +287244,8 @@ self: { pname = "zippers"; version = "0.3"; sha256 = "0hrsgk8sh9g3438kl79131s6vjydhivgya04yxv3h70m7pky1dpm"; - revision = "1"; - editedCabalFile = "1pdlng2wnzqg2fbafp78mxp3whsy0683x14gzdnif7pmhpzs145f"; + revision = "2"; + editedCabalFile = "131rmvifqf3dcvh9lnpjnm28ss7nzra1n2qnxa1fypnx1zmmljva"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base fail lens profunctors semigroupoids semigroups diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index ab542237859..89db33c5a8c 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.763"; + version = "1.10.2.774"; src = fetchurl { + # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia"; + sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp"; }; nativeBuildInputs = [ @@ -20,6 +21,8 @@ stdenv.mkDerivation rec { binPath = lib.makeBinPath [ rlwrap jdk ]; in '' + runHook preInstall + clojure_lib_dir=$out bin_dir=$out/bin @@ -38,6 +41,8 @@ stdenv.mkDerivation rec { wrapProgram $bin_dir/clj --prefix PATH : $out/bin:${binPath} installManPage clj.1 clojure.1 + + runHook postInstall ''; doInstallCheck = true; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index a2dfe1322f8..0127c1ebe8a 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -47,9 +47,8 @@ stdenv.mkDerivation rec { gtkModule = "/lib/gtk-2.0/"; }; - meta = { + meta = with lib; { description = "An implementation of the XDG Sound Theme and Name Specifications"; - longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops @@ -57,12 +56,12 @@ stdenv.mkDerivation rec { PulseAudio, OSS, GStreamer, null) and is designed to be portable. ''; - homepage = "http://0pointer.de/lennart/projects/libcanberra/"; - - license = lib.licenses.lgpl2Plus; - + license = licenses.lgpl2Plus; maintainers = [ ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; + # canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found + # #include + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 86e3f4274fc..2cd7da0784a 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.13"; + version = "0.18.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; + sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA="; }; patches = [ diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 974f1f6674f..2e75894eb83 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.5"; + version = "0.1.6"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-xf/hzTzhxKJDL5Way0Qbrs8pXCvAQ+ADtgJO2GbEvmc="; + sha256 = "sha256-X+mFl0YZpnt6zzvVTGZN7PROVUaQ8ZmU3T0EgyoZX6g="; }; patches = [ diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 4418c50568c..7051c51cc5c 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,20 +1,21 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, odoc, ocaml_lwt, pandoc, re }: +, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp +, pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.8.0"; + version = "1.8.1"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "1p2ip73da271as0x1gfbajik3mf1bkc8l54276vgacn1ja3saj52"; + sha256 = "1szik1lyg2vs8jrisnvjdc29n0ifls8mghimff4jcz6f48haa3cv"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version odoc re ]; + propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 07f250ea867..1c067bcec28 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79"; + sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4="; }; # Tests are not included in the PyPI package @@ -26,9 +26,9 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; - meta = { + meta = with lib; { homepage = "https://github.com/awslabs/serverless-application-model"; description = "Python library to transform SAM templates into AWS CloudFormation templates"; - license = lib.licenses.asl20; + license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index f397454e7e1..cb7d57f7530 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -26,6 +26,9 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; + # no tests + doCheck = false; + meta = with lib; { description = "Board and connector definitions for nMigen"; homepage = "https://github.com/nmigen/nmigen-boards"; diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix new file mode 100644 index 00000000000..51497e8875b --- /dev/null +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, poetry +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyairnow"; + version = "1.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "asymworks"; + repo = pname; + rev = "v${version}"; + sha256 = "1hkpfl8rdwyzqrr1drqlmcw3xpv3pi1jf19h1divspbzwarqxs1c"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyairnow" ]; + + meta = with lib; { + description = "Python wrapper for EPA AirNow Air Quality API"; + homepage = "https://github.com/asymworks/pyairnow"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 3e6d7284568..463ccb25b7d 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -35,6 +35,9 @@ buildPythonPackage { --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; + # hangs on darwin + sandbox + doCheck = !stdenv.isDarwin; + meta = with lib; { homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix new file mode 100644 index 00000000000..393170cfb9f --- /dev/null +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyvesync"; + version = "1.3.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z"; + }; + + propagatedBuildInputs = [ requests ]; + + # Test are not available (not in PyPI tarball and there are no GitHub releases) + doCheck = false; + pythonImportsCheck = [ "pyvesync" ]; + + meta = with lib; { + description = "Python library to manage Etekcity Devices and Levoit Air Purifier"; + homepage = "https://github.com/webdjoe/pyvesync"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix new file mode 100644 index 00000000000..8040458bf76 --- /dev/null +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -0,0 +1,53 @@ +{ lib +, asynctest +, bleak +, click +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-cov +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyzerproc"; + version = "0.4.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "emlove"; + repo = pname; + rev = version; + sha256 = "1qlxvvy9fyff56dvc46nsd5ngkxqhdi7s4gwfndj7dn76j81srpq"; + }; + + # Remove pytest-runner, https://github.com/emlove/pyzerproc/pull/1 + patchPhase = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ + bleak + click + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytest-cov + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyzerproc" ]; + + meta = with lib; { + description = "Python library to control Zerproc Bluetooth LED smart string lights"; + homepage = "https://github.com/emlove/pyzerproc"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 62749d3b02f..23c68007cd3 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -4,25 +4,13 @@ buildPythonPackage rec { pname = "todoist-python"; - version = "8.1.2"; + version = "8.1.3"; src = fetchPypi { inherit pname version; - sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498"; + sha256 = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U="; }; - patches = [ - # From https://github.com/Doist/todoist-python/pull/80 - (fetchpatch { - url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch"; - sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa"; - }) - (fetchpatch { - url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch"; - sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn"; - }) - ]; - propagatedBuildInputs = [ requests ] ++ lib.optional (pythonOlder "3.5") typing; meta = with lib; { diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index 39901a17f00..a9f3042fb39 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -15,10 +15,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; + # no tests + doCheck = false; + meta = with lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; homepage = "https://pypi.python.org/pypi/transmissionrpc/"; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index ae912df37fe..1dde1405bf6 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -3,16 +3,11 @@ , buildPythonPackage , fetchPypi , substituteAll -, pkgs , argcomplete , pyyaml , xmltodict -# Test inputs -, coverage -, flake8 , jq -, pytest -, toml +, pytestCheckHook }: buildPythonPackage rec { @@ -27,12 +22,13 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./jq-path.patch; - jq = "${lib.getBin pkgs.jq}/bin/jq"; + jq = "${lib.getBin jq}/bin/jq"; }) ]; postPatch = '' - substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" + substituteInPlace test/test.py \ + --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" ''; propagatedBuildInputs = [ @@ -41,16 +37,11 @@ buildPythonPackage rec { argcomplete ]; - doCheck = true; - checkInputs = [ - pytest - coverage - flake8 - toml + pytestCheckHook ]; - checkPhase = "pytest ./test/test.py"; + pytestFlagsArray = [ "test/test.py" ]; pythonImportsCheck = [ "yq" ]; @@ -59,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents"; homepage = "https://github.com/kislyuk/yq"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.womfoo ]; + license = licenses.asl20; + maintainers = with maintainers; [ womfoo SuperSandro2000 ]; }; } diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 402e12efab0..0859ed51323 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -4,75 +4,33 @@ , enableTelemetry ? false }: -let - py = python3.override { - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.0.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92"; - }; - }); - - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; - }; - }); - - dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { - version = "0.7.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; - }; - }); - - cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { - version = "1.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"; - }; - }); - }; - }; - -in - -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.6.2"; + version = "1.14.0"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0scnymhhiiqrs2j0jaypxgq2wg1qf1w8f55qfay0b3nf51y6mh8y"; + sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc="; }; # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ aws-lambda-builders aws-sam-translator chevron click cookiecutter dateparser + python-dateutil docker flask - idna jmespath - pathlib2 requests serverlessrepo - six tomlkit + watchdog ]; postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else '' @@ -83,13 +41,12 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3" \ - --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ + --replace "boto3~=1.14.23" "boto3~=1.14" \ + --replace "dateparser~=0.7" "dateparser>=0.7" \ + --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ - --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" + --replace "watchdog==0.10.3" "watchdog" ''; meta = with lib; { diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix new file mode 100644 index 00000000000..c20e2866dc7 --- /dev/null +++ b/pkgs/development/tools/dockle/default.nix @@ -0,0 +1,43 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, lvm2 }: + +buildGoModule rec { + pname = "dockle"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "goodwithtech"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY="; + }; + + vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ btrfs-progs lvm2 ]; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.version=${version}" + ]; + + preCheck = '' + # Remove tests that use networking + rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go + ''; + + meta = with lib; { + homepage = "https://containers.goodwith.tech"; + changelog = "https://github.com/goodwithtech/dockle/releases/tag/v${version}"; + description = "Container Image Linter for Security"; + longDescription = '' + Container Image Linter for Security. + Helping build the Best-Practice Docker Image. + Easy to start. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 713e5c00587..b8242cc3cd8 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -1,20 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gron"; version = "0.6.1"; - owner = "tomnomnom"; - repo = "gron"; - goPackagePath = "github.com/${owner}/${repo}"; - src = fetchFromGitHub { - inherit owner repo; + owner = "tomnomnom"; + repo = "gron"; rev = "v${version}"; sha256 = "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m"; }; - goDeps = ./deps.nix; + patches = [ + (fetchpatch { + name = "fix-inconsistent-vendoring.patch"; + url = "https://github.com/tomnomnom/gron/pull/85/commits/d549a6cb68ed0e0ec7cc81d8275353acfe218725.patch"; + sha256 = "1461v4f7w6q75l3988br0g1ynfhzsh34z38pd2w8fp57vrgkcfi5"; + }) + ]; + + vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy"; meta = with lib; { description = "Make JSON greppable!"; @@ -26,7 +31,7 @@ buildGoPackage rec { ''; homepage = "https://github.com/tomnomnom/gron"; license = licenses.mit; - maintainers = [ maintainers.fgaz ]; - platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ fgaz SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix deleted file mode 100644 index effc255d877..00000000000 --- a/pkgs/development/tools/gron/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -[ - rec { - owner = "fatih"; - repo = "color"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - rec { - owner = "nwidger"; - repo = "jsoncolor"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; - sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; - }; - } - rec { - owner = "pkg"; - repo = "errors"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - rec { - owner = "mattn"; - repo = "go-colorable"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - rec { - owner = "mattn"; - repo = "go-isatty"; - goPackagePath = "github.com/${owner}/${repo}"; - fetch = { - type = "git"; - url = "https://github.com/${owner}/${repo}"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } -] diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 47966dcc133..557ff4fa967 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-iUDc54E8AiLMJw9h99kg/3VmaSi8GqfQyrPwa9nJ994="; buildInputs = lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security + libiconv Security ]; # enable all output formats diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 13e8c233ec3..018232b3f40 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -1,21 +1,22 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "pup"; - version = "0.4.0"; - rev = "v${version}"; + version = "unstable-2019-09-19"; - goPackagePath = "github.com/ericchiang/pup"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0mnhw0yph5fvcnrcmj1kfbyw1a4lcg3k9f6y28kf44ihlq8h1dfz"; + src = fetchFromGitHub { + owner = "ericchiang"; + repo = "pup"; + rev = "681d7bb639334bf485476f5872c5bdab10931f9a"; + sha256 = "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr"; }; + vendorSha256 = null; + meta = with lib; { - description = "Streaming HTML processor/selector"; + description = "Parsing HTML at the command line"; + homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yegortimoshenko SuperSandro2000 ]; }; } diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 40e3e42d84c..dc5699ed373 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -20,12 +20,12 @@ in mkDerivation rec { pname = "qtcreator"; - version = "4.11.0"; + version = "4.14.0"; baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); src = fetchurl { url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; + sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ @@ -54,16 +54,14 @@ mkDerivation rec { preConfigure = '' substituteInPlace src/plugins/plugins.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' + substituteInPlace src/libs/libs.pro \ + --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' '' + optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin' - # Fix include path to find clang and clang-c include directories. - substituteInPlace src/plugins/clangtools/clangtools.pro \ - --replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}' - # Fix paths to libclang library. substituteInPlace src/shared/clang/clang_installation.pri \ --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \ diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 075db08a5ce..71c482fe766 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -1,15 +1,22 @@ { lib, stdenv, fetchurl }: -let arch = if stdenv.isx86_64 then "x86-64" else +with lib; + +let + # The x86-64-modern may need to be refined further in the future + # but stdenv.hostPlatform CPU flags do not currently work on Darwin + # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745 + archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "x86-64"; + arch = if stdenv.isDarwin then archDarwin else + if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else "unknown"; - version = "12"; nnueFile = "nn-82215d0fd0df.nnue"; nnue = fetchurl { name = nnueFile; - url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; }; in @@ -23,18 +30,24 @@ stdenv.mkDerivation { sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; }; + # This addresses a linker issue with Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + preBuild = optionalString stdenv.isDarwin '' + sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile + ''; + postUnpack = '' sourceRoot+=/src echo ${nnue} cp "${nnue}" "$sourceRoot/${nnueFile}" ''; - makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; + makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" "CXX=${stdenv.cc.targetPrefix}c++" ]; buildFlags = [ "build" ]; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' @@ -42,7 +55,7 @@ stdenv.mkDerivation { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; license = licenses.gpl2; }; diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix deleted file mode 100644 index 6503571eb6b..00000000000 --- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }: - -# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration -# So the nix version is something like: -# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint -# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters - -let pythonEnv = python2.buildEnv.override { - extraLibs = with python2Packages; [ - six - httplib2 - pycups - ]; -}; - -in stdenv.mkDerivation rec { - pname = "cups-googlecloudprint"; - version = "20160502"; - - src = fetchFromGitHub { - owner = "simoncadman"; - repo = "CUPS-Cloud-Print"; - rev = version; - sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz"; - }; - - buildInputs = [ cups makeWrapper ]; - - cupsgroup = "nonexistantgroup"; - NOPERMS = 1; - - postConfigure = '' - substituteInPlace Makefile --replace "${cups}" "$out" - ''; - - postInstall = '' - pushd "$out" - for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint - do - echo "Wrapping $s..." - wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" - done - - mkdir bin - - for s in share/cloudprint-cups/*.py - do - if [ -x "$s" ] # Only wrapping those Python scripts marked as executable - then - o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')" - echo "Wrapping $o -> $s..." - makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" - fi - done - popd - ''; - - meta = with lib; { - description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; - homepage = "http://ccp.niftiestsoftware.com"; - platforms = platforms.linux; - license = licenses.gpl3; - }; -} diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index f0289c22272..04cf6c3d96c 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.24"; + version = "1.1.25"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" - "https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" + "https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm" ]; - sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co="; + sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw="; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index 9c14fde319d..44bcbba205e 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "flashbench"; - version = "2012-06-06"; + pname = "flashbench-unstable"; + version = "2020-01-23"; - src = fetchgit { - url = "https://github.com/bradfa/flashbench.git"; - rev = "2e30b1968a66147412f21002ea844122a0d5e2f0"; - sha256 = "037rhd2alwfip9qk78cy8fwwnc2kdyzccsyc7v2zpmvl4vvpvnhg"; + src = fetchFromGitHub { + owner = "bradfa"; + repo = "flashbench"; + rev = "d783b1bd2443812c6deadc31b081f043e43e4c1a"; + sha256 = "045j1kpay6x2ikz8x54ph862ymfy1nzpbmmqpf3nkapiv32fjqw5"; }; installPhase = '' + runHook preInstall + install -d -m755 $out/bin $out/share/doc/flashbench install -v -m755 flashbench $out/bin install -v -m755 erase $out/bin/flashbench-erase install -v -m644 README $out/share/doc/flashbench + + runHook postInstall ''; meta = with lib; { description = "Testing tool for flash based memory devices"; homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.rycee ]; }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 584c35bf7f8..da73a94c2aa 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -91,5 +91,5 @@ in rec { locale = "en_UK"; }; wordnet = callPackage ./dictd-wordnet.nix {}; - wiktionary = callPackage ./dictd-wiktionary.nix {}; + wiktionary = callPackage ./wiktionary {}; } diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix deleted file mode 100644 index f591064a3c1..00000000000 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, stdenv, fetchurl, python, dict, glibcLocales, writeScript}: - -stdenv.mkDerivation rec { - version = "20161001"; - pname = "dict-db-wiktionary"; - data = fetchurl { - url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "0g3k7kxp2nzg0v56i4cz253af3aqvhn1lwkys2fnam51cn3yqm7m"; - }; - - convert = ./wiktionary2dict.py; - buildInputs = [python dict glibcLocales]; - - builder = writeScript "wiktionary-builder.sh" '' - source $stdenv/setup - - mkdir -p $out/share/dictd/ - cd $out/share/dictd - - python -O ${convert} ${data} - dictzip wiktionary-en.dict - echo en_US.UTF-8 > locale - ''; - - meta = { - description = "DICT version of English Wiktionary"; - homepage = "http://en.wiktionary.org/"; - maintainers = [ ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/servers/dict/wiktionary/builder.sh b/pkgs/servers/dict/wiktionary/builder.sh new file mode 100644 index 00000000000..65652ad4bdb --- /dev/null +++ b/pkgs/servers/dict/wiktionary/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +mkdir -p $out/share/dictd/ +cd $out/share/dictd + +python -O "$convert" "$src" +dictzip wiktionary-en.dict +echo en_US.UTF-8 > locale diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix new file mode 100644 index 00000000000..cd0c9c6c24b --- /dev/null +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, python, dict, glibcLocales }: + +stdenv.mkDerivation rec { + version = "20210201"; + pname = "dict-db-wiktionary"; + + src = fetchurl { + url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; + sha256 = "0dc34cbadsg0f6lhfcyx0np7zjnlg6837piqhlvnn0b45xnzn0cs"; + }; + + convert = ./wiktionary2dict.py; + buildInputs = [ python dict glibcLocales ]; + builder = ./builder.sh; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "DICT version of English Wiktionary"; + homepage = "http://en.wiktionary.org/"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + license = with licenses; [ cc-by-sa-30 fdl11Plus ]; + }; +} diff --git a/pkgs/servers/dict/wiktionary/latest_version.py b/pkgs/servers/dict/wiktionary/latest_version.py new file mode 100644 index 00000000000..2833a1e05b0 --- /dev/null +++ b/pkgs/servers/dict/wiktionary/latest_version.py @@ -0,0 +1,42 @@ +import subprocess + +from html.parser import HTMLParser +from os.path import abspath, dirname +from urllib.request import urlopen + +class WiktionaryLatestVersionParser(HTMLParser): + def __init__(self, current_version, *args, **kwargs): + self.latest_version = current_version + super().__init__(*args, **kwargs) + + + def handle_starttag(self, tag, attrs): + if tag != 'a': + return + + href = dict(attrs)['href'][0:-1] + if href == 'latest': + return + + self.latest_version = max(self.latest_version, href) + + +def nix_prefetch_url(url, algo='sha256'): + """Prefetches the content of the given URL.""" + print(f'nix-prefetch-url {url}') + out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) + return out.decode('utf-8').rstrip() + + +current_version = subprocess.check_output([ + 'nix', 'eval', '--raw', + '-f', dirname(abspath(__file__)) + '/../../../..', + 'dictdDBs.wiktionary.version', +]).decode('utf-8') + +parser = WiktionaryLatestVersionParser(current_version) + +with urlopen('https://dumps.wikimedia.org/enwiktionary/') as resp: + parser.feed(resp.read().decode('utf-8')) + +print(parser.latest_version) diff --git a/pkgs/servers/dict/wiktionary/update.sh b/pkgs/servers/dict/wiktionary/update.sh new file mode 100755 index 00000000000..ff5e0fc3551 --- /dev/null +++ b/pkgs/servers/dict/wiktionary/update.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts python3 + +set -ueo pipefail + +version="$(python "$(dirname "${BASH_SOURCE[0]}")"/latest_version.py)" +update-source-version dictdDBs.wiktionary "$version" diff --git a/pkgs/servers/dict/wiktionary2dict.py b/pkgs/servers/dict/wiktionary/wiktionary2dict.py similarity index 100% rename from pkgs/servers/dict/wiktionary2dict.py rename to pkgs/servers/dict/wiktionary/wiktionary2dict.py diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 02d2f241bae..be3012740f5 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AojemBU3BUuMqokLH9mhYf+sH5Q+zSYeoGmuI5/6vPw="; + sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; }; - cargoSha256 = "sha256-TFSD+G0i5EAu7D7gOtRzwFxO214CBPdh2Y6rRt39FVo="; + cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 78cd3a15baa..40779f4bc19 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -16,7 +16,7 @@ "agent_dvr" = ps: with ps; [ agent-py ]; "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; - "airnow" = ps: with ps; [ ]; # missing inputs: pyairnow + "airnow" = ps: with ps; [ pyairnow ]; "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; @@ -901,7 +901,7 @@ "verisure" = ps: with ps; [ jsonpath vsure ]; "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense "version" = ps: with ps; [ pyhaversion ]; - "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync + "vesync" = ps: with ps; [ pyvesync ]; "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client @@ -965,7 +965,7 @@ "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; - "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc + "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; "zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index b9bce56d9fa..4db8ac1f403 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -3,16 +3,14 @@ with python3Packages; buildPythonApplication rec { pname = "isso"; - # Can not use 0.12.2 because of: - # https://github.com/posativ/isso/issues/617 - version = "unstable-2020-09-14"; + version = "0.12.4"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; - rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5"; - sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; + rev = version; + sha256 = "16wjpz8r74fzjvzhl6by3sjc2g1riz8lh59ccgp14bns1yhsh2yi"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 6dad6173ed4..dfad9569d2a 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; - buildFlagsArray = [ "-ldflags=-X main.GitSha=${src.rev}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ]; doCheck = false; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 82cc7fa29e4..ee3573f9f45 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i"; - buildFlagsArray = [ "-ldflags=" "-s -w -X=main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 7997f2119a2..781ee30deba 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -8,11 +8,11 @@ rustPlatform.buildRustPackage rec { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-JwGa1icwV1yqxy90Psd9bzM7VzM7HPA6kONkI3Y745Q="; + sha256 = "1knl7kwngmq598bnlvlq9x8sqp914sv1abfm55kw9f7mja2d6pw0"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' - rm -rf $out/src/test_dir3/ + rm -r $out/tests/test_dir_unicode/ ''; }; @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; - maintainers = [ maintainers.infinisil ]; + maintainers = with maintainers; [ infinisil SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 83aa6c505d3..f275d254677 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib -, darwin, libiconv, installShellFiles +, Security, libiconv, installShellFiles }: with rustPlatform; @@ -28,9 +28,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ - libiconv darwin.apple_sdk.frameworks.Security ] - ; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 6e8bb7fd96c..12e63686d51 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }: stdenv.mkDerivation rec { - version = "5.45.4"; pname = "expect"; + version = "5.45.4"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for automating interactive applications"; homepage = "http://expect.sourceforge.net/"; - license = "Expect"; + license = licenses.publicDomain; platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index fca9cecc01c..d58661babc6 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform -, darwin +, Security , libiconv }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1viph7ki6f2akc5mpbgycacndmxnv088ybfji2bfdbi5jnpyavvs"; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 12cd9990779..5dab2044973 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -14,8 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4="; - buildInputs = with stdenv; - lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; meta = with lib; { description = "Git repository summary on your terminal"; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 2412541352f..2fb41edaa7c 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Upgrade all the things"; homepage = "https://github.com/r-darwish/topgrade"; - license = licenses.gpl3; - maintainers = with maintainers; [ Br1ght0ne hugoreeves ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Br1ght0ne hugoreeves SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index c5ca2965e9d..1e1ec8723bf 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -4,7 +4,6 @@ , rustPlatform , withFzf ? true , fzf - # checkInputs , fish , powershell @@ -13,12 +12,10 @@ , xonsh , zsh }: -let - version = "0.5.0"; -in -rustPlatform.buildRustPackage { + +rustPlatform.buildRustPackage rec { pname = "zoxide"; - inherit version; + version = "0.5.0"; src = fetchFromGitHub { owner = "ajeetdsouza"; @@ -55,6 +52,6 @@ rustPlatform.buildRustPackage { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ysndr cole-h ]; + maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; }; } diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index b03678858ad..5ddbf24bb6a 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config , makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion -, libutempter ? null, withUtempter ? stdenv.isLinux }: +, withUtempter ? stdenv.isLinux, libutempter }: stdenv.mkDerivation rec { pname = "mosh"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - meta = { + meta = with lib; { homepage = "https://mosh.org/"; description = "Mobile shell (ssh replacement)"; longDescription = '' @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 8296bc47919..1257c167e76 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,17 +1,15 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk3 ? null }: - -assert withGtk -> gtk3 != null; +, withGtk ? false, gtk3 }: stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; version = "0.94"; src = fetchFromGitHub { - owner = "traviscross"; - repo = "mtr"; - rev = "v${version}"; + owner = "traviscross"; + repo = "mtr"; + rev = "v${version}"; sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; @@ -38,9 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A network diagnostics tool"; - homepage = "https://www.bitwizard.nl/mtr/"; - license = licenses.gpl2; + homepage = "https://www.bitwizard.nl/mtr/"; + license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin globin ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix new file mode 100644 index 00000000000..8f88ae08762 --- /dev/null +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, perl, file }: + +buildGoModule rec { + pname = "holo-build"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "holocm"; + repo = pname; + rev = "v${version}"; + sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'VERSION :=' 'VERSION ?=' + substituteInPlace src/holo-build.sh \ + --replace '/usr/lib/holo/holo-build' '${placeholder "out"}/lib/holo/holo-build' + ''; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles perl ]; + + subPackages = [ "src/holo-build" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; + + postBuild = '' + make build/man/holo-build.8 VERSION=${version} + ''; + + checkInputs = [ file ]; + + checkPhase = '' + ln -s ../../go/bin/holo-build build/holo-build + go build -ldflags "-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" -o build/dump-package ./src/dump-package + bash test/compiler/run_tests.sh + bash test/interface/run_tests.sh + ''; + + postInstall = '' + installManPage build/man/* + installShellCompletion --bash --name holo-build util/autocomplete.bash + installShellCompletion --zsh --name _holo-build util/autocomplete.zsh + + # install wrapper script + mkdir -p $out/lib/holo + mv $out/bin/holo-build $out/lib/holo/holo-build + cp src/holo-build.sh $out/bin/holo-build + ''; + + meta = with lib; { + description = "Cross-distribution system package compiler"; + homepage = "http://holocm.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 1ece53203b1..906ca618e46 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.15"; + version = "3.14.16"; src = fetchFromGitHub { - sha256 = "sha256-vRtDctiulR5YmcwNCZtSU/tsRjs1+DP07NFVSL1TSuI="; + sha256 = "sha256-VZIeyLJBlh5/r0EHinSiPiQyCNUBFBYjDZ6nTVnZBbE="; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 04d41b74db0..364d3c6edc4 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,26 +1,36 @@ -{ lib, stdenv, fetchurl, perl /*, xmlto */}: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }: stdenv.mkDerivation rec { - name = "colordiff-1.0.19"; + pname = "colordiff"; + version = "1.0.19"; - src = fetchurl { - urls = [ - "https://www.colordiff.org/${name}.tar.gz" - "http://www.colordiff.org/archive/${name}.tar.gz" - ]; - sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; + src = fetchFromGitHub { + owner = "daveewart"; + repo = "colordiff"; + rev = "v${version}"; + sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk"; }; - buildInputs = [ perl /* xmlto */ ]; + nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; - dontBuild = 1; # do not build doc yet. + buildInputs = [ perl ]; - installPhase = ''make INSTALL_DIR=/bin MAN_DIR=/share/man/man1 DESTDIR="$out" install''; + postPatch = '' + substituteInPlace Makefile \ + --replace 'TMPDIR=colordiff-''${VERSION}' "" + ''; + + installFlags = [ + "INSTALL_DIR=/bin" + "MAN_DIR=/share/man/man1" + "DESTDIR=${placeholder "out"}" + ]; meta = with lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; homepage = "https://www.colordiff.org/"; - license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 2e60d2a31c0..c8eb43a51c9 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, boost }: -let - name = "source-highlight"; +stdenv.mkDerivation rec { + pname = "source-highlight"; version = "3.1.9"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; + url = "mirror://gnu/src-highlite/${pname}-${version}.tar.gz"; sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; @@ -26,15 +23,15 @@ stdenv.mkDerivation { enableParallelBuilding = false; - meta = { + meta = with lib; { description = "Source code renderer with syntax highlighting"; + longDescription = '' + GNU Source-highlight, given a source file, produces a document + with syntax highlighting. + ''; homepage = "https://www.gnu.org/software/src-highlite/"; - license = lib.licenses.gpl3Plus; - platforms = with lib.platforms; linux ++ darwin; - longDescription = - '' - GNU Source-highlight, given a source file, produces a document - with syntax highlighting. - ''; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index afcb649d921..4d0f87354ad 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, texinfo, which }: stdenv.mkDerivation rec { - name = "wdiff-1.2.2"; + pname = "wdiff"; + version = "1.2.2"; src = fetchurl { - url = "mirror://gnu/wdiff/${name}.tar.gz"; + url = "mirror://gnu/wdiff/${pname}-${version}.tar.gz"; sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl"; }; @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; - meta = { + meta = with lib; { homepage = "https://www.gnu.org/software/wdiff/"; description = "Comparing files on a word by word basis"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ eelco SuperSandro2000 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 77ca1204bf4..aac6f3c9a24 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -115,6 +115,7 @@ mapAliases ({ cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 d1x_rebirth = dxx-rebirth; # added 2018-04-25 @@ -846,7 +847,7 @@ mapAliases ({ todolist = throw "todolist is now ultralist."; # added 2020-12-27 - /* Cleanup before 21.03 */ + /* Cleanup before 21.05 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 423a6a34a49..2c6918116e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -297,6 +297,8 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; + dockle = callPackage ../development/tools/dockle { }; + docui = callPackage ../tools/misc/docui { }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -705,7 +707,9 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; - agate = callPackage ../servers/gemini/agate { }; + agate = callPackage ../servers/gemini/agate { + inherit (darwin.apple_sdk.frameworks) Security; + }; agda-pkg = callPackage ../development/tools/agda-pkg { }; @@ -1333,7 +1337,9 @@ in gremlin-console = callPackage ../applications/misc/gremlin-console { }; - grex = callPackage ../tools/misc/grex { }; + grex = callPackage ../tools/misc/grex { + inherit (darwin.apple_sdk.frameworks) Security; + }; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; @@ -3992,7 +3998,9 @@ in eva = callPackage ../tools/misc/eva { }; - exa = callPackage ../tools/misc/exa { }; + exa = callPackage ../tools/misc/exa { + inherit (darwin.apple_sdk.frameworks) Security; + }; exempi = callPackage ../development/libraries/exempi { stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; @@ -8379,7 +8387,9 @@ in toilet = callPackage ../tools/misc/toilet { }; - tokei = callPackage ../development/tools/misc/tokei { }; + tokei = callPackage ../development/tools/misc/tokei { + inherit (darwin.apple_sdk.frameworks) Security; + }; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; @@ -8429,6 +8439,8 @@ in trezor_agent = with python3Packages; toPythonApplication trezor_agent; + trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -10057,7 +10069,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; inherit (haskellPackages) ghc; @@ -10191,6 +10203,8 @@ in inherit (emacs.pkgs.melpaStablePackages) irony; }; + holo-build = callPackage ../tools/package-management/holo-build { }; + hugs = callPackage ../development/interpreters/hugs { }; openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; @@ -12657,7 +12671,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -28573,8 +28587,6 @@ in cups-brother-hll2340dw = pkgsi686Linux.callPackage ../misc/cups/drivers/hll2340dw { }; - cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; - # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; @@ -29380,6 +29392,8 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; + ssh-tools = callPackage ../applications/misc/ssh-tools { }; + auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; thermald = callPackage ../tools/system/thermald { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 46e222261fc..6c8e3e7d855 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -114,6 +114,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -221,6 +231,11 @@ in { ghc = bh.compiler.ghc8103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97a21306acb..010678d6842 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5204,6 +5204,8 @@ in { pyahocorasick = callPackage ../development/python-modules/pyahocorasick { }; + pyairnow = callPackage ../development/python-modules/pyairnow { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -6539,6 +6541,8 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; + pyvex = callPackage ../development/python-modules/pyvex { }; pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; @@ -6603,6 +6607,8 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -8488,7 +8494,9 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; - yq = callPackage ../development/python-modules/yq { }; + yq = callPackage ../development/python-modules/yq { + inherit (pkgs) jq; + }; yt = callPackage ../development/python-modules/yt { };