diff options
820 files changed, 16607 insertions, 11768 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bfb6f91bc7c67..79296f6473758 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -218,9 +218,9 @@ /nixos/modules/services/mail/rspamd.nix @peti # Emacs -/pkgs/applications/editors/emacs-modes @adisbladis -/pkgs/applications/editors/emacs @adisbladis -/pkgs/top-level/emacs-packages.nix @adisbladis +/pkgs/applications/editors/emacs/elisp-packages @adisbladis +/pkgs/applications/editors/emacs @adisbladis +/pkgs/top-level/emacs-packages.nix @adisbladis # Neovim /pkgs/applications/editors/neovim @jonringer @teto diff --git a/.github/labeler.yml b/.github/labeler.yml index e23cd9598ff9a..a3c1ed1b587f0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -16,7 +16,7 @@ - nixos/modules/services/editors/emacs.nix - nixos/modules/services/editors/emacs.xml - nixos/tests/emacs-daemon.nix - - pkgs/applications/editors/emacs-modes/**/* + - pkgs/applications/editors/emacs/elisp-packages/**/* - pkgs/applications/editors/emacs/**/* - pkgs/build-support/emacs/**/* - pkgs/top-level/emacs-packages.nix diff --git a/README.md b/README.md index e0970f85ff234..082469876b751 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ </p> <p align="center"> - <a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a> - <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a> + <a href="https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a> + <a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=supporters&color=brightgreen" alt="Open Collective supporters" /></a> </p> [Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 3f3ba60947ccd..0a90781d0c59e 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -103,7 +103,8 @@ Sample template for a new package review is provided below. - [ ] `meta.maintainers` is set - [ ] build time only dependencies are declared in `nativeBuildInputs` - [ ] source is fetched using the appropriate function -- [ ] phases are respected +- [ ] the list of `phases` is not overridden +- [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`. - [ ] patches that are remotely available are fetched with `fetchpatch` ##### Possible improvements diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 974f8747936a9..1d4ca99e3cbe5 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -325,6 +325,8 @@ This generic command invokes a number of *phases*. Package builds are split into Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. +When overriding a phase, for example `installPhase`, it is important to start with `runHook preInstall` and end it with `runHook postInstall`, otherwise `preInstall` and `postInstall` will not be run. Even if you don't use them directly, it is good practice to do so anyways for downstream users who would want to add a `postInstall` by overriding your derivation. + While inside an interactive `nix-shell`, if you wanted to run all phases in the order they would be run in an actual build, you can invoke `genericBuild` yourself. ### Controlling phases {#ssec-controlling-phases} @@ -337,7 +339,8 @@ There are a number of variables that control what phases are executed and in wha Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`. -Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`), as you then don’t specify all the normal phases. +It is discouraged to set this variable, as it is easy to miss some important functionality hidden in some of the less obviously needed phases (like `fixupPhase` which patches the shebang of scripts). +Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`). ##### `prePhases` {#var-stdenv-prePhases} @@ -794,7 +797,7 @@ Hook executed at the start of the distribution phase. Hook executed at the end of the distribution phase. -## Shell functions {#ssec-stdenv-functions} +## Shell functions and utilities {#ssec-stdenv-functions} The standard environment provides a number of useful functions. @@ -818,6 +821,19 @@ There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/bui Using the `makeBinaryWrapper` implementation is usually preferred, as it creates a tiny _compiled_ wrapper executable, that can be used as a shebang interpreter. This is needed mostly on Darwin, where shebangs cannot point to scripts, [due to a limitation with the `execve`-syscall](https://stackoverflow.com/questions/67100831/macos-shebang-with-absolute-path-not-working). Compiled wrappers generated by `makeBinaryWrapper` can be inspected with `less <path-to-wrapper>` - by scrolling past the binary data you should be able to see the shell command that generated the executable and there see the environment variables that were injected into the wrapper. +### `remove-references-to -t` \<storepath\> [ `-t` \<storepath\> ... ] \<file\> ... {#fun-remove-references-to} + +Removes the references of the specified files to the specified store files. This is done without changing the size of the file by replacing the hash by `eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`, and should work on compiled executables. This is meant to be used to remove the dependency of the output on inputs that are known to be unnecessary at runtime. Of course, reckless usage will break the patched programs. +To use this, add `removeReferencesTo` to `nativeBuildInputs`. + +As `remove-references-to` is an actual executable and not a shell function, it can be used with `find`. +Example removing all references to the compiler in the output: +```nix +postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + +''; +``` + ### `substitute` \<infile\> \<outfile\> \<subs\> {#fun-substitute} Performs string substitution on the contents of \<infile\>, writing the result to \<outfile\>. The substitutions in \<subs\> are of the following form: diff --git a/lib/licenses.nix b/lib/licenses.nix index aa3fa7c6e56f8..b9310ef6c5b88 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -596,6 +596,11 @@ in mkLicense lset) ({ spdxId = "MIT"; fullName = "MIT License"; }; + # https://spdx.org/licenses/MIT-feh.html + mit-feh = { + spdxId = "MIT-feh"; + fullName = "feh License"; + }; mitAdvertising = { spdxId = "MIT-advertising"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 95e9585546f9d..e8108a3ec6d72 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1206,6 +1206,12 @@ githubId = 262763; name = "Ayaz Hafiz"; }; + azuwis = { + email = "azuwis@gmail.com"; + github = "azuwis"; + githubId = 9315; + name = "Zhong Jianxin"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -6030,6 +6036,12 @@ githubId = 4611077; name = "Raymond Gauthier"; }; + jrpotter = { + email = "jrpotter2112@gmail.com"; + github = "jrpotter"; + githubId = 3267697; + name = "Joshua Potter"; + }; jschievink = { email = "jonasschievink@gmail.com"; matrix = "@jschievink:matrix.org"; @@ -6344,6 +6356,12 @@ githubId = 209729; name = "Kevin Griffin"; }; + kevink = { + email = "kevin@kevink.dev"; + github = "Unkn0wnCat"; + githubId = 8211181; + name = "Kevin Kandlbinder"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; @@ -8119,13 +8137,6 @@ githubId = 1001112; name = "Marcin Janczyk"; }; - mjlbach = { - email = "m.j.lbach@gmail.com"; - matrix = "@atrius:matrix.org"; - github = "mjlbach"; - githubId = 13316262; - name = "Michael Lingelbach"; - }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -10115,6 +10126,20 @@ githubId = 16624; name = "Maxim Ivanov"; }; + reckenrode = { + name = "Randy Eckenrode"; + email = "randy@largeandhighquality.com"; + matrix = "@reckenrode:matrix.org"; + github = "reckenrode"; + githubId = 7413633; + keys = [ + # compare with https://keybase.io/reckenrode + { + longkeyid = "ed25519/0xFBF19A982CCE0048"; + fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; + } + ]; + }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; @@ -11083,6 +11108,16 @@ github = "shikanime"; githubId = 22115108; }; + shiryel = { + email = "contact@shiryel.com"; + name = "Shiryel"; + github = "shiryel"; + githubId = 35617139; + keys = [{ + longkeyid = "ed25519/0xC4041EA6B32633DE"; + fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; + }]; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -13202,6 +13237,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xgroleau = { + email = "xgroleau@gmail.com"; + github = "xgroleau"; + githubId = 31734358; + name = "Xavier Groleau"; + }; xiorcale = { email = "quentin.vaucher@pm.me"; github = "xiorcale"; @@ -13258,7 +13299,7 @@ }; yana = { email = "yana@riseup.net"; - github = "alpakido"; + github = "sowelisuwi"; githubId = 1643293; name = "Yana Timoshenko"; }; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 86bf52afdc520..c586254d70964 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -214,7 +214,6 @@ with lib.maintainers; { mguentner ekleog ralith - mjlbach dandellion sumnerevans ]; diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml index 1dd15ddacba86..94172de65ea06 100644 --- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml @@ -7,11 +7,11 @@ <para> These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from a recent version of + option. To build the necessary files from your current version of nixpkgs, you can run: </para> <programlisting> -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' </programlisting> <para> This will create a <literal>result</literal> directory containing: * diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c234cda499f83..4242b27093cff 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -238,6 +238,13 @@ <link xlink:href="options.html#opt-services.headscale.enable">services.headscale</link> </para> </listitem> + <listitem> + <para> + <link xlink:href="https://0xerr0r.github.io/blocky/">blocky</link>, + fast and lightweight DNS proxy as ad-blocker for local network + with many features. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-incompatibilities"> @@ -408,6 +415,15 @@ </listitem> <listitem> <para> + Ntopng (<literal>services.ntopng</literal>) is updated to + 5.2.1 and uses a separate Redis instance if + <literal>system.stateVersion</literal> is at least + <literal>22.05</literal>. Existing setups shouldn’t be + affected. + </para> + </listitem> + <listitem> + <para> The backward compatibility in <literal>services.wordpress</literal> to configure sites with the old interface has been removed. Please use @@ -672,6 +688,12 @@ </listitem> <listitem> <para> + The <literal>vpnc</literal> package has been changed to use + GnuTLS instead of OpenSSL by default for licensing reasons. + </para> + </listitem> + <listitem> + <para> <literal>pkgs.vimPlugins.onedark-nvim</literal> now refers to <link xlink:href="https://github.com/navarasu/onedark.nvim">navarasu/onedark.nvim</link> (formerly refers to @@ -921,6 +943,12 @@ </listitem> <listitem> <para> + The <link xlink:href="https://dino.im">Dino</link> XMPP client + was updated to 0.3, adding support for audio and video calls. + </para> + </listitem> + <listitem> + <para> <literal>services.mattermost.plugins</literal> has been added to allow the declarative installation of Mattermost plugins. Plugins are automatically repackaged using autoPatchelf. diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md index 2016a258251f8..4fbd6525f8c3b 100644 --- a/nixos/doc/manual/installation/installing-pxe.section.md +++ b/nixos/doc/manual/installation/installing-pxe.section.md @@ -5,11 +5,11 @@ setup. These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another -option. To build the necessary files from a recent version of nixpkgs, +option. To build the necessary files from your current version of nixpkgs, you can run: ```ShellSession -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' ``` This will create a `result` directory containing: \* `bzImage` -- the diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 567a6d6780a16..b8e83591cc691 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -71,6 +71,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable) +- [blocky](https://0xerr0r.github.io/blocky/), fast and lightweight DNS proxy as ad-blocker for local network with many features. + <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} @@ -134,6 +136,8 @@ In addition to numerous new and upgraded packages, this release has the followin - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. +- Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected. + - The backward compatibility in `services.wordpress` to configure sites with the old interface has been removed. Please use `services.wordpress.sites` instead. @@ -211,6 +215,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions. +- The `vpnc` package has been changed to use GnuTLS instead of OpenSSL by default for licensing reasons. + - `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) (formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)). @@ -309,6 +315,8 @@ In addition to numerous new and upgraded packages, this release has the followin - A new module was added for the [Starship](https://starship.rs/) shell prompt, providing the options `programs.starship.enable` and `programs.starship.settings`. +- The [Dino](https://dino.im) XMPP client was updated to 0.3, adding support for audio and video calls. + - `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins. Plugins are automatically repackaged using autoPatchelf. diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index b730c4b44d7fc..569a0f3c61e48 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -241,9 +241,15 @@ class LegacyStartCommand(StartCommand): cdrom: Optional[str] = None, usb: Optional[str] = None, bios: Optional[str] = None, + qemuBinary: Optional[str] = None, qemuFlags: Optional[str] = None, ): - self._cmd = "qemu-kvm -m 384" + if qemuBinary is not None: + self._cmd = qemuBinary + else: + self._cmd = "qemu-kvm" + + self._cmd += " -m 384" # networking net_backend = "-netdev user,id=net0" @@ -381,6 +387,7 @@ class Machine: cdrom=args.get("cdrom"), usb=args.get("usb"), bios=args.get("bios"), + qemuBinary=args.get("qemuBinary"), qemuFlags=args.get("qemuFlags"), ) diff --git a/nixos/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix index e63f2d04d1a6f..eb03bf223ccfe 100644 --- a/nixos/modules/hardware/network/b43.nix +++ b/nixos/modules/hardware/network/b43.nix @@ -24,10 +24,6 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in ###### implementation config = mkIf config.networking.enableB43Firmware { - assertions = singleton - { assertion = lessThan 0 (builtins.compareVersions kernelVersion "3.2"); - message = "b43 firmware for kernels older than 3.2 not packaged yet!"; - }; hardware.firmware = [ pkgs.b43Firmware_5_1_138 ]; }; diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix index 61bab533edaf7..76cb4c6ee9bfe 100644 --- a/nixos/modules/hardware/video/capture/mwprocapture.nix +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -16,11 +16,6 @@ in config = mkIf cfg.enable { - assertions = singleton { - assertion = versionAtLeast kernelPackages.kernel.version "3.2"; - message = "Magewell Pro Capture family module is not supported for kernels older than 3.2"; - }; - boot.kernelModules = [ "ProCapture" ]; environment.systemPackages = [ kernelPackages.mwprocapture ]; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b6d9bd00629af..ca82ddfb58638 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -718,6 +718,7 @@ ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix + ./services/networking/blocky.nix ./services/networking/charybdis.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 66a47bcaab6c9..e63f19010de8a 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -92,7 +92,6 @@ let , permissions , ... }: - assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3"); '' cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" echo -n "${source}" > "$wrapperDir/${program}.real" diff --git a/nixos/modules/services/audio/jmusicbot.nix b/nixos/modules/services/audio/jmusicbot.nix index f573bd2ab8dd0..e0f8d461af076 100644 --- a/nixos/modules/services/audio/jmusicbot.nix +++ b/nixos/modules/services/audio/jmusicbot.nix @@ -9,6 +9,13 @@ in services.jmusicbot = { enable = mkEnableOption "jmusicbot, a Discord music bot that's easy to set up and run yourself"; + package = mkOption { + type = types.package; + default = pkgs.jmusicbot; + defaultText = literalExpression "pkgs.jmusicbot"; + description = "JMusicBot package to use"; + }; + stateDir = mkOption { type = types.path; description = '' @@ -27,7 +34,7 @@ in after = [ "network-online.target" ]; description = "Discord music bot that's easy to set up and run yourself!"; serviceConfig = mkMerge [{ - ExecStart = "${pkgs.jmusicbot}/bin/JMusicBot"; + ExecStart = "${cfg.package}/bin/JMusicBot"; WorkingDirectory = cfg.stateDir; Restart = "always"; RestartSec = 20; diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 9fca21002733a..c40a0b5abc40e 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -113,9 +113,10 @@ in }; }; services.mysql-backup = { - description = "Mysql backup service"; + description = "MySQL backup service"; enable = true; serviceConfig = { + Type = "oneshot"; User = cfg.user; }; script = backupScript; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index bdd5e82bd2635..f4197650ab23c 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -58,8 +58,8 @@ let package = (cfg.package.override (oldArgs: { # Respect overrides that already exist in the passed package and # concat it with values passed via the module. - extraComponents = oldArgs.extraComponents ++ extraComponents; - extraPackages = ps: (oldArgs.extraPackages ps) ++ (cfg.extraPackages ps); + extraComponents = oldArgs.extraComponents or [] ++ extraComponents; + extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps); })); in { imports = [ diff --git a/nixos/modules/services/matrix/mjolnir.xml b/nixos/modules/services/matrix/mjolnir.xml index d462ddf7b01be..b07abe3397917 100644 --- a/nixos/modules/services/matrix/mjolnir.xml +++ b/nixos/modules/services/matrix/mjolnir.xml @@ -98,7 +98,7 @@ </para> <para> To use the Antispam Module, add <package>matrix-synapse-plugins.matrix-synapse-mjolnir-antispam</package> - to the Synapse plugin list and enable the <literal>mjolnir.AntiSpam</literal> module. + to the Synapse plugin list and enable the <literal>mjolnir.Module</literal> module. </para> <programlisting> { @@ -108,7 +108,7 @@ ]; extraConfig = '' modules: - - module: mjolnir.AntiSpam + - module: mjolnir.Module config: # Prevent servers/users in the ban lists from inviting users on this # server to rooms. Default true. diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index 5a5c30a412330..2b9c6d80abbd7 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -39,9 +39,11 @@ in { default = "127.0.0.1"; description = '' The host name or IP address on which to bind Airsonic. - Only relevant if you have multiple network interfaces and want - to make Airsonic available on only one of them. The default value - will bind Airsonic to all available network interfaces. + The default value is appropriate for first launch, when the + default credentials are easy to guess. It is also appropriate + if you intend to use the virtualhost option in the service + module. In other cases, you may want to change this to a + specific IP or 0.0.0.0 to listen on all interfaces. ''; }; diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index d2b0f0da2ad92..e0a4d8a13e75f 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -6,7 +6,7 @@ let cfg = config.services.mbpfan; verbose = if cfg.verbose then "v" else ""; settingsFormat = pkgs.formats.ini {}; - settingsFile = settingsFormat.generate "config.conf" cfg.settings; + settingsFile = settingsFormat.generate "mbpfan.ini" cfg.settings; in { options.services.mbpfan = { @@ -36,29 +36,35 @@ in { freeformType = settingsFormat.type; options.general.min_fan1_speed = mkOption { - type = types.int; + type = types.nullOr types.int; default = 2000; - description = "The minimum fan speed."; + description = '' + The minimum fan speed. Setting to null enables automatic detection. + Check minimum fan limits with "cat /sys/devices/platform/applesmc.768/fan*_min". + ''; }; options.general.max_fan1_speed = mkOption { - type = types.int; + type = types.nullOr types.int; default = 6199; - description = "The maximum fan speed."; + description = '' + The maximum fan speed. Setting to null enables automatic detection. + Check maximum fan limits with "cat /sys/devices/platform/applesmc.768/fan*_max". + ''; }; options.general.low_temp = mkOption { type = types.int; default = 55; - description = "The low temperature."; + description = "Temperature below which fan speed will be at minimum. Try ranges 55-63."; }; options.general.high_temp = mkOption { type = types.int; default = 58; - description = "The high temperature."; + description = "Fan will increase speed when higher than this temperature. Try ranges 58-66."; }; options.general.max_temp = mkOption { type = types.int; default = 86; - description = "The maximum temperature."; + description = "Fan will run at full speed above this temperature. Do not set it > 90."; }; options.general.polling_interval = mkOption { type = types.int; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 360cdbac2a1e9..ee5c0ef8d277b 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -366,6 +366,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${binaryCommand} --port ${toString cfg.port} ${interfaceFlag} ${configFlag} --home ${cfg.dataDir}"; serviceConfig.User = cfg.user; + serviceConfig.Group = cfg.group; }; users.groups = optionalAttrs (cfg.group == "mediatomb") { diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix new file mode 100644 index 0000000000000..7488e05fc0331 --- /dev/null +++ b/nixos/modules/services/networking/blocky.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.blocky; + + format = pkgs.formats.yaml { }; + configFile = format.generate "config.yaml" cfg.settings; +in +{ + options.services.blocky = { + enable = mkEnableOption "Fast and lightweight DNS proxy as ad-blocker for local network with many features"; + + settings = mkOption { + type = format.type; + default = { }; + description = '' + Blocky configuration. Refer to + <link xlink:href="https://0xerr0r.github.io/blocky/configuration/"/> + for details on supported values. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.blocky = { + description = "A DNS proxy and ad-blocker for the local network"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix index 88b4cd90540f4..0dcf3d28f4e0e 100644 --- a/nixos/modules/services/networking/eternal-terminal.nix +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -90,6 +90,6 @@ in }; meta = { - maintainers = with lib.maintainers; [ pingiun ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 7482e29a3fda9..c213a5516a498 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -433,8 +433,6 @@ in drop the packet if the source address is not reachable via any interface) or false. Defaults to the value of kernelHasRPFilter. - - (needs kernel 3.3+) ''; }; diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 8e59c68054d2a..8f621b61002fc 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -3,7 +3,7 @@ let inherit (lib.options) literalExpression mkEnableOption mkOption; - inherit (lib.types) bool enum ints lines attrsOf nullOr path str submodule; + inherit (lib.types) bool enum ints lines attrsOf nonEmptyStr nullOr path str submodule; inherit (lib.modules) mkDefault mkIf mkMerge; commonDescr = '' @@ -17,8 +17,6 @@ let configuration to yield an operational system. ''; - str1 = lib.types.addCheck str (s: s!=""); # non-empty string - configAttrType = # Options in HylaFAX configuration files can be # booleans, strings, integers, or list thereof @@ -37,7 +35,7 @@ let modemConfigOptions = { name, config, ... }: { options = { name = mkOption { - type = str1; + type = nonEmptyStr; example = "ttyS1"; description = '' Name of modem device, @@ -45,7 +43,7 @@ let ''; }; type = mkOption { - type = str1; + type = nonEmptyStr; example = "cirrus"; description = '' Name of modem configuration file, @@ -135,14 +133,14 @@ in }; countryCode = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "49"; description = "Country code for server and all modems."; }; areaCode = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "30"; description = "Area code for server and all modems."; @@ -279,7 +277,7 @@ in each time the spooling area is initialized. ''; faxcron.enable.frequency = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "daily"; description = '' @@ -319,7 +317,7 @@ in each time the spooling area is initialized. ''; faxqclean.enable.frequency = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "daily"; description = '' diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index 1cc2ad1fc849c..1a44184ff6dcc 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -242,21 +242,6 @@ in { ''; }; - retain_attached_hw_handler = mkOption { - type = nullOr (enum [ "yes" "no" ]); - default = null; # real default: "yes" - description = '' - (Obsolete for kernels >= 4.3) If set to "yes" and the SCSI layer has - already attached a hardware_handler to the device, multipath will not - force the device to use the hardware_handler specified by mutipath.conf. - If the SCSI layer has not attached a hardware handler, multipath will - continue to use its configured hardware handler. - - Important Note: Linux kernel 4.3 or newer always behaves as if - "retain_attached_hw_handler yes" was set. - ''; - }; - detect_prio = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "yes" diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index 77a004e8ab3a5..022fc923edaa3 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -6,7 +6,13 @@ let cfg = config.services.ntopng; opt = options.services.ntopng; - redisCfg = config.services.redis; + + createRedis = cfg.redis.createInstance != null; + redisService = + if cfg.redis.createInstance == "" then + "redis.service" + else + "redis-${cfg.redis.createInstance}.service"; configFile = if cfg.configText != "" then pkgs.writeText "ntopng.conf" '' @@ -15,8 +21,10 @@ let else pkgs.writeText "ntopng.conf" '' ${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)} - --http-port=${toString cfg.http-port} - --redis=localhost:${toString redisCfg.port} + --http-port=${toString cfg.httpPort} + --redis=${cfg.redis.address} + --data-dir=/var/lib/ntopng + --user=ntopng ${cfg.extraConfig} ''; @@ -24,6 +32,10 @@ in { + imports = [ + (mkRenamedOptionModule [ "services" "ntopng" "http-port" ] [ "services" "ntopng" "httpPort" ]) + ]; + options = { services.ntopng = { @@ -56,7 +68,7 @@ in ''; }; - http-port = mkOption { + httpPort = mkOption { default = 3000; type = types.int; description = '' @@ -64,6 +76,24 @@ in ''; }; + redis.address = mkOption { + type = types.str; + example = literalExpression "config.services.redis.ntopng.unixSocket"; + description = '' + Redis address - may be a Unix socket or a network host and port. + ''; + }; + + redis.createInstance = mkOption { + type = types.nullOr types.str; + default = if versionAtLeast config.system.stateVersion "22.05" then "ntopng" else ""; + description = '' + Local Redis instance name. Set to <literal>null</literal> to disable + local Redis instance. Defaults to <literal>""</literal> for + <literal>system.stateVersion</literal> older than 22.05. + ''; + }; + configText = mkOption { default = ""; example = '' @@ -95,23 +125,36 @@ in config = mkIf cfg.enable { # ntopng uses redis for data storage - services.redis.enable = true; + services.ntopng.redis.address = + mkIf createRedis config.services.redis.servers.${cfg.redis.createInstance}.unixSocket; + + services.redis.servers = mkIf createRedis { + ${cfg.redis.createInstance} = { + enable = true; + user = mkIf (cfg.redis.createInstance == "ntopng") "ntopng"; + }; + }; # nice to have manual page and ntopng command in PATH environment.systemPackages = [ pkgs.ntopng ]; + systemd.tmpfiles.rules = [ "d /var/lib/ntopng 0700 ntopng ntopng -" ]; + systemd.services.ntopng = { description = "Ntopng Network Monitor"; - requires = [ "redis.service" ]; - after = [ "network.target" "redis.service" ]; + requires = optional createRedis redisService; + after = [ "network.target" ] ++ optional createRedis redisService; wantedBy = [ "multi-user.target" ]; - preStart = "mkdir -p /var/lib/ntopng/"; serviceConfig.ExecStart = "${pkgs.ntopng}/bin/ntopng ${configFile}"; unitConfig.Documentation = "man:ntopng(8)"; }; - # ntopng drops priveleges to user "nobody" and that user is already defined - # in users-groups.nix. + users.extraUsers.ntopng = { + group = "ntopng"; + isSystemUser = true; + }; + + users.extraGroups.ntopng = { }; }; } diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 9d063b92aa1e7..4f3881af8bbf8 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -81,7 +81,9 @@ let http_access deny all # Squid normally listens to port 3128 - http_port ${toString cfg.proxyPort} + http_port ${ + optionalString (cfg.proxyAddress != null) "${cfg.proxyAddress}:" + }${toString cfg.proxyPort} # Leave coredumps in the first cache dir coredump_dir /var/cache/squid @@ -109,6 +111,12 @@ in description = "Whether to run squid web proxy."; }; + proxyAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = "IP address on which squid will listen."; + }; + proxyPort = mkOption { type = types.int; default = 3128; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 1e3c7e53c175a..8208c85bfd708 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -92,6 +92,7 @@ let mastodonEnv = pkgs.writeShellScriptBin "mastodon-env" '' set -a + export RAILS_ROOT="${cfg.package}" source "${envFile}" source /var/lib/mastodon/.secrets_env eval -- "\$@" diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 8a0ca33b51f03..c6d4ed6d39dec 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -192,6 +192,7 @@ in { # Copy config folder chmod g+s "${dataDir}" cp -r "${cfg.package}/share/config" "${dataDir}/" + mkdir -p "${dataDir}/misc" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 68333d43a5d78..a8fe14c58f057 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -173,13 +173,18 @@ sub parseSystemdIni { # # If a directory with the same basename ending in .d exists next to the unit file, it will be # assumed to contain override files which will be parsed as well and handled properly. -sub parseUnit { - my ($unitPath) = @_; +sub parse_unit { + my ($unit_path) = @_; # Parse the main unit and all overrides - my %unitData; - parseSystemdIni(\%unitData, $_) for glob("${unitPath}{,.d/*.conf}"); - return %unitData; + my %unit_data; + # Replace \ with \\ so glob() still works with units that have a \ in them + # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\" + $unit_path =~ s/\\/\\\\/gmsx; + foreach (glob "${unit_path}{,.d/*.conf}") { + parseSystemdIni(\%unit_data, "$_") + } + return %unit_data; } # Checks whether a specified boolean in a systemd unit is true @@ -310,7 +315,7 @@ sub handleModifiedUnit { # Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 # More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 } else { - my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parseUnit($newUnitFile); + my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parse_unit($newUnitFile); if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0) and not $unitsToRestart->{$unit} and not $unitsToStop->{$unit}) { $unitsToReload->{$unit} = 1; recordUnit($reloadListFile, $unit); @@ -412,12 +417,12 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - my %unitInfo = parseUnit($prevUnitFile); + my %unitInfo = parse_unit($prevUnitFile); $unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1); } elsif ($unit =~ /\.target$/) { - my %unitInfo = parseUnit($newUnitFile); + my %unitInfo = parse_unit($newUnitFile); # Cause all active target units to be restarted below. # This should start most changed units we stop here as @@ -451,8 +456,8 @@ while (my ($unit, $state) = each %{$activePrev}) { } else { - my %old_unit_info = parseUnit($prevUnitFile); - my %new_unit_info = parseUnit($newUnitFile); + my %old_unit_info = parse_unit($prevUnitFile); + my %new_unit_info = parse_unit($newUnitFile); my $diff = compare_units(\%old_unit_info, \%new_unit_info); if ($diff eq 1) { handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 6edafd6695b62..cf6d19eb5f0ec 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -48,7 +48,12 @@ in what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; + mountConfig.Options = concatStringsSep "," [ "mode=1777" + "strictatime" + "rw" + "nosuid" + "nodev" + "size=${toString cfg.tmpOnTmpfsSize}" ]; } ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 5c91993771e4a..06117ab451d3c 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1325,22 +1325,13 @@ in val = tempaddrValues.${opt}.sysctl; in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val)); - # Capabilities won't work unless we have at-least a 4.3 Linux - # kernel because we need the ambient capability - security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then { + security.wrappers = { ping = { owner = "root"; group = "root"; capabilities = "cap_net_raw+p"; source = "${pkgs.iputils.out}/bin/ping"; }; - } else { - ping = { - setuid = true; - owner = "root"; - group = "root"; - source = "${pkgs.iputils.out}/bin/ping"; - }; }; security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' /run/wrappers/bin/ping { diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 898a66e7b04e3..ea89a994b172a 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -53,6 +53,7 @@ in virtualisation.containerd = { args.config = toString containerdConfigChecked; settings = { + version = 2; plugins."io.containerd.grpc.v1.cri" = { containerd.snapshotter = lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs"); diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 520c48bc45b4c..a0beaf98de5ce 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -52,6 +52,7 @@ in bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; + blocky = handleTest ./blocky.nix {}; boot = handleTestOn ["x86_64-linux" "aarch64-linux"] ./boot.nix {}; boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; diff --git a/nixos/tests/blocky.nix b/nixos/tests/blocky.nix new file mode 100644 index 0000000000000..18e7f45e1c738 --- /dev/null +++ b/nixos/tests/blocky.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix { + name = "blocky"; + + nodes = { + server = { pkgs, ... }: { + environment.systemPackages = [ pkgs.dnsutils ]; + services.blocky = { + enable = true; + + settings = { + customDNS = { + mapping = { + "printer.lan" = "192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344"; + }; + }; + upstream = { + default = [ "8.8.8.8" "1.1.1.1" ]; + }; + port = 53; + httpPort = 5000; + logLevel = "info"; + }; + }; + }; + }; + + testScript = '' + with subtest("Service test"): + server.wait_for_unit("blocky.service") + server.wait_for_open_port(53) + server.wait_for_open_port(5000) + server.succeed("dig @127.0.0.1 +short -x 192.168.178.3 | grep -qF printer.lan") + ''; +} diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 233c7dab1ee22..e479cd0579215 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -18,8 +18,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { # simple BEGIN probe (user probe on bpftrace itself) print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) # tracepoint - print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'")) + print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'")) # kprobe print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) + # BTF + print(machine.succeed("bpftrace -e 'kprobe:schedule { " + " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " + "}'")) ''; }) diff --git a/nixos/tests/doh-proxy-rust.nix b/nixos/tests/doh-proxy-rust.nix index 23f8616849c3d..11ed87d23bbe6 100644 --- a/nixos/tests/doh-proxy-rust.nix +++ b/nixos/tests/doh-proxy-rust.nix @@ -38,6 +38,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_unit("doh-proxy-rust.service") machine.wait_for_open_port(53) machine.wait_for_open_port(3000) - machine.succeed(f"curl --fail '{url}?dns={query}' | grep -F {bin_ip}") + machine.succeed(f"curl --fail -H 'Accept: application/dns-message' '{url}?dns={query}' | grep -F {bin_ip}") ''; }) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 3357d83342deb..4f297b6521d17 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -145,6 +145,23 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test.serviceConfig."X-Test" = "test"; }; + unitWithBackslash.configuration = { + systemd.services."escaped\\x2ddash" = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithBackslashModified.configuration = { + imports = [ unitWithBackslash.configuration ]; + systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -433,6 +450,25 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") + # Ensure \ works in unit names + out = switch_to_specialisation("${machine}", "unitWithBackslash") + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n") + assert_lacks(out, "as well:") + + out = switch_to_specialisation("${machine}", "unitWithBackslashModified") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + with subtest("failing units"): # Let the simple service fail switch_to_specialisation("${machine}", "simpleServiceModified") diff --git a/pkgs/applications/audio/freac/default.nix b/pkgs/applications/audio/freac/default.nix index 89c4847ededf5..ef4a6bc21afc3 100644 --- a/pkgs/applications/audio/freac/default.nix +++ b/pkgs/applications/audio/freac/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "freac"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "enzo1982"; repo = "freac"; rev = "v${version}"; - sha256 = "sha256-cRmN9D/+FLiXqZW/PYhw61EoZuL3y61YtQ/ZNjnhfmY="; + sha256 = "sha256-PDFc/RhxIe6M3lfVHE1QmJnu5Sy+q/yrXrXPV/8X51o="; }; buildInputs = [ diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 30dc359731f59..dc8bf53026498 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pname = "helvum"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "ryuukyu"; + owner = "pipewire"; repo = pname; rev = version; - sha256 = "sha256-Kt6gnMRTOVXqjAjEZKlylcGhzl52ZzPNVbJhwzLhzkM="; + sha256 = "0nhv6zw2zzxz2bg2zj32w1brywnm5lv6j3cvmmvwshc389z2k5x1"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-kxJRY9GSPwnb431iYCfJdGcl5HjpFr2KkWrFDpGajp8="; + hash = "sha256-EIHO9qVPIXgezfFOaarlTU0an762nFmX1ELbQuAZ7rY"; }; nativeBuildInputs = [ @@ -51,21 +51,9 @@ stdenv.mkDerivation rec { LIBCLANG_PATH = "${libclang.lib}/lib"; - patches = [ - # enables us to use gtk4-update-icon-cache instead of gtk3 one - (fetchpatch { - url = "https://gitlab.freedesktop.org/ryuukyu/helvum/-/merge_requests/24.patch"; - sha256 = "sha256-WmI6taBL/6t587j06n0mwByQ8x0eUA5ECvGNjg2/vtk="; - }) - ]; - - postPatch = '' - patchShebangs build-aux/cargo.sh - ''; - meta = with lib; { description = "A GTK patchbay for pipewire"; - homepage = "https://gitlab.freedesktop.org/ryuukyu/helvum"; + homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; license = licenses.gpl3Only; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 3bc06abcbffa3..60df749a14268 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp $src $out/lib/JMusicBot makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ - --add-flags "-Xmx1G -Dnogui=true -jar $out/lib/JMusicBot" + --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; meta = with lib; { diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 30011b2be3eac..8a25955e24988 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.2"; + version = "3.11.5"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-kvmBOw8fQZSC1jC8FRVq4v+i7mM6ol2IrDTqfJtuZYc="; + sha256 = "sha256-YkSsvhBbju/NEkT7RspZQYnLkcx/5POA8VtxCAL3Wcc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 420055884b453..be40def26441b 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { postPatch = '' patchShebangs tool + sed -i tool \ + -e 's@ncurses_dir=.*@ncurses_dir="${ncurses}"@' \ + -e 's@portmidi_dir=.*@portmidi_dir="${portmidi}"@' tool ''; installPhase = '' diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index ebda772b9bd33..e95e5d9c6d15e 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.10"; + version = "0.8.9.14"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = version; - sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w"; + sha256 = "sha256-9q+YsQPFB7Ql5WnXvPj100cD7pGkmr1hHztqbpZStt8="; }; checkPhase = '' diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 5e7f5c7cce2cc..444443cd10c41 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.0.1"; + version = "7.1.1"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ="; + sha256 = "sha256-eVliTSFTBG56mU1Crt3syoYxKclz/6W15y/30C+Tf1g="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 79742d48a9971..51557b3fecbcf 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.13.0.0"; + version = "0.14.1.0"; in stdenv.mkDerivation { pname = "aeon"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { repo = "aeon"; rev = "v${version}-aeon"; fetchSubmodules = true; - sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch"; + sha256 = "sha256-yej4w/2m9YXsMobqHwzA5GBbduhaeTVvmnHUJNWX87E="; }; nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 39d13189e8e60..389497b2ec39e 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "21.10.25"; + version = "21.12.3"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "a85ddda4e73dfadddbb77cf9bc84c30fc6b893ead46367d702976bbf4da5afa4"; + sha256 = "sha256-8Jgg9OxptkhD1SBjVBoklHQVCUOO+EePWnyEajqlivE="; }; sourceRoot = "."; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 3aa3f622024ff..842ebcc69ec81 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.15"; + version = "1.10.16"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1"; + sha256 = "sha256-l+hxAUw55d9MYLIUdF6qSEIelJQYRCvHyw1yuossmyA="; }; - vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd"; + vendorSha256 = "sha256-keeox2d2WEzY9ynEcovPaU95YzVQlbTu1i7PLpjkjZU="; doCheck = false; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 5afdf959cc52d..297eca2454293 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.38.2"; + version = "2.38.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-k6Rbxpe5BpRmlE+WL7iiFUtRCs5KlrLH2c3iSucUhqo="; + hash = "sha256-svNsVdenolrfMGKJvB/8HQMq08Ov5Oe5QooI1jFAcbI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 2004f607fe01d..007352ef84712 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -741,10 +741,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.18.tar"; - sha256 = "1g1b05wc9qql5qw3diprx0ay2rmq7963gdgyh7bi5i0xlfaspbgi"; + url = "https://elpa.gnu.org/packages/corfu-0.19.tar"; + sha256 = "0jilhsddzjm0is7kqdklpr2ih50k2c3sik2i9vlgcizxqaqss97c"; }; packageRequires = [ emacs ]; meta = { @@ -1236,10 +1236,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220120"; + version = "20220212"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220120.tar"; - sha256 = "0wbm7bd48vl66vhraqfwycz989hd36whris1xa5rbhfbxgz2d1sx"; + url = "https://elpa.gnu.org/packages/eev-20220212.tar"; + sha256 = "1w04jwh8y6l1fgx6sahwj9znw9cm83a1lld5vdgnbsww2m5nk8zm"; }; packageRequires = [ emacs ]; meta = { @@ -1339,10 +1339,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.13.tar"; - sha256 = "13gvljqj7k8qpyn9fcwa6gl3kqakiy5rqx5s3afdc2y356a06wr6"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.14.tar"; + sha256 = "1n9p4kl4d5rcbjgl8yifv0nqnrzxsx937fm0d2j589gg28rzlqpb"; }; packageRequires = []; meta = { @@ -1594,10 +1594,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.2.1.tar"; - sha256 = "1j4j1mxqvkpdccrm5khykmdpm8z9p0pxvnsw4cz9b76xzfdzy5pz"; + url = "https://elpa.gnu.org/packages/flymake-1.2.2.tar"; + sha256 = "04pa6mayyqrhrijk0rmmrd7k7al9caqyrb5qzkzwbna9ykb1j4zp"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2216,7 +2216,7 @@ version = "1.0.15"; src = fetchurl { url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar"; - sha256 = "1hx378rg12jz2zm105cvrqk0nqyzsn04l59d903l98d6lbd96rsw"; + sha256 = "0biwvkvd48xqvigzs00yz4mk847xzyzm7p0lkns58fxph9nkg4h5"; }; packageRequires = [ emacs ]; meta = { @@ -2426,7 +2426,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/map-3.2.1.tar"; - sha256 = "1vy231m2fm5cgz5nib14ib7ifprajhnbmzf6x4id48h2491m1n24"; + sha256 = "1zj0y3nvkrd2v43za214xr3h9z6wyp7r5s6nf5g1pj272yb871d1"; }; packageRequires = [ emacs ]; meta = { @@ -2483,10 +2483,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-0.4.2.tar"; - sha256 = "0as8298mb136az555zag5q3xvc7d0z508d3siii60wmzs9dyb8dx"; + url = "https://elpa.gnu.org/packages/mct-0.5.0.tar"; + sha256 = "0yv0hqkyh5vpmf5i50fdc2rw3ssvrd9pn3n65v3gmb195gzmn6r9"; }; packageRequires = [ emacs ]; meta = { @@ -2625,7 +2625,7 @@ version = "2.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/modus-themes-2.0.0.tar"; - sha256 = "16kvkm7hsdk6jfdjkzafwdkwwri7cqki29qxqqhzkpwwghqlissl"; + sha256 = "15d1ywj8k4yh57arzv7z2ir49gf2j7a80pscrfgxsypnyl2dkkfa"; }; packageRequires = [ emacs ]; meta = { @@ -3021,6 +3021,21 @@ license = lib.licenses.free; }; }) {}; + org-remark = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: + elpaBuild { + pname = "org-remark"; + ename = "org-remark"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-remark-1.0.2.tar"; + sha256 = "12g9kmr0gfs1pi1410akvcaiax0dswbw09sgqbib58mikb3074nv"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-remark.html"; + license = lib.licenses.free; + }; + }) {}; org-transclusion = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-transclusion"; @@ -3145,10 +3160,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.1.3.tar"; - sha256 = "13ssmdlni9ma6iafr4zwa2jlmq6rdlaafkdpli1a4jrk6ri6w996"; + url = "https://elpa.gnu.org/packages/parser-generator-0.1.4.tar"; + sha256 = "0712y22cl6i98jlhmsm436v0mlmscbypc15sdkn704a491ipq2qj"; }; packageRequires = [ emacs ]; meta = { @@ -3268,7 +3283,7 @@ version = "0.8.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; - sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; + sha256 = "0q2js8qihlhchpx2mx0f992ygslsqri2q4iv8kcl4fx31lpp7c1k"; }; packageRequires = [ emacs xref ]; meta = { @@ -3343,7 +3358,7 @@ version = "0.28"; src = fetchurl { url = "https://elpa.gnu.org/packages/python-0.28.tar"; - sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; + sha256 = "1kc596b8bbcp8y87kqyxsv3bblz8l0vyc0d645ayb1cmwwvk35d5"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3802,7 +3817,6 @@ license = lib.licenses.free; }; }) {}; - # removed duplicated shell-command-plus shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "shell-command-plus"; @@ -3945,7 +3959,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; - sha256 = "053msvy2pyispwg4zzpaczfkl6rvnwfklm4jdsbjhqm0kx4vlcs9"; + sha256 = "0gb5ypl9phhv8sx7akw9xn7njfq86yqngixhxf8qj1fxp57gfpdb"; }; packageRequires = [ emacs ]; meta = { @@ -3964,7 +3978,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/soap-client-3.2.1.tar"; - sha256 = "0ajv6l1p8dinnlybwzvv4c2i6291is6isjxb2h4apg27g66qbcki"; + sha256 = "0v3aj059cvfv5yc9fx8naq8ygphlpbasc1nksgfim8iyk9wg7l3n"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -4549,7 +4563,7 @@ version = "2021.10.14.127365406"; src = fetchurl { url = "https://elpa.gnu.org/packages/verilog-mode-2021.10.14.127365406.tar"; - sha256 = "0d842dwg98srv73nkg69c7x24rw20mxgqmb4k1qcbl02bwxkfmsm"; + sha256 = "1v0ld310rs86vzmlw7phv1b5p59faqs9wg4p8jpbnb9ap9lwidnl"; }; packageRequires = []; meta = { @@ -4734,10 +4748,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar"; - sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b"; + url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar"; + sha256 = "05wy147734mlpzwwxdhidnsplrz2vzs1whczzs4jw1i7kp7jvy3v"; }; packageRequires = [ emacs ]; meta = { @@ -4892,7 +4906,7 @@ version = "1.3.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/xref-1.3.2.tar"; - sha256 = "13bsaxdxwn14plaam0hsrswngh3rm2k29v5ybjgjyjy4d5vwz78j"; + sha256 = "1bwvli2d6d06gh004hnbbwy6rkn0jv1d1s7slfladqjjdkpjvpzd"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 89f2eb07d7d17..37559b0536ddc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -454,10 +454,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.3.1.tar"; - sha256 = "056z3ryj2288wgl8h4b33v9hybm8n2kfrqyb22bmlq1npcixyjl7"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.3.2.tar"; + sha256 = "1w34agw5qfgbpk6s2bllvgkj4wm1rlcyn33yfgj2xr4a5gfcs30a"; }; packageRequires = [ emacs ]; meta = { @@ -752,10 +752,10 @@ elpaBuild { pname = "geiser-gambit"; ename = "geiser-gambit"; - version = "0.17"; + version = "0.18.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.17.tar"; - sha256 = "12r9h1dl0y9j421v0idvr9ljj93962xfrs0nff5lmx5z1cayq456"; + url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar"; + sha256 = "03cv51war65yrg5qswwlx755byn2nlm1qvbzqqminnidz64kfd3v"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1039,31 +1039,31 @@ license = lib.licenses.free; }; }) {}; - helm = callPackage ({ elpaBuild, fetchurl, lib }: + helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup }: elpaBuild { pname = "helm"; ename = "helm"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.8.3.tar"; - sha256 = "00qjcv4qxjw50zp5dzvn79c0xpyla4h41fxkr2jjszq6qzgd92cv"; + url = "https://elpa.nongnu.org/nongnu/helm-3.8.4.tar"; + sha256 = "0yc7ijap3g68w7npgwymzlp5bcawk3lhnp0004m03zfdbxhmkq0z"; }; - packageRequires = []; + packageRequires = [ helm-core popup ]; meta = { homepage = "https://elpa.gnu.org/packages/helm.html"; license = lib.licenses.free; }; }) {}; - helm-core = callPackage ({ elpaBuild, fetchurl, lib }: + helm-core = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.3.tar"; - sha256 = "11ggn1fmi8wbg2igs5lqppyccgpz8kyfzl17wqkr5xy69lr1jn5g"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.4.tar"; + sha256 = "0a1liapy345nlqjgxbzad0mkdbs4g6619cqplwiyh89x0lm0jprx"; }; - packageRequires = []; + packageRequires = [ async emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/helm-core.html"; license = lib.licenses.free; @@ -1126,10 +1126,10 @@ elpaBuild { pname = "iedit"; ename = "iedit"; - version = "0.9.9.9"; + version = "0.9.9.9.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.tar"; - sha256 = "1kwm7pa1x5dbn9irdrz9vg5zivrqx1w2ywrbpglk2lgd9kff0nsj"; + url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar"; + sha256 = "1ic780gd7n2qrpbqr0vy62p7wsrskyvyr571m8m3j25fii8v8cxg"; }; packageRequires = []; meta = { @@ -1220,10 +1220,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.1.3.tar"; - sha256 = "0b4vyaxqdw11ai81vnvif8i02jcaf5hk64kbb7bs90527zwz2fw0"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.2.0.tar"; + sha256 = "0iiksz8lcz9y5yplw455v2zgvq2jz6jc2ic3ybax10v3wgxnhiad"; }; packageRequires = [ emacs ]; meta = { @@ -1325,10 +1325,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.4"; + version = "2.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar"; - sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z"; + url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.5.tar"; + sha256 = "195p4bz2k5rs6222pfxv6rk2r22snx33gvc1x3rs020lacppbhik"; }; packageRequires = [ emacs ]; meta = { @@ -1604,10 +1604,10 @@ elpaBuild { pname = "orgit"; ename = "orgit"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/orgit-1.7.2.tar"; - sha256 = "1kf72l8h3wqgnrchy6wvhm3nmc9drh82yw5211f4xgg2ckr60rn1"; + url = "https://elpa.nongnu.org/nongnu/orgit-1.8.0.tar"; + sha256 = "03qjhiv3smnpjciz5sfri7v5gzgcnk5g0lhgm06flqnarfrrkn1h"; }; packageRequires = [ emacs magit org ]; meta = { @@ -1640,10 +1640,10 @@ elpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseclj-1.0.6.tar"; - sha256 = "0cs6a394pll9sl8ybpsygg9mkznpz119f8hjgw3n7mgkwfc5a30k"; + url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.0.tar"; + sha256 = "0h6fia59crqb1y83a04sjlhlpm6349s6c14zsiqsfi73m97dli6p"; }; packageRequires = [ emacs ]; meta = { @@ -1655,10 +1655,10 @@ elpaBuild { pname = "parseedn"; ename = "parseedn"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseedn-1.0.6.tar"; - sha256 = "1274pr91hcrvy4srdy2dw14hbcg2qy24z4klx6mashgzb1r42n3d"; + url = "https://elpa.nongnu.org/nongnu/parseedn-1.1.0.tar"; + sha256 = "1by9cy7pn12124vbg59c9qmn2k8v5dbqq4c8if81fclrccjqhrz4"; }; packageRequires = [ emacs map parseclj ]; meta = { @@ -2009,10 +2009,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.2.tar"; - sha256 = "187ksczrqqzjnbvh8px3xvqyf38i7ac24z1qxzybd4vx2n071v64"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.3.tar"; + sha256 = "0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg"; }; packageRequires = [ emacs ]; meta = { @@ -2146,6 +2146,21 @@ license = lib.licenses.free; }; }) {}; + typescript-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "typescript-mode"; + ename = "typescript-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar"; + sha256 = "1102c35w2b66q5acvhsk6yigzhp6n3rl0s28xnvb74ansk4rz35k"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/typescript-mode.html"; + license = lib.licenses.free; + }; + }) {}; ujelly-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ujelly-theme"; @@ -2245,10 +2260,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.1.1.tar"; - sha256 = "175k68mr0n3v5l3gbv2fsdfznm9yjy32l3ay6hj0d4c53kw76hvn"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.2.0.tar"; + sha256 = "1rsggbhkngzbcmg3076jbi1sfkzz8p4s5i00sk0ywc6vkmsp6s1k"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index fc60a6916c48e..a45ebde817a5c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20211208, - 2116 + 20220217, + 2054 ], - "commit": "b1a436922ba06ab9e1a5cc222f1a4f25a7697231", - "sha256": "0alscwf2937ak2pzgl9jih7s9dya7kibl59qik4fy6xbq5h52v77" + "commit": "1cb08537e255c60a9439e3fea7c5d406e32f5e97", + "sha256": "1mm8c69r9jjs4qr0nha7pj1i8pq03q4nban4pik280swn4c8f3zl" }, "stable": { "version": [ @@ -2601,15 +2601,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220125, - 1547 + 20220217, + 604 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "1365b83824614656278b0b818fadf293e8ec0973", - "sha256": "0xx0ls0i6rhnacyscxzpnpdm9vy79lj634jvi9cp572y742l7cpx" + "commit": "d2658536b58cb42e9f2dac551d42055b734552ba", + "sha256": "0mn5dqcfs4z5lsl5104zf7km819xcxpmdk3v7r9dnrnny3al7qfi" }, "stable": { "version": [ @@ -2672,11 +2672,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20220205, - 722 + 20220212, + 1526 ], - "commit": "a1671339bde3dec273b367bf7dc849d1c306dac6", - "sha256": "17n11prkp1d1ln16jcfyy1m6wp6i8qi57zwy8g9cr13xwgq9f324" + "commit": "2a61756abccb9cf3c0e353ca894ce5d5bee0f93b", + "sha256": "0la0bwnbbjbdmhxhz77s48icqfrf3axl2xgbc82cz93axd67y530" }, "stable": { "version": [ @@ -2754,25 +2754,6 @@ } }, { - "ename": "ammonite-term-repl", - "commit": "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a", - "sha256": "004cvhyh4afgpb31m1q31g98x8c9m6lmsb5fzc4a1r5pb4p3iimp", - "fetcher": "github", - "repo": "zwild/ammonite-term-repl", - "unstable": { - "version": [ - 20200416, - 559 - ], - "deps": [ - "s", - "scala-mode" - ], - "commit": "b552fe21977e005c1c460bf6607557e67241a6b6", - "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6" - } - }, - { "ename": "ample-regexps", "commit": "6a5c72dfb52d55b2b22c91f115b32fff14f2f61e", "sha256": "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2", @@ -2819,20 +2800,20 @@ }, { "ename": "amread-mode", - "commit": "2155dbd9bdf7b1f6f500c11ad1796c2ba2ddadec", - "sha256": "19wafb0aszphdmx9ayiazvq2avj9kqhanszh714n397810ak7k0v", - "fetcher": "github", - "repo": "stardiviner/amread-mode", + "commit": "b94f03b35acf501b2c4c638b5b0a745dbda804f2", + "sha256": "0xwqk4nd9hkq133l9b1n9lrv6nrfirpfzin53gb2a8v442s2anfc", + "fetcher": "git", + "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20200623, - 1544 + 20220210, + 1354 ], "deps": [ "cl-lib" ], - "commit": "7b1ed6c8aea409e2dce4a3b59f304d716a8efab7", - "sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x" + "commit": "a3358645582148e81bff54e18877451b747173bb", + "sha256": "0nl1w5ysq90bxl16jrdh87wyp6ffawbjc3c6zrbhsfmfd24jiq28" } }, { @@ -3250,8 +3231,8 @@ 20200914, 644 ], - "commit": "9911f73061e21a87fad76c662463257afe02c861", - "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk" + "commit": "d4333bbfbdb93fb9cc2ea321438bf552ec0adee6", + "sha256": "07vswfw20bavl82cdi7p84dgkjkx0x117cs2kkf6is8b0wwa22g8" }, "stable": { "version": [ @@ -3903,20 +3884,20 @@ }, { "ename": "arduino-mode", - "commit": "2db785f52c2facc55459e945ccb4d4b088506747", - "sha256": "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v", - "fetcher": "github", - "repo": "stardiviner/arduino-mode", + "commit": "eba5c2d5ea1316bf49cd9928c82b63efbe502708", + "sha256": "12lpcqmgklflbayp45wh7sdw4whywz4pxdb6fvlmnxzjc9lamdhc", + "fetcher": "git", + "url": "https://repo.or.cz/arduino-mode.git", "unstable": { "version": [ - 20211112, - 1223 + 20220210, + 1355 ], "deps": [ "spinner" ], - "commit": "3bc47bd7f75a7ccae409236dab43208ce8d41d51", - "sha256": "1jsifn9gfpb2rwhz9fr6r4qsmyydfd6rmz87iy7884nrnxkmdsci" + "commit": "652c6a328fa8f2db06534d5f231c6b6933be3edc", + "sha256": "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x" } }, { @@ -4315,8 +4296,8 @@ 20201026, 339 ], - "commit": "411e9c943cf8ee966d7850c69b5e3c405e268246", - "sha256": "00977n8sp0bbpnbqwj2jfdvm9d9cqwfl4mn1wv1dj6bzfzxp68mc" + "commit": "3abed97b7a139b07a89fb2a8434c794892a3f96a", + "sha256": "05wdi6bab8avy6512q09fdwfn6vl9d1xjvrrs2m2mj9gl31anli2" }, "stable": { "version": [ @@ -4339,8 +4320,8 @@ 20210731, 609 ], - "commit": "7d6332093d2ad6963b2305ad3038f44b941a43c1", - "sha256": "01xdll1gyachgh9p9pc3c0pdki2h2xmiri9cslsaq48y9gklgaw2" + "commit": "8cc7ce7f5a7366ab3532c074b09ae716a8396713", + "sha256": "10pkh1n1ay5jqfh59l42kl9z76d5397ak3rak6l1gg55jy7xjkh2" }, "stable": { "version": [ @@ -4640,8 +4621,8 @@ "keytar", "s" ], - "commit": "c9ce75de3784ba68b44a643e4d00e59e351d976a", - "sha256": "03pa44qhyyyv476gbpzshywr2yg6m48rq6kgzli3bajd4ysm9ism" + "commit": "35781cc09d578a72f4a63d674753570a1df6a301", + "sha256": "0krrgif4zvsr7ggnh6qpclcc8pc2lfdn0785as3iqd0hmgxgyd4m" }, "stable": { "version": [ @@ -4783,8 +4764,8 @@ "cl-lib", "popup" ], - "commit": "57cb8f2ee32dff17ea1b4431fe5920272aa38d72", - "sha256": "185q90ibw17dh2nwdljapdw2747hzv32n4hkjfcfsgw5asy58r8z" + "commit": "71dd984aa45dccea1cb797d336507eafa81b5bf4", + "sha256": "0cayj63jn1dc01bn4z87l783fiis4ixvmbww2pqii1i06mxsqxaw" }, "stable": { "version": [ @@ -5090,11 +5071,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20211101, - 1155 + 20220209, + 2101 ], - "commit": "a1c67bf557277934f6dae9f2de6624d949ef2c8a", - "sha256": "0z5afn48w3p3i98zn81422khbl0k460spgqj60b9s7sqccbssg57" + "commit": "33b5f88b799a17947c266b04ad59462c5aeb4ed7", + "sha256": "17h9hh8n6ib1crap8jdgjhaszvlqb4gri1z821apyn66lqvix7x8" } }, { @@ -5111,8 +5092,8 @@ "deps": [ "ht" ], - "commit": "5949aa269d3781985c3c9fc5e557bd82c3c1f7e4", - "sha256": "01qqdkd16zy5sqla821k2q3bh4gmlq5xp5wdar58rm7cww6r4w5x" + "commit": "d7a924febb2aa3ce6ce88ec31e317522e4965ff4", + "sha256": "08gmvq5ywh338ss99mvb9hc1p93dvq6hn6294kyp7v6svmrsgzjj" }, "stable": { "version": [ @@ -5261,8 +5242,8 @@ 20210805, 1344 ], - "commit": "77f66b75209628a267a5ced84cd85774e0e26b9a", - "sha256": "1n0b74zhj4v9gniy33im4cahxx33mhbkhjpb4ra4qahqdyl5a7c9" + "commit": "8d5cf320b7e151577bd1cb69541253f3b8fd0eaf", + "sha256": "1j2g4qzyw8l21bvw4gmah62a2z0dvblasvagd66jghdnvraz4rf6" }, "stable": { "version": [ @@ -5329,14 +5310,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20210522, - 612 + 20220209, + 554 ], "deps": [ "f" ], - "commit": "0dec9e632f1f3208f0da2f94b57efa1aae9ce2ab", - "sha256": "1isk9106lpdh45l41n2v8q8m9vcfb4biy9dv87rkks58nysrxy3z" + "commit": "df455f9723fbaab8ab550c7e7df79dc6b2d159c6", + "sha256": "14n77h7w69w0i845dbbq39nxnh1xw28kacp0cgf666r62vgdcvvj" }, "stable": { "version": [ @@ -5466,11 +5447,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20220201, - 2102 + 20220215, + 1204 ], - "commit": "8965ce57c7d206e5d28167a37c11b9713576b009", - "sha256": "13ccb1r646c0k9vgr1h9r4xfn27yqw1489dj76nwq13awg81pjyr" + "commit": "00b87a82c4561b017052974eecd93c79b6790841", + "sha256": "1cnnw2cwhsrlp2nanvcgdpd90vpmzwxnr9sprwfgzldgk9651r58" } }, { @@ -5674,8 +5655,8 @@ "avy", "embark" ], - "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", - "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" + "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", + "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" }, "stable": { "version": [ @@ -6457,11 +6438,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20220114, - 1320 + 20220208, + 1818 ], - "commit": "57a28859258bc83f2cca62b8530221d228119655", - "sha256": "1vlg4b1k3jw2pssa7fpf9sx9bjb4gmswkcyv30ha4c8pm39byp79" + "commit": "90ff1d9b4c39ecb53bf1b0992d3c44049bc4b4eb", + "sha256": "0wfw0gdlx9xx874wqhi6nn23zw10anyrppz5ca2i7h3fqr2x72fk" } }, { @@ -6502,11 +6483,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20210108, - 38 + 20220211, + 546 ], - "commit": "03c9ab00642fd54d7fb601f95a094b8b7f0eefb0", - "sha256": "1nk4d3qb5ibdjp3jmlbf5751y8zd6gms9r19l3hk1ajkw94p43kn" + "commit": "1172bd901e29f5c001d52ef521b2b3ae50f3110c", + "sha256": "1cs0wsa4dr01rhdfqf28psmmbf0vpiazxk755r6vclxzr69cf3z6" }, "stable": { "version": [ @@ -6898,8 +6879,8 @@ 20210715, 1004 ], - "commit": "0be8e2ef7b40d9006b2812f103746799bc529828", - "sha256": "1grzlfa4dxf30yf7y40fw9fqm4fl74k5kcyxpffy3d876c7qdfnp" + "commit": "1df6e44fcb5a1d579a5f3b39b6e9256a4e8f3b9f", + "sha256": "0l3ji8w1fvzc0i2j9lp6w20pm9sbnz48iaais44jb0yi39b7mmy8" }, "stable": { "version": [ @@ -7576,8 +7557,8 @@ 20200404, 1550 ], - "commit": "9a208d395db66aebadf663344f18effffaac59fe", - "sha256": "1c8i82wxhldzbczhcdfnk9cggsfqpqbg9zar426drvn7vcz6xs3m" + "commit": "c221fa2c8a204b4aff2e09c606f59be58b960b97", + "sha256": "1zzrmlxifplpskm3a7hbm4x6mpikr1nhgds10qaxqv0gfq312p1c" }, "stable": { "version": [ @@ -7596,26 +7577,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220122, - 2332 + 20220213, + 1310 ], "deps": [ "a" ], - "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb", - "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k" + "commit": "ed208798ecbc299003581229114d9404cd3f6c7a", + "sha256": "19zas7vam5l742ihpvjf56z9fzj9w71f1j1w7lmgvgs1zl76ycjy" }, "stable": { "version": [ 0, 3, - 8 + 9 ], "deps": [ "a" ], - "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb", - "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k" + "commit": "ed208798ecbc299003581229114d9404cd3f6c7a", + "sha256": "19zas7vam5l742ihpvjf56z9fzj9w71f1j1w7lmgvgs1zl76ycjy" } }, { @@ -8021,11 +8002,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20220201, - 544 + 20220212, + 156 ], - "commit": "ff0d1c3531352a6c54bb48ced797f41bda95939e", - "sha256": "06cprpbff06q98d06vljcrmvixvdnvjmwqgxvpz9yx7s14ml289l" + "commit": "70ae40b4c4cdf44999ee4c738f5a4ae34a2d8421", + "sha256": "1hidzm6yv5fqx93shfxx70xsjbyzkia00ylxd06jniqpydl3fydh" } }, { @@ -8036,11 +8017,11 @@ "repo": "minad/bookmark-view", "unstable": { "version": [ - 20211223, - 1106 + 20220216, + 2024 ], - "commit": "841750afb272a596f1536e6a5731d9de22c7c5cb", - "sha256": "0bgbmjbjq70q4zmdhaz9jnhi5gkzxwz9fbh60sgnm90hjmfrrr2d" + "commit": "314e74e11386af72ca282e228996321a8a6d4c9a", + "sha256": "1bqajd2slg5gh33q84ps9cpv0g04y5gz6m8gy55m01f2zrwxvyqc" }, "stable": { "version": [ @@ -8116,28 +8097,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220131, - 1421 + 20220216, + 1925 ], "deps": [ "epkg", "magit" ], - "commit": "0bad132b4eb25ae9a1e26360e7b87771ab3208d3", - "sha256": "134cirgaxypsr39dlhshw3db4d9cz56dhl4d7d41lbzysih472km" + "commit": "ee4491481955eb49de07693b58e00a5ff5908d0b", + "sha256": "1p13q43l9da48vpwgjwirwvwqwlmksgvq4w6n77sy6akx2xywgzv" }, "stable": { "version": [ 3, 3, - 0 + 1 ], "deps": [ "epkg", "magit" ], - "commit": "e4d54aac5c2307cafb5c509094701b9ca78cace8", - "sha256": "102qdb4581gfhrxv61pd6yw5xbyd3vs8ifq2wp9wq6bf19il2rm9" + "commit": "66f00318777a3530741535f64a420addc1ccf44a", + "sha256": "0w180am9p952j2iyidf5krivlx19mv1ji1f34cwm969mhb3652fy" } }, { @@ -8817,8 +8798,8 @@ 20200924, 345 ], - "commit": "b48834a688e35b9966fa5a189781c7638092fd54", - "sha256": "1msg17qw6clld78jb40hd1fnsgswql57yw4kh37mn0v2ksa8a9s5" + "commit": "327c378c333156321974ffcf93f19aa9fad59a9e", + "sha256": "02wihnxifb17g9hn0l6ia63whfxvx7351s64ffpvvjjryz8l95fg" }, "stable": { "version": [ @@ -9565,11 +9546,11 @@ "repo": "unhammer/calendar-norway.el", "unstable": { "version": [ - 20210608, - 1136 + 20220211, + 1129 ], - "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", - "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" + "commit": "0db0ea63365f4ff5f7d18fb8335fa88af194a2cc", + "sha256": "0bhqr67w301fb74drnw6291bri9ga95946n7jg382jcp6sxn9cpg" }, "stable": { "version": [ @@ -9753,18 +9734,19 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20210728, - 802 + 20220214, + 1251 ], "deps": [ "anaconda-mode", + "beacon", "cl-lib", "hierarchy", "ivy", "tree-mode" ], - "commit": "7a40f9ddb16a6ce9345e0bd632109b7e2048baa1", - "sha256": "18as7vq8cmhxkxgh0p8qlifyvza66n6xf9a2fi07wc4acp2gpn55" + "commit": "aa5ffb15cec39920012aa526e932d48e5c74bbb0", + "sha256": "12rsylxr9ls6br38vwq9h6fzqsqjxgqwyv76wf6qaazd4rp76m0y" }, "stable": { "version": [ @@ -9893,11 +9875,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220201, - 2018 + 20220214, + 1115 ], - "commit": "dba8492f70a46fde51d6269ae971693fd1777575", - "sha256": "1jaygxplh2y8lqq7p0yynql5zrb6yf0vyrcbwi1dvllq0clncnwn" + "commit": "e5e11f30f0b6ed0a2b283d5d3dec84bcd36557fc", + "sha256": "0qxypl6ghr31idgn2mvwgjkp1fhjlhwjldnqim4l658yxivh2jyz" }, "stable": { "version": [ @@ -9919,8 +9901,8 @@ 20210707, 2310 ], - "commit": "55a368beb987abf9eeb9b3843e9c5423ad37ab29", - "sha256": "1cnc69ny4icjz9rzqj5sli5vbqkrv3sbahbsl1c0ma28rbqasw0w" + "commit": "767b8a30ee100f1c648a75c9aaf252212d904c17", + "sha256": "0hdfi052yfmsfzx00wxmsk129vvxdhcgixnyjaf13kamg2xm69im" }, "stable": { "version": [ @@ -9970,14 +9952,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220102, - 1217 + 20220208, + 1933 ], "deps": [ "markdown-mode" ], - "commit": "5589f9f46f3e1cdeb6261515ce314aab40f3d786", - "sha256": "133cj1qbb53hm3ffkvf80cyd6hj69l8kxklnig8ap1ymhha075g3" + "commit": "841ea7d85edd10c94138339469c4d8bbd03c8a29", + "sha256": "0gnah3bdcii2xrjnwpr9kzl5x8p85dv61yl48j3fizanjmwhan13" }, "stable": { "version": [ @@ -10289,8 +10271,8 @@ 20210501, 820 ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "eede626d70953715d2405b325dcb151b7cb597e7", + "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" } }, { @@ -10338,8 +10320,8 @@ 20200904, 1431 ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "eede626d70953715d2405b325dcb151b7cb597e7", + "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" } }, { @@ -10608,8 +10590,8 @@ 20171115, 2108 ], - "commit": "049018b8f756a41643fdbaa45372b310d56e4211", - "sha256": "1gb7dz2jd0fvxzc4spp3c3hmpwcy8cqkw2qspnhkbxc7q7hirski" + "commit": "62380f6c464be1f773820db99d3529277e427e1f", + "sha256": "16w4njjv1z67syx1w2vi7vbf2n78r33jjcq74bwk3hqv440nq95f" }, "stable": { "version": [ @@ -11080,14 +11062,14 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220131, - 1935 + 20220214, + 311 ], "deps": [ "magit" ], - "commit": "3d7f6bf3abaf0f236e159bde4751b55bc803a7d6", - "sha256": "0xyn59r3m453vy2x1gm7cmw6pd8ws1jiq5979cb8cr068g8pkp18" + "commit": "e037884556aec7f4f6b830a6f44b1dcb51120d40", + "sha256": "11hmipc7ia4zsbdw000ii7n9ck1fhlbvfz5jznfiqfgwyamacd8z" } }, { @@ -11257,21 +11239,21 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220123, - 739 + 20220215, + 1904 ], "deps": [ "dash", "seq", "ts" ], - "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", - "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", + "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ @@ -11279,8 +11261,8 @@ "seq", "ts" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11310,26 +11292,26 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220123, - 2006 + 20220215, + 1904 ], "deps": [ "chronometrist" ], - "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", - "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", + "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "chronometrist" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11340,28 +11322,28 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220123, - 739 + 20220215, + 1904 ], "deps": [ "chronometrist", "spark" ], - "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e", - "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh" + "commit": "2b2bfa27787ae524852abcb75408b0b1927aa2e1", + "sha256": "11lnj6fd9xhwhwr900vjbzbviqrza29b9nf8d53b4bzdrij6ilgw" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "chronometrist", "spark" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11420,8 +11402,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220204, - 917 + 20220216, + 732 ], "deps": [ "clojure-mode", @@ -11431,8 +11413,8 @@ "sesman", "spinner" ], - "commit": "e8b582e1f28b27cdb0574e0f9361cbb9eb62afd0", - "sha256": "1dazvxk5fbqgipkwvk35b5hdbfakq0f7mn8nmqzaj03nd66dn55m" + "commit": "7afa8ac74b1e511387ac9bfe5b0bee83c1dbb943", + "sha256": "0nhvn0jrpkzzjv94b98l293pfbibfx2srlck5ycdi3760lk4k6vh" }, "stable": { "version": [ @@ -11731,8 +11713,8 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220204, - 1902 + 20220217, + 1606 ], "deps": [ "citeproc", @@ -11740,8 +11722,8 @@ "parsebib", "s" ], - "commit": "903dcd3d21be58ec2f7ac61432ff26f037373180", - "sha256": "1danf825jj5ahsicwnb8szis0ixqysy0k4vflvhbjwhl9n38rwg6" + "commit": "b84cb375933053cf3e5408f0386034e8dabca5cb", + "sha256": "0hgyl2akvm5z13x403hmk3xyybbdp40sxbkf97m81k9y8m5fz7lz" }, "stable": { "version": [ @@ -12215,8 +12197,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220206, - 1011 + 20220213, + 1906 ], "deps": [ "cider", @@ -12229,13 +12211,13 @@ "seq", "yasnippet" ], - "commit": "d1b68c7807476de95a684fa52de294c96b3e8523", - "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay" + "commit": "542225248e8d27111d6164292b37058ad5194984", + "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" }, "stable": { "version": [ 3, - 2, + 3, 3 ], "deps": [ @@ -12249,8 +12231,8 @@ "seq", "yasnippet" ], - "commit": "d1b68c7807476de95a684fa52de294c96b3e8523", - "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay" + "commit": "542225248e8d27111d6164292b37058ad5194984", + "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" } }, { @@ -12627,26 +12609,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20210927, - 2245 + 20220216, + 1906 ], "deps": [ "emacsql-sqlite" ], - "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", - "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" + "commit": "1ba85ce9f7094aeddce25044689278eda6739531", + "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "emacsql-sqlite" ], - "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", - "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" + "commit": "1ba85ce9f7094aeddce25044689278eda6739531", + "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" } }, { @@ -12810,17 +12792,19 @@ 20210104, 1831 ], - "commit": "3d91571f795e7cf2a0e74af1f72398fcd529703b", - "sha256": "0vd0my900iyg7xzccnlml3qg2lgrvyqgagp7zrn33k1sbxsnzcxi" + "commit": "77871555de842d837170c9f7add1971385468c40", + "sha256": "0xv3qxbckv5488kypfn9krlk5pc4hkf3zk3zm130310d3vbf3ff2" }, "stable": { "version": [ 3, - 22, - 2 + 23, + 0, + -1, + 1 ], - "commit": "8428e39ed9cddb3b7f1a6f7a58cb8617503183d2", - "sha256": "1c2rczn67bpyhpacyn4qpg71p8dnqvvqndfgqjfd94h4zafcygjv" + "commit": "a15cc7706da8f4a1833539be3f37fbc63ee20e36", + "sha256": "1wbs5z1gd0gi6m79jqp6chhgisk4j8z9x6i91094d98yplnmrwgl" } }, { @@ -13019,8 +13003,8 @@ "markdown-mode", "uuidgen" ], - "commit": "ccc3795a72554439f230969322c0e3239252c193", - "sha256": "17vn75v7hh5mj27g28m62xinv50f2h00kjyk84gk72j7ivymlcc9" + "commit": "ced8a31f331c034b00165d1eb6ac76f5a21db9b6", + "sha256": "1yrgkj634p9hf1jrlcy6f4yydyc4z5ig7pq14yxhfcnw0cf8ksr6" }, "stable": { "version": [ @@ -13472,8 +13456,8 @@ "deps": [ "s" ], - "commit": "d4715c27815e41db8b489c860a470215b6098d02", - "sha256": "151cbiizw57l1n4c1bcdzx5rxg86wiqm7qmd8gn8l42prmh7iwm0" + "commit": "0ef51fac2fda5d890e53c2f24c9f1b1859b05ad1", + "sha256": "0gfgy6jvdmh6p069g4imssz6330p2kx1vbprjnqj7q34knkpv37i" }, "stable": { "version": [ @@ -13801,8 +13785,8 @@ }, { "ename": "company", - "commit": "f42849df31122aa293edcbcbed834260d21037b2", - "sha256": "0fci8v7grd2c6vfky0fdsrxi0874jfkw52zba4ap43bbx1mb2166", + "commit": "7eadfd36ae9b7bd241c38d09a7203873538983fb", + "sha256": "1wxadzsf7vrnxj7zhnwrz0vva9zgr99s0lb677dllrj1zdryixwx", "fetcher": "github", "repo": "company-mode/company-mode", "unstable": { @@ -14265,8 +14249,8 @@ "emojify", "ht" ], - "commit": "32cd04a1c2f692e6ece07cc3d3a7627240edaa8e", - "sha256": "0fb5zyp3cgv7iyjbxxm7bjqq0pmhlv212wnylldqwij647w22iia" + "commit": "059e1686d2132b2fb03dabf87cf7ad12201ccfef", + "sha256": "0gv9pa75pfr5xi4ryjf4qc4fs4vv3w1a52b0mwcwixbl9c6x34fr" }, "stable": { "version": [ @@ -14361,16 +14345,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20220127, - 817 + 20220210, + 305 ], "deps": [ "company", "ht", "s" ], - "commit": "50b4fbc0d812e12aab21267f78a1acfb1d863943", - "sha256": "1175vfy3ilac73xyj3y644q3rfq0v5vjpjakdahkz337di7cxd73" + "commit": "56bbdd6e878bd7bbdc7c6306ed721792d594a131", + "sha256": "1dkrwa8xjzws27lz6f31mb45kwwswv4p9hdzpbkibznf40pmgdp6" }, "stable": { "version": [ @@ -14781,21 +14765,21 @@ }, { "ename": "company-nginx", - "commit": "fb8843cddfa9133ea9e2790e8a1d8051cd4dabea", - "sha256": "15pxz0v3zpshwri0v15yh995k7ih9h46y81n4xywlyyh34wys3sj", - "fetcher": "github", - "repo": "stardiviner/company-nginx", + "commit": "8c91310797748b45a5f08c26f70f0715ba6dec50", + "sha256": "08ngwig4fb2qkmlrh36hx990jwafndaprv3wgqmd1lyizzi94ig1", + "fetcher": "git", + "url": "https://repo.or.cz/company-nginx.git", "unstable": { "version": [ - 20201020, - 2038 + 20220210, + 1411 ], "deps": [ "cl-lib", "company" ], - "commit": "82bdb730ad5971c594d9c99c069f3c7bb067897d", - "sha256": "0qrlqir7fa2zf97yfsg8phj5dqgjz2rzn5zspfk9qlys3j8i483d" + "commit": "8a9f1a5653fe2d9a5042bfb9377d54f37fcc64c8", + "sha256": "0ylblgf34zpmdmwmd1vp8z59p024f176a1m75kwj96in65y6b6b9" } }, { @@ -15154,8 +15138,8 @@ "company-quickhelp", "popup" ], - "commit": "d56b17f234232e739838891b958877511cfe73f1", - "sha256": "05sp0z6gsvfp0phkdhzpnh8q3r4rkrqlhlqxvlsdnyaw78872hlh" + "commit": "d89313233663dc7b49291feb1e464471dee3e759", + "sha256": "06s4fi7xdhyzp4xbv12kcs699wqxzrvfcg02fz4p4bbm9nsi3l69" }, "stable": { "version": [ @@ -16014,11 +15998,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220201, - 1112 + 20220217, + 1627 ], - "commit": "1a6ed29e92f00266daff4ff5f62602f53ef7d158", - "sha256": "137s984r5nf9j5padha45n9jhyh82ik4yybcr9nljg86l065s3nz" + "commit": "44580944f95d52bcd5a3ed79adef57e51aca7e31", + "sha256": "0b05vxialpal5ddmahls1lfnlm9wi5c622mvlikr0qis0000bglp" }, "stable": { "version": [ @@ -16253,8 +16237,8 @@ "consult", "projectile" ], - "commit": "655b328ce3fe51a8ff89d7b0a839bc8dfe9e51c0", - "sha256": "1gy6vg5vrd9i0y2sck20fbqrdz0bgcr6647rvnl2nvpv3shzlsbj" + "commit": "29a7e54dbeb8e5d5e07c0546e60f6a7a6b79bbb8", + "sha256": "1n4hv4yb0pysbcv4rb3xw3550jzz6msi91ghxmvl7nf7shvd9gg7" } }, { @@ -16718,14 +16702,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20220113, - 455 + 20220211, + 548 ], "deps": [ "counsel" ], - "commit": "257f9457f60384eeaf29c1f458852b648eaf366c", - "sha256": "0llghbv6zqy9nl3iivk6pd2mmxw3xhlz6dkgn9j9srrabddzkfxk" + "commit": "28b26ecac676d6a3942f1b96d2916f4c23d9b3ab", + "sha256": "0dmr5aa74kziwmf8w1jr38lb23yir0mff2wjiidgpxm452pwwrqy" } }, { @@ -16905,14 +16889,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20211210, - 1127 + 20220213, + 1104 ], "deps": [ "counsel" ], - "commit": "bafd22a20c3328b0cf81aa9c35bfa37a095cf9c3", - "sha256": "1p651ykxbakzhwlrxcz4v62kj4f78l83f67qcghi58sq9cvwg1gi" + "commit": "80b5816c1fab8c0621601f7fbe7ba65b2c67e9cd", + "sha256": "10bprk9ixbsyfzrl7b23gc6wgwwyg4ksyw9w28071r2hpz2dssv7" }, "stable": { "version": [ @@ -18576,17 +18560,17 @@ 20211111, 1407 ], - "commit": "2a304b0f9e6c9a98f2a8a38d80404a34e6623cd8", - "sha256": "1mqd1594y7spnbwq5y3xgj3wsllzc2gqgg4dns2afp10xiv0l23y" + "commit": "8a59142db687b733b4ffe55c40fa03dc132122c6", + "sha256": "041zngk9ixp3ybpyca7klp0l37ylprfxq4lcydvnwlz7lgjgxff0" }, "stable": { "version": [ 0, 29, - 27 + 28 ], - "commit": "229a4531780863c8a5c311d6b3c70a545988f85f", - "sha256": "1pvfamxnvh9by6658wmqyvm30af3ykhks9mwkqfz9ww161avxzd8" + "commit": "27b6709241461f620fb25756ef9f1192cc4f589a", + "sha256": "0k5wnrvnwq699mvvngraq5d93pyyiz77sn9dcqjrazc74b63sm8w" } }, { @@ -18728,11 +18712,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20211019, - 1630 + 20220214, + 552 ], - "commit": "e74c5960eae3db90bf1b3ea7e71a2406c27554a8", - "sha256": "1vpfhiqwhdfa0w4akh6wfam88qkjy73i8yryfaz8a5qbm60nd43h" + "commit": "eaf1c6a99cd1697a805a3f04325906412eef8171", + "sha256": "1nb34gmzlypq3yccm4dwii86pn6k75hb9y50ldsyx3x93zwcm3dk" } }, { @@ -18784,8 +18768,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211117, - 1555 + 20220216, + 1029 ], "deps": [ "bui", @@ -18797,8 +18781,8 @@ "posframe", "s" ], - "commit": "76cad34de8984f57c2b1e374e9c985cc7ec8dad0", - "sha256": "0q37nnxvb362pni0nralb6cpw7vvaj0kw63y8zpip8szwj9yqrki" + "commit": "8d110d4fa62c406aee836b352f5d5a3454e338b4", + "sha256": "0rpgfnlp1ixbam8iq2wxvmxbi8v6lhab2l3azm2294w2sr1r4qzg" }, "stable": { "version": [ @@ -19148,11 +19132,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220129, - 533 + 20220208, + 915 ], - "commit": "d6e9f4df42815de467765e78b7c27125f35d30bb", - "sha256": "02lhkk4z8va95fnv5x4sd3xdas28gf3ykbl7gry015sms9jxj7w3" + "commit": "7ae46300df5d22d3941ff9f10bc52d232985b628", + "sha256": "1qv5vffbf0wjymdhabc3jl4h9ib9x38swabsjs23rm3a5jf9b091" }, "stable": { "version": [ @@ -19481,15 +19465,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210522, - 348 + 20220210, + 2155 ], "deps": [ "ccc", "cdb" ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "eede626d70953715d2405b325dcb151b7cb597e7", + "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" } }, { @@ -19531,16 +19515,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20211228, - 1756 + 20220209, + 719 ], "deps": [ "dash", "s", "spinner" ], - "commit": "aebaf72e35546fd235b4861399791814e4e4c7d8", - "sha256": "1qd60winrrpxmrjsx77i24921p6dad9halz5l5s6biwa421zcgr3" + "commit": "0a3ba239c458ffc4f63a180b43d0e70b81742a3e", + "sha256": "0xavp98da1hr0jsq5dr2h4rfs5y1qgnv3b3pnpc08rfj1h4x211b" }, "stable": { "version": [ @@ -19737,11 +19721,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20220104, - 215 + 20220214, + 2326 ], - "commit": "6b6fe704ea233c65e50263dc0ff584409065e42f", - "sha256": "0ly7k6rkvhw1pwgmmn4cpgbizw2f2ry1swlaq0zf2k6ln7pyl96z" + "commit": "1727055b59e21e91a5b72356968232e31a92f743", + "sha256": "098s8s9j8gvzkkyx6ivd84bi0dmf2p6a3nlz215ljl43l97134pw" } }, { @@ -20173,11 +20157,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220128, - 1441 + 20220217, + 1624 ], - "commit": "a632b3cddc88bc1ed5f323afba03d91c34453194", - "sha256": "08z1i260r3i7shybcwyiq5michwwfpmzvvnqpppcasazrgpz6vyz" + "commit": "783e9a6d4b0a36dfb646e3b9dad19c54018f7195", + "sha256": "19hlrz8vhabxgbdbqgkiav73wnfb33kb1nv53v8v0jvz9gh7a33j" } }, { @@ -20254,10 +20238,10 @@ }, { "ename": "diary-manager", - "commit": "a014f4d862a2480f7edb1266f79ce0801cca13c2", - "sha256": "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d", + "commit": "0a4be0096baf0b451541376318d6fd7a50798c9d", + "sha256": "0i4mbp06g2zpiwq3x00np9yr81klbbvr28p7l4fsmg7dmmbd6kap", "fetcher": "github", - "repo": "raxod502/diary-manager", + "repo": "radian-software/diary-manager", "unstable": { "version": [ 20210404, @@ -20390,11 +20374,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20220130, - 2254 + 20220211, + 548 ], - "commit": "f2207a67e3cc79433b43deeb463d0768357c350f", - "sha256": "1avfss2syaqsrdb4nlgsd49xyiy6bjqsf17r2is5il8g4yj1jabs" + "commit": "6ced92510df2c121e577189fa838dbf84303a0a9", + "sha256": "0mdyb2mlckcwphm6yaapdw6m2w2br0yfsvi6maw422mnm6nvjlwh" } }, { @@ -20405,11 +20389,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20210921, - 603 + 20220211, + 548 ], - "commit": "63951d8236163d86d5261b35d6c9a3f3f280e876", - "sha256": "1l1smrb2xmnz4cyimyvhq9hl406w364gkvqsk32b1q4jcvqhmdz4" + "commit": "819da8d75762e1fb1a975d78c2b4666506048485", + "sha256": "1l3q7ks4ylr85ywyrg49hk0wvzlj97rznwmqsf74awgfcl1cy7nk" } }, { @@ -20761,20 +20745,20 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20210715, - 1026 + 20220217, + 1855 ], - "commit": "5ea0f4da3b9ad863ce21503715fd62722e4cd6ec", - "sha256": "139dwggd97mbq1p5g1dqxaml6j0wbk2w0gcgy4wv8fb4xppzklkb" + "commit": "672de7e1d022cb7da47a746ba508fe23f7bd6737", + "sha256": "0rnsq6cmffcygdkg2n8kn3sg1pddcl4ww93pwm7nx1iqf4afwxfb" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], - "commit": "387858aaa23d5d1145c98dfa70bbd39bb8c3fa5f", - "sha256": "13a3jkc5yf1m2gqabvfxfzxgblyhyni9f2clqx9i0pvr9dvvb9r8" + "commit": "f5305840a5a09043f1d012cf50a55dc41317c080", + "sha256": "1129jgpfyh4b88rqjmsi2siyamqfrgmks5vqy0vvj9avsh2wkszc" } }, { @@ -21807,11 +21791,11 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220203, - 1118 + 20220214, + 1730 ], - "commit": "bc278f42110fe34e14ebfce0cda036b3ce17730a", - "sha256": "16rqyfj7lsrkp7a406z23dkcz7c6vb0gh6243ywjiwiqj7qdzcqc" + "commit": "55d0a5cbfcf2c4d14ce049eece102c48bdc774b2", + "sha256": "1cqjwmra0llmj7qn0661yi9aawy3snbjjzmmv3c70qs0nzgws19d" } }, { @@ -22438,11 +22422,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220104, - 216 + 20220211, + 548 ], - "commit": "6bfea44e0b54c80255d34d15130940a09814e2a3", - "sha256": "0rkshqiy9msnsif9fxi484by76fl8zjyzijgxphqlv2h2bb3pbgd" + "commit": "5705f8d6f5583d50fc0497a88f06fb7c84a9ddb0", + "sha256": "189bahsiyv7j0h1i1nfilr5rp2bihfgi19lipdxmixfmfv8fjy6j" } }, { @@ -22490,10 +22474,11 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20211105, - 138 + 20220216, + 1424 ], "deps": [ + "aio", "dash", "docker-tramp", "json-mode", @@ -22501,16 +22486,17 @@ "tablist", "transient" ], - "commit": "8d64cf4f84d7da5f839a8248fdddfb635a63f803", - "sha256": "1ivyvgh24nadhiv9ffqxckwln8vc9c2l0bvrvrd53yf0w8i345yz" + "commit": "81f2b379af504428bf2c93a77c7aeb8e56a0f219", + "sha256": "0wyx77hyprw307r486q0x58navyzn7vbx1lsr8c94mb9ykq4icwq" }, "stable": { "version": [ - 1, - 4, + 2, + 0, 0 ], "deps": [ + "aio", "dash", "docker-tramp", "json-mode", @@ -22518,8 +22504,8 @@ "tablist", "transient" ], - "commit": "4fc69969b11687896b6c71b099de5d4c12c1c685", - "sha256": "0s57dq04d97dvrbxzicyk5z9f1mn8gf9w4nbgrxd9dnjqz335173" + "commit": "9a232f563868786d7f50f0a99da2b552f5b83dc8", + "sha256": "18irvpwlbjczrcijs0zdidsmzzdi2kn9d56iqb8nn1qfgydshql6" } }, { @@ -22696,14 +22682,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20211004, - 722 + 20220214, + 1539 ], "deps": [ "s" ], - "commit": "b3f9e6c209c2c98de01211aa7a0a4cf6ee3cdf4f", - "sha256": "0ffnq0inxal39725amfv72yprynwx2hqrxhdb7pyx7x8z4zh8f4y" + "commit": "3d350b221bca9f9f1a0b2168158c471bcf5ee9ac", + "sha256": "0ygnkaqlqc82mkf2hxhrqz7hn0nmbwc0nwh4p0mwc5wfy3v6lcs6" }, "stable": { "version": [ @@ -22726,11 +22712,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220121, - 2018 + 20220209, + 646 ], - "commit": "9ed9b8c7f7e2ea2d2fb739d65ae4626a1cf16b9f", - "sha256": "11rzq8qbvivmi2sj5gw4g4n7qf8zjjypqz8xvn6s3w4ahz8n5nmd" + "commit": "ce21bce19b91e6f1dfc1f23983b4b8ce4464c8f5", + "sha256": "0gdxg9r4nxp856vgp764cf3w81awbc6rczym27xlxzp1m7s6rfyy" } }, { @@ -22863,16 +22849,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220129, - 1017 + 20220207, + 911 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "b1726bf6b3328763851dfa1d343e4b2f1ccad125", - "sha256": "1qalk74l8vkv69ph642m6m2rvqq5pfvx8jfr40kpf83lx5amrch2" + "commit": "30d15b121f58a26f503e3bb63aa5d74445114493", + "sha256": "0c5q4laawx6r99qabys40dwnqax5xiry9hi1d158bcl6kndyhz1n" }, "stable": { "version": [ @@ -22916,14 +22902,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220127, - 2136 + 20220216, + 1451 ], "deps": [ "cl-lib" ], - "commit": "f55e32cebb2c756c1c0019cad5aff59abb5882bb", - "sha256": "10bcg2yi0axccp2nks4di2by5y4d7j4vhjg1h692qkc908gb9irs" + "commit": "9253497b6b1f86ea682313744b3eceb629918508", + "sha256": "14vbj663v7zsahs94nfkxfg15iw6d7b2577cv4vyfqxv9q29rwg4" }, "stable": { "version": [ @@ -23167,11 +23153,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220118, - 748 + 20220209, + 724 ], - "commit": "a7a3becaf11488eee36d50c06a692f3fa4201297", - "sha256": "0v3yan01yhqz6k34x580j7q8xirgbv86ghsc153k175jc7ig0hi0" + "commit": "2c9efdae8b7b9a8e57dfd3aa1c62426a262e9eba", + "sha256": "1wblaspw1yb2xgymlajjqap5rkj6danrsh8hnkhpcd1x9q49llis" }, "stable": { "version": [ @@ -23394,11 +23380,11 @@ "repo": "niklaseklund/dtache", "unstable": { "version": [ - 20220206, - 1134 + 20220209, + 1903 ], - "commit": "948c110bbdd802a530f393580d74f3dc8bbdda1e", - "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + "commit": "9b39e9ebbfd19bae1b0b30e98b574f0e8a952bec", + "sha256": "0jx228qzqmw3ncrjqdd6jhphl6j58iyg7knmk6favbsnr3nl2y54" }, "stable": { "version": [ @@ -23602,17 +23588,17 @@ 20210909, 1010 ], - "commit": "8e155da034f1f1c10fed88bdba4887ac26be9bcf", - "sha256": "1j3i8sikcpywzr0syrq70qf00cyk0kgcdqcp579v3sgm9p0mgnfg" + "commit": "32ef2d50be4e1f9f16f3cb2d9727be0c24920ec4", + "sha256": "0pc41hqzaw23gfxlhp2ar2ixha7vd4vizv13bk71mv5gx6bqlprq" }, "stable": { "version": [ 3, 0, - -3 + 1 ], - "commit": "3cb82b394cb8e13b2e1be32c57aff321e563c6ff", - "sha256": "1c04qk2k3v1m0wp6scsqh0bq3wwkmazfr9apzqsdhw0pm83z4kx0" + "commit": "b6709437aa1b264826735963e0d7c199c4ddf82e", + "sha256": "1vaxxczna6lbpzh6w1sj4pg06as2354labl7m725d02wmwq3vdpd" } }, { @@ -24661,17 +24647,17 @@ }, { "ename": "edebug-inline-result", - "commit": "235b422e95ecce5671a16d44bc648379b6859bed", - "sha256": "036fpy7f748c8z7di94ya1dwz2ckri3qm6bsl809myr5wsghp2w1", - "fetcher": "github", - "repo": "stardiviner/edebug-inline-result", + "commit": "ba1a7a8fb085122021ce21e42e7834c35a949551", + "sha256": "0wfgwq5nkadlq3jbrlw9nabr1lqcl5y6bnb8xzj8l6glcryxazvb", + "fetcher": "git", + "url": "https://repo.or.cz/edebug-inline-result.git", "unstable": { "version": [ - 20210213, - 25 + 20220210, + 1357 ], - "commit": "86a9ed9e4f58c2e9870b8918dc898ccd78d2d3f8", - "sha256": "1zf09s03xkhpbhkj99ilzp679lhkyiaaa5kmyj4lb380di1nrw2w" + "commit": "9fb3c48434da24f800833a5ee3419452d5fb83cb", + "sha256": "09rqvs1vj6h8k93xi5h2r1vba2hj5dl7bk7x9ry6mcr3m0c2z6di" } }, { @@ -24749,20 +24735,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20211201, - 1541 + 20220216, + 1812 ], - "commit": "7fffd87ac3b027d10a26e8492629da01a4cd7633", - "sha256": "18pbxl68bw33kr9vb1f7d9gra4wlndykv6vn7mj2h7d92p9pjcig" + "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", + "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" }, "stable": { "version": [ 0, 1, - 6 + 8 ], - "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", - "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" + "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", + "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" } }, { @@ -25944,11 +25930,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20211218, - 1738 + 20220209, + 2301 ], - "commit": "eb4ae2e7e03a5fc26b054ba2fa9a1d308e239c76", - "sha256": "0wznxssmh2f0jx4c8mci5idzsixpzcxyaa7yxi9ip5h4qig73sqm" + "commit": "ed8de0e9d218723f45200542b21a68dc8440f278", + "sha256": "0q1vr5ks04qjzml13wzmzkvm1za3faq9m2y5f3g0z254fh82cbbb" } }, { @@ -25993,11 +25979,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20211219, - 1520 + 20220213, + 1633 ], - "commit": "bcfbef5062b54451171db56159e22765a25ec22a", - "sha256": "119qm2g3zwgmlrh82ydi343phmwvic5flppzm3ya4k8nklr2dlgk" + "commit": "0d65a3f022e4cf2dec0b6aa313625b060e41ddb8", + "sha256": "121va329mjh8nv4q4jy0sfs026f8zfgmmfz2lm439amcl5b4hazj" }, "stable": { "version": [ @@ -26017,11 +26003,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20210608, - 2202 + 20220216, + 2221 ], - "commit": "13d207d40863a041b84c34f075668c7931db5a78", - "sha256": "1cvwp01w0adgxwlsispmir4wgs73cl62n5rh7ri6rw6g4fribq1m" + "commit": "3efb59ab784a704f075e4925ecadb1999c950440", + "sha256": "0fzz8wpnqf5b4kafm4a7r6x4dnczf48jxqmxgbs14wh2wrxazr82" }, "stable": { "version": [ @@ -26073,21 +26059,21 @@ }, { "ename": "eldoc-overlay", - "commit": "f865b248002d6d3ba9653c2221072a4aa54cd740", - "sha256": "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x", - "fetcher": "github", - "repo": "stardiviner/eldoc-overlay", + "commit": "0eeadba56dc484e771f400d32a875e392610f071", + "sha256": "18544jdv2n1ip4x2x04dm1xhna7k60hr5zs46ls6rgmnbgh5g8zl", + "fetcher": "git", + "url": "https://repo.or.cz/eldoc-overlay.git", "unstable": { "version": [ - 20210630, - 1345 + 20220210, + 1358 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "3edbfb23836bdef253f4a5fd125952e55877d2b2", - "sha256": "1r2fjdra4bav16c108jzzjd2qhng7493i7l7znbasialf40j3cbs" + "commit": "b96f5864a47407ec608c807e0d890f62b891ee03", + "sha256": "1rdpg18gffh7ss5di6f4l1wks904867r38w0ilpgb52p8j0pswa0" } }, { @@ -26308,14 +26294,14 @@ }, { "ename": "elfeed", - "commit": "407ae027fcec444622c2a822074b95996df9e6af", - "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9", + "commit": "25cd87f2f80a7228ae65ec26dc6c87f50fd2f9d0", + "sha256": "16f6y81n1kh9fhyl9950pfm0z3knv1ygam2cs41ydz6drnrvh119", "fetcher": "github", "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210606, - 1130 + 20210822, + 2129 ], "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" @@ -27212,20 +27198,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220202, - 2138 + 20220208, + 1726 ], - "commit": "68388182b99d7e12ec649826cf0a8d167be57a88", - "sha256": "1ylxkdhln63g0pli51r7jxp07g7r09agi72dw5mgxld1kgxln9m6" + "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", + "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" }, "stable": { "version": [ 3, 3, - 1 + 2 ], - "commit": "22649fd442d505af3367a6386fa7f0da9a82c9e8", - "sha256": "121hkssy6c15gdr76k3fmdpk82354hk597gvkap6dc9y5j5968mk" + "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", + "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" } }, { @@ -27326,8 +27312,8 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20220205, - 2040 + 20220208, + 17 ], "deps": [ "cl-lib", @@ -27336,8 +27322,8 @@ "seq", "trinary" ], - "commit": "ea2d2afee38af1511728f61083b22a3e688c7570", - "sha256": "0xp7dgn5llh58v9mkj9wd6wx81q26bgxxf8vdrllyz35rkwb1sq4" + "commit": "82ffb6eecefde7e99383e4a657f17fe414287846", + "sha256": "1aya2cavpvagkhhrxzvs3d4qgddfjxl097d571xp3gzi3cn7k35r" } }, { @@ -27589,14 +27575,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220130, - 457 - ], - "deps": [ - "cl-lib" + 20220209, + 1510 ], - "commit": "ace53396a66ed4b753f42c04a5a0db2bcd770423", - "sha256": "0p55shxvqm1713af33mfglny7rpi31d42wvgwylcsfy4jvnsq8bb" + "commit": "634924587be831bcb3ca47e97c104216516f9ca9", + "sha256": "0mmd5lr424mn76yrk61cjmzwi6q0ilji209jnc36lclrdyyx3r06" } }, { @@ -27920,11 +27903,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220205, - 1643 + 20220216, + 2111 ], - "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", - "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" + "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", + "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" }, "stable": { "version": [ @@ -27950,8 +27933,8 @@ "consult", "embark" ], - "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5", - "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f" + "commit": "29848fc3c88761fac6cea4093e6af48aa10b1fd3", + "sha256": "09vhqq1giawkc93xzrikcv271s7vnk7rwd6s2g678bs8n8li0160" }, "stable": { "version": [ @@ -28391,8 +28374,8 @@ "emojify", "request" ], - "commit": "91111bbec3f43f85b680de68d408919b33800200", - "sha256": "15j4cci54rgd3ic2g4k1jf4v2yiph8y92gpg76jvrikyjby9zfj5" + "commit": "d842353ccffc1469693edd4daffcdbdbc7db4683", + "sha256": "0p6pndcy9knc37fq4i8rw9czvkq3zmj4m23dck2zb7yckmsrlkr1" }, "stable": { "version": [ @@ -28849,26 +28832,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220130, - 1922 + 20220216, + 1916 ], "deps": [ "closql" ], - "commit": "c18a2fc8b4a83ceea6a1128d7a77107983301e56", - "sha256": "0ykjv4xaz95syiw3dbf91c2c8716psc53f2l36xzkaxzj8nsz3vw" + "commit": "4bb8a13a43e30798e27c80174169ff955bf2b631", + "sha256": "10arkzdqdc1kzizhxa4n28fjmaamz8gdnn1lf79327p7qi3cz7np" }, "stable": { "version": [ 3, 3, - 2 + 3 ], "deps": [ "closql" ], - "commit": "44bcdb03bb11891f5966b39be942d76a4a57f5cf", - "sha256": "18kjp0f5ch4mpd6yrd83p73pw7ykp2lv5686is8vcvyyys53jrf1" + "commit": "3075b621a56f13a93337e2f04aea3565b625b8de", + "sha256": "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7" } }, { @@ -28888,6 +28871,19 @@ ], "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "epkg", + "marginalia" + ], + "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", + "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" } }, { @@ -29504,8 +29500,8 @@ 20200914, 644 ], - "commit": "9911f73061e21a87fad76c662463257afe02c861", - "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk" + "commit": "d4333bbfbdb93fb9cc2ea321438bf552ec0adee6", + "sha256": "07vswfw20bavl82cdi7p84dgkjkx0x117cs2kkf6is8b0wwa22g8" }, "stable": { "version": [ @@ -29526,20 +29522,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20220110, - 807 + 20220215, + 1844 ], - "commit": "1652f3ff90e22841a42381886709b0db369b1c3c", - "sha256": "1hlf7b3y3jyc99dxis2sf7n8na1rkfmxwmls2ryrqiwdcgsk7cgb" + "commit": "4bf7ba5a9cd496e974df10ef927a7c7c65ab96c9", + "sha256": "0gfbssvl2hg53w36pi86dlg9kglnzi69irs906salhbg7cgh1wfh" }, "stable": { "version": [ - 24, - 2, + 25, + 0, + -1, 1 ], - "commit": "7bf7f01683acf9b8f09bd8c7331854a9abc17f7d", - "sha256": "1wcl60gclg5syi3zr9n23wk9x6l6w8w2ng7v6ibmsr1g1svhlkk5" + "commit": "3c68ceea1f93119bed871866c690fbf5a95048c1", + "sha256": "0i45r682i93b71jjhixq450lpkl6kbm8gi4f73g22k88w1lj1rmq" } }, { @@ -30439,11 +30436,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220201, - 816 + 20220213, + 1912 ], - "commit": "5ff4fa8da09c5e408bc8a2a8e42e7c1fb93a3819", - "sha256": "0wr6j58fm4zbihmlrnlgc6n5wlpkx2a0xpdw0hjdxylag29d52z7" + "commit": "399f952c4bc1cbe17ce46b6800fc469ed0c6a25e", + "sha256": "01qwcjj90zdgz061nsqxralv9z6l20k0sahznhling9xnalymfjr" }, "stable": { "version": [ @@ -31034,15 +31031,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220202, - 1351 + 20220217, + 748 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "787455068f56f29493cc1e33d4e5c2986ea25577", - "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp" + "commit": "00fca685479e772361765b13de4689099a328c28", + "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" }, "stable": { "version": [ @@ -31236,15 +31233,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220124, - 225 + 20220216, + 1857 ], "deps": [ "annalist", "evil" ], - "commit": "e69abfcb1cc0dd59dfe7c055b0779a6622f8282d", - "sha256": "1gsrh5scp8yksilx14cn3h2hy68xh8jhmm15wwzwlg457kc3jcm4" + "commit": "081a9f423e95d57fa3c10dee18fa148df5ed198f", + "sha256": "1m36lsqrfcj8w8cdcckvyz3q7i089akkjb4c9wga9iz09pgpjw4y" }, "stable": { "version": [ @@ -31353,15 +31350,15 @@ "repo": "cute-jumper/evil-embrace.el", "unstable": { "version": [ - 20210418, - 2038 + 20220211, + 606 ], "deps": [ "embrace", "evil-surround" ], - "commit": "464e8ec52ff78edf3c9060143fc375f6ce5f275f", - "sha256": "1bga1idxj8mg5xpl7k4ymwaniyba2x13lf8yihyh713s5238fdmd" + "commit": "7b5a539cfe7db238d860122c793a0cb2d329cc6e", + "sha256": "03b53626ywq9qdqzsb92321lc0fzjqb674kwkssjrxlz6hhn5hlq" }, "stable": { "version": [ @@ -32562,8 +32559,8 @@ "deps": [ "evil" ], - "commit": "787455068f56f29493cc1e33d4e5c2986ea25577", - "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp" + "commit": "00fca685479e772361765b13de4689099a328c28", + "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" }, "stable": { "version": [ @@ -32812,8 +32809,8 @@ "tree-edit", "tree-sitter" ], - "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8", - "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y" + "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", + "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" } }, { @@ -33343,15 +33340,28 @@ "repo": "md-arif-shaikh/expenses", "unstable": { "version": [ - 20220109, - 1306 + 20220215, + 1518 + ], + "deps": [ + "dash", + "ht" + ], + "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", + "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "dash", "ht" ], - "commit": "d8bbc3201a23f596418cbb0a316b446f0ab94585", - "sha256": "1shwdlzaf84mlf9gdxly43xwy6s7w48mbh5hqy8jbndq552zkzgh" + "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", + "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" } }, { @@ -33944,11 +33954,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20211124, - 1842 + 20220208, + 49 ], - "commit": "c090f3d3a8a2ddedeffc1f5b5147cb7633dae79e", - "sha256": "1kiaqascf4lh1kpvp79yynjyncakq31xgx0h2bfinji8i7y32pg1" + "commit": "e6dc6d4397d70318c8e5acdd86b9b31b25102182", + "sha256": "0iayhg58yxcxwjywfr024df03y1ifj2y9gshvnndrjjc4jkm6zn1" }, "stable": { "version": [ @@ -34010,14 +34020,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210909, - 752 + 20220211, + 633 ], "deps": [ "popup" ], - "commit": "9435ad63c1c4756f574ae98d2d63ecf1189ec832", - "sha256": "1qnh6ykmwvwk06rpi8pcvql5zq9gpiz2xiyl3j2imhmx1jiw4xdz" + "commit": "cf4a2f7e3e43e07ab9aa9db16532a21010e9fc8c", + "sha256": "04z9pwvl68hsisnyf9wlxmkwk8xag36jvcchwcwp4n9vp04z8745" } }, { @@ -34490,8 +34500,8 @@ "f", "s" ], - "commit": "7b961721f36bd23ac8fae6e6eaa490ac6e8527d0", - "sha256": "1kgjb8qjscs1a08w4qwynd6yb94hi6lai9lgf0mnwvvmv6rpzfwv" + "commit": "d4f91ea2bbf0508be05212e00f9a6675aa62e04a", + "sha256": "14i6wi5shd1hzh271hl5bd39jr5xvfkirasz67apcsdpfavzvvry" }, "stable": { "version": [ @@ -34664,8 +34674,8 @@ 20210707, 354 ], - "commit": "9e076f56f58a195df9dd88f6541b63201bd5c38b", - "sha256": "0pffcv4nhwap85sx2rxxr4li3rg2bb5ykanaq6kg5wcliqck29hg" + "commit": "55b15274aebe013bfb68c9ca5a53c65c21554eae", + "sha256": "1ycgs27n2a4ba38bww1wsg6aa6zab4yzwfnl9hm658kfr5w2i6jc" }, "stable": { "version": [ @@ -35674,11 +35684,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20210914, - 17 + 20220213, + 1334 ], - "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", - "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" + "commit": "8cc0507cc6619cb9ec236c4eca7417ac081f1468", + "sha256": "074dkgpflc9pgpwfmha2cjfyyk6fac968nsw30mfi8ifb1gqvl28" } }, { @@ -35689,15 +35699,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200221, - 1415 + 20220213, + 1335 ], "deps": [ "flutter", "flycheck" ], - "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", - "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" + "commit": "8cc0507cc6619cb9ec236c4eca7417ac081f1468", + "sha256": "074dkgpflc9pgpwfmha2cjfyyk6fac968nsw30mfi8ifb1gqvl28" } }, { @@ -36733,8 +36743,8 @@ "deps": [ "flycheck" ], - "commit": "8b68168db13df4e393d65ca8c0464019dcc45745", - "sha256": "1fiycjznzpv0gm41xx8xgqkzsjg04zgg6v4prlaqx4vfzh069a2k" + "commit": "65e7d90594b5f624702b3cf6e8867407419980b7", + "sha256": "1s7xgcn10dx4i0l3q1pl33v8r59xjjmgia4a45jmv52schpx53gp" }, "stable": { "version": [ @@ -36812,8 +36822,8 @@ "grammarly", "s" ], - "commit": "1352c1d970e42afbbb93d029636e17aa7b921cd0", - "sha256": "0m6zhqm0n3fhni5h7ky18zrcmmw3rwizq6wrpl1cnbyp38vljl7h" + "commit": "32ef7144c8a0dd708d57f8efbd54ccf7b29d76ea", + "sha256": "1d5dgflz33sjwx4yzj9xcph2wl4vf4dm82jx9qbkk4ii2q4f185w" }, "stable": { "version": [ @@ -37238,8 +37248,8 @@ "deps": [ "flycheck" ], - "commit": "4c22da6aa2878cbf490214b034f2ac25209f0fdc", - "sha256": "07qlaay65gs2v4zbawnfwf5ry2ag9dl0zzjrr8slqk7z6wy2c5wb" + "commit": "24db2496b5320614534f38d5cfc71f43b00155ff", + "sha256": "0fy17nj03glvaz1d2m3i8sqf4szmrjwdvqlqkg8r31x6ac0gl0d5" }, "stable": { "version": [ @@ -38754,8 +38764,8 @@ "grammarly", "s" ], - "commit": "57d6d69b1b55eca484d643d180682a7e683b4b0e", - "sha256": "0a2azplyv9mp6xjjxdff35sz2r65h4svnrrsraib9jvz5hbqmny5" + "commit": "7e5aaaec5cc5e0a217c8d83f857b5a3415f5865e", + "sha256": "06mgnh013633i6ij1664zwsmd35hbn4a16i25ang78cmwpb5bzy4" }, "stable": { "version": [ @@ -39001,8 +39011,8 @@ "deps": [ "s" ], - "commit": "a43fd0d92dbec5f1d4129b30ab0ed917e0864129", - "sha256": "03nfbdjfx5bnv5phs3fcysvfza9lcw32mai1a8gjdmm8p4cgc851" + "commit": "107fd8231d130bc63f1d4cdcca3622e8c667f22e", + "sha256": "0vdp9dlszm916filgda28j3pfqi07b1fsmwcw8d1kxj1k6j8b1j4" }, "stable": { "version": [ @@ -40207,8 +40217,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220130, - 1941 + 20220216, + 2157 ], "deps": [ "closql", @@ -40221,14 +40231,14 @@ "transient", "yaml" ], - "commit": "43055ac34f9de045e7f878e4be7a7f04b172f498", - "sha256": "1ds4ikqddnf4k25p6ng8g2vdxi2gl4qa6s0w0kxklgh3di8zmppn" + "commit": "55632815463f9d2d259dcccd22bfed224b5081c5", + "sha256": "0d26v84mcc77vdvh1ks9gkbwr5f0wvmhbkgqz4qkjy9xdpnh1s3x" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "closql", @@ -40241,8 +40251,8 @@ "transient", "yaml" ], - "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", - "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" + "commit": "2cecef36f41dfe1edc6078690b0c0d05af6b35f5", + "sha256": "112mghydfzrbiwnzrb2f9d74y6ja702157p66ss94kqps0lj7rkp" } }, { @@ -41046,8 +41056,8 @@ "deps": [ "cl-lib" ], - "commit": "9e08ee114e5d99dba0360a52795ba191ae0f8ec1", - "sha256": "0kizzwqkrdy8d73xf5w19gxiicj5xi4bpy5j4zr338bsd44rh89y" + "commit": "b0f39e3617f5adf8ac9ecdbdaa6b0ee997cab020", + "sha256": "06l5yk7hpfys0252yhqzfa9x2x8883yw4rsmhavvcn5w0l1n2m1p" }, "stable": { "version": [ @@ -41200,14 +41210,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220104, - 1200 + 20220211, + 1009 ], "deps": [ "cl-lib" ], - "commit": "ea4b26bc5fbc074a011918172ea0c624a81c8092", - "sha256": "1i4gdascsjpvvks61wwwv0qmw0nbj6jy0slc95jymd2vnyz1p715" + "commit": "03c6ab09c8a580aaaab89709edcd999e66fca0e7", + "sha256": "12rf82ijlisvksq6jvkzgd73y3vgiwmprxfjssjzz8p5myp0m42i" } }, { @@ -41245,8 +41255,8 @@ 20211231, 1837 ], - "commit": "f63d6279a781cf9f33dd2f22826788d98d475961", - "sha256": "11dj0qg2411r2nby2nzi1i4s2v5wnz4594cl5c8gq9hws7cmp6q2" + "commit": "20a76509831b8296bf3c8b389e1f5602c2a88899", + "sha256": "1m4qsb2hfs1v5ffxzc81km5ld0gi8j3hzgnjckw5rlgl0ikrbjg5" }, "stable": { "version": [ @@ -41631,11 +41641,11 @@ "repo": "avendael/emacs-geeknote", "unstable": { "version": [ - 20160717, - 1249 + 20220213, + 612 ], - "commit": "8ed607c76864afcc9c338972ab093caf4501cbf8", - "sha256": "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q" + "commit": "ce2738aebeeda35f9d31027e9b7bad0813b975c3", + "sha256": "18z0m2qlsr9bs1m5wp88p7snd25wxz8i829z8ybkny6ax1vfi0y1" } }, { @@ -41763,25 +41773,26 @@ "repo": "emacs-geiser/gambit", "unstable": { "version": [ - 20211204, - 1940 + 20220208, + 1356 ], "deps": [ "geiser" ], - "commit": "faff8bac11621228640a3107622fe23df4bb6e2c", - "sha256": "1v736wh19yma3vjpgb2s1n77rrl5i3n8x451kq3cadsch0wid31d" + "commit": "381d74ca5059b44fe3d8b5daf42214019c6d1a88", + "sha256": "1dcrhm1am2dam94a0m7pjkiygah1lw53y2hq0870x1ji4gzgnkl8" }, "stable": { "version": [ 0, - 17 + 18, + 1 ], "deps": [ "geiser" ], - "commit": "faff8bac11621228640a3107622fe23df4bb6e2c", - "sha256": "1v736wh19yma3vjpgb2s1n77rrl5i3n8x451kq3cadsch0wid31d" + "commit": "381d74ca5059b44fe3d8b5daf42214019c6d1a88", + "sha256": "1dcrhm1am2dam94a0m7pjkiygah1lw53y2hq0870x1ji4gzgnkl8" } }, { @@ -41818,14 +41829,14 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220131, - 1758 + 20220215, + 2320 ], "deps": [ "geiser" ], - "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066", - "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7" + "commit": "cfd9116dcb246126950d7f2f662f09149684128b", + "sha256": "1k8qgkamzd6ljvk7xiqs1r0fvr4gzffhylpll7c4zjywrbixw3g1" }, "stable": { "version": [ @@ -42138,16 +42149,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220205, - 845 + 20220208, + 2103 ], "deps": [ "dash", "magit", "s" ], - "commit": "c2d9f3c0beef75ce2ca8e1e4b582980f2ffaef34", - "sha256": "1ayk60r3g6v8v8mdaxrv8psk5dhw8ss9rzglw8qzgxhj2dih73d6" + "commit": "a802be95aea25f500583f72df968c86c6771a3d0", + "sha256": "1ac6d4fxcac4p6dp4nhbqf3bzd0yvgwajrllrh3j0vcdpzmbg95s" } }, { @@ -42437,28 +42448,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220130, - 1941 + 20220216, + 2156 ], "deps": [ "let-alist", "treepy" ], - "commit": "38be4a4bd92f4cddcd93b6784007774ce892a6c7", - "sha256": "1as7cmpb7lrkcy25cp541hzc57260czkin2wpl48ng4qg8502ypj" + "commit": "2f50383cb35f0cc54599c54cc9794bf25387c050", + "sha256": "1ph96pqhizaq2vkvmkbzilacsbyx69g2bbsb3z8kqafrhg0khajj" }, "stable": { "version": [ 3, 5, - 4 + 5 ], "deps": [ "let-alist", "treepy" ], - "commit": "192eff9da2c0f61813f3bc9c00913985c1804180", - "sha256": "1bc5z63ylb0ir5v9qngyl50svmlfd6hx9lv1ladwywncdpsslls8" + "commit": "6662865449a4c68c03e3a8257aee0ae5318b0fbd", + "sha256": "1px27nh4cr3r16qmvig72jdirjzllvm2m4dzm59kfznhg3rf7vj0" } }, { @@ -42810,8 +42821,8 @@ "transient", "with-editor" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -43095,20 +43106,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220129, - 2006 + 20220206, + 1802 ], - "commit": "28e937fe4229e93ab3fe3dc31c22e390a42329ba", - "sha256": "1qp5f483szngx67386ladd9nxyydx3k9a540y34sgrwbyssx4qc3" + "commit": "a715c116341162ff1a49fff684a45dec8ac0b0af", + "sha256": "18y1c0nfvc6sr2f4kfddq78kbivlf38zn35pzdvnmfm9nc42dc6m" }, "stable": { "version": [ 0, 8, - 3 + 5 ], - "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6", - "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75" + "commit": "0f22d081184bb4040416296099dbf3a8eafb2437", + "sha256": "0payj5hwqkzdrxx5vfzaaalmzfkdmdqhqki193a6cbf0k3c03zh3" } }, { @@ -44213,10 +44224,10 @@ }, { "ename": "gnuplot", - "commit": "be594de074dc3513c773d78c38e823be53061612", - "sha256": "1cz3db40r72cfqazg0w85fx5249d98wkxvjjjcn8dhwnmqymqigi", + "commit": "f623c44a97048249e88401d9d75378ca0cce4ef2", + "sha256": "1n349cx2qv8j549ljiivq62agylb3rd1cxif7qprdz1js9c4c40j", "fetcher": "github", - "repo": "emacsorphanage/gnuplot", + "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ 20220102, @@ -45223,20 +45234,20 @@ }, { "ename": "goldendict", - "commit": "af87026905478d9134a4a036e792f6afd9c10768", - "sha256": "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f", - "fetcher": "github", - "repo": "stardiviner/goldendict.el", + "commit": "e86bb7d511a5228c1e87d900993a2747b418bf03", + "sha256": "1hmycq4sv2pkjgqpryv7wd9zy5v4igbfz7d8ap4ah6g2v1r7jdxr", + "fetcher": "git", + "url": "https://repo.or.cz/goldendict.el.git", "unstable": { "version": [ - 20201108, - 201 + 20220210, + 1401 ], "deps": [ "cl-lib" ], - "commit": "700f60be192f4d46787e7f009637c15567064f2a", - "sha256": "0nn7ilprx465r5yx0q11vghq3cv0a269jzz3q1p1vwllwfj0f31x" + "commit": "f3fbe658a8d31dc1bd0ca69e4d2ebaab59e92791", + "sha256": "0x38j3wpyaxggihkw3g1qcf0phfrcic555xyqy3vskhvvf5xgc5v" } }, { @@ -45334,11 +45345,11 @@ "repo": "google/styleguide", "unstable": { "version": [ - 20180130, - 1736 + 20220210, + 1659 ], - "commit": "31c830a22def856285b6a761c524f8d2d0657bcf", - "sha256": "1vv40cnvs985b84sqrpwhgr2ml2xgnlfi9727qaxg5g9wnxckvlq" + "commit": "af78b49ac4fef8083094d5105f72528ee7d09073", + "sha256": "00vryh0h5sc72f49172nxnxwkphw811k58ivkmal97zd2v3m6w7g" } }, { @@ -45501,16 +45512,16 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20210221, - 1905 + 20220209, + 1739 ], "deps": [ "f", "go-mode", "s" ], - "commit": "c9ccffd7dbb47274003d0bb1d0b017552b875109", - "sha256": "1y3n78q1ww1mqyrnnlrd2cmwh1lg2qlb1g4gpn7jm7bdn9h9dq2b" + "commit": "298335fab797d0465516ed396f6e2acbe8f2ed93", + "sha256": "12sn06c4gw5jddmdaw73djlraj01f57z9plnyf1gxss4gnch6kmd" }, "stable": { "version": [ @@ -45562,8 +45573,8 @@ 20210323, 332 ], - "commit": "08ac17dee21739edd16606273c35bc83de75fc7c", - "sha256": "0iwidx21lsrncz4kcd6zvpkx4ksmwrn7hp4p3lma62qw0327yh71" + "commit": "f06dbba4cc352d6477cfd500217cba0d26223ff4", + "sha256": "03iajajpxnadsp78rgkanghrr2jm53an3vswm2vn3saqfksps899" }, "stable": { "version": [ @@ -45649,8 +45660,8 @@ 20210323, 422 ], - "commit": "67e3d3d649240c048f4088bd9e18f614218c9fe7", - "sha256": "0zchmlngw4pjdfdfb7zj42vh3ngphc8d8436n8is9dd09f26l7y9" + "commit": "e8e996cfebe2f1a35ba194d6b3989d11f3ae62f1", + "sha256": "1zvfzhn63ylpmnf4kyx6pahrarfnkmyjxvridb0w9g7lmrc5adh8" }, "stable": { "version": [ @@ -45679,14 +45690,14 @@ "magit-popup", "s" ], - "commit": "5cd154fb15348403bdd5ad55cbd33871c9a8a8d8", - "sha256": "0l9c8k765cksjlmmdvyrci3d0aqiq1rvv4vgfm1jfwjq60dfvnhx" + "commit": "81c26b4b6522eca2af3ec9f35df669cb2d51f9fb", + "sha256": "12xhndnxx8zckmq23z3cvvlq5jrmqlfi7nlvsxns10rxsbmgl2ps" }, "stable": { "version": [ 0, 27, - 3 + 4 ], "deps": [ "dash", @@ -45694,8 +45705,8 @@ "magit-popup", "s" ], - "commit": "6b4e239111e6284b3f9ac583de505c4fbf18b2da", - "sha256": "0980dq688xz07msh0rqc7l7qq3qkkkwxg7ymz3jfcdics6cvw90z" + "commit": "285e80cd79d6daee7d5f0ac9555d885f368346f0", + "sha256": "004r3n3y019zvds45h6gk49gailvdy77ql49cmryajd2cifmw2sz" } }, { @@ -45854,8 +45865,8 @@ 20160504, 911 ], - "commit": "02670e1401c070e6ae3f50a8d79b210ca4f3a0ee", - "sha256": "13xlpmp2d96a9hzcwmyl6r9acmqdnvxfa239h00xn8ak0xpr17c0" + "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", + "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" }, "stable": { "version": [ @@ -45914,8 +45925,8 @@ "s", "websocket" ], - "commit": "ed552610a59fdd2f8fe5bcbf50e3ebc3b5d383f7", - "sha256": "0jr1dxpsp33zi744rsk2djnix5lyqy8qfiqi9nyb37vzffpzdpgi" + "commit": "5cff7dc36575c9198d911448034649cd769b6b56", + "sha256": "12jm1p881dqiqdbhdqfy8r6kdf47b8ar8ldif53366hhl0pf5hyj" }, "stable": { "version": [ @@ -46407,15 +46418,15 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20220108, - 555 + 20220212, + 646 ], "deps": [ "dash", "s" ], - "commit": "02670e1401c070e6ae3f50a8d79b210ca4f3a0ee", - "sha256": "13xlpmp2d96a9hzcwmyl6r9acmqdnvxfa239h00xn8ak0xpr17c0" + "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", + "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" }, "stable": { "version": [ @@ -46620,15 +46631,15 @@ "repo": "kaiwk/gsnip", "unstable": { "version": [ - 20200928, - 357 + 20220206, + 1526 ], "deps": [ "aio", "log4e" ], - "commit": "c8bff61b10cd33de9d6f5fd84e4b27f48c772304", - "sha256": "0lw1psy1258vbvnl4j918hkzwqa65g94azbq84fvf2lgv4lbvgln" + "commit": "4d473b726b3f3b6bb7d1b5f66a9d368588ce0f86", + "sha256": "1slnvkpzhzffvnwyqr5bjgw84j0rapwr7mnaky9925l0rrv3fz6h" }, "stable": { "version": [ @@ -46947,14 +46958,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20220123, - 1424 + 20220215, + 1758 ], "deps": [ "org" ], - "commit": "cbb5a0f11a8a91111d753c25c59582741ae49f2e", - "sha256": "1chykvq41ivmyg85ixh09q1wl4ayqdpbzacj4npy3jiafh6sksz4" + "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327", + "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac" } }, { @@ -47431,11 +47442,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210908, - 1543 + 20220208, + 1821 ], - "commit": "8402caa341d90b4236f5c0a802751f9023ccfbe7", - "sha256": "05pp38r8gb94w8gxnm3rkrawa7d73538lpz7lwccmlr83pvpl0cb" + "commit": "f13b6db78bc880e680c320e015ae232f525e0a27", + "sha256": "06amab8n56nv8a1fnd9x3ic0s36g6q4c4m5mh6sxcngaqjvvz4pa" }, "stable": { "version": [ @@ -47601,8 +47612,8 @@ 20210108, 1835 ], - "commit": "6057c05154464bfb88d2ba119cdc8d4c7e767541", - "sha256": "0z1lpsvmkcxs3gcxkmi1vjgfa7wdfa42cp2i9rl2i17jq34j37yb" + "commit": "f6ed4b77cdd775d53a7b824c21fd14e0eec5e3c7", + "sha256": "0314x9y3v8nmknmdw0gbl4njanxiqbh5h5m0kvnph6r6v0cz7m4s" }, "stable": { "version": [ @@ -47735,22 +47746,21 @@ }, { "ename": "helm", - "commit": "7e8bccffdf69479892d76b9336a4bec3f35e919d", - "sha256": "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf", + "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", + "sha256": "032ypri8p6q1xz65imd89xizm4gzxkg62zaqyyv5pb2kbbv1y2b0", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220205, - 1456 + 20220217, + 1752 ], "deps": [ - "async", "helm-core", "popup" ], - "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", - "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" + "commit": "e17ad364b9ddc7b283b21df94b3ba2fa8bdc11e3", + "sha256": "0161qh6la4m5208ix737l8am7gzzwzpgsciiiklslawv28cykyxa" }, "stable": { "version": [ @@ -48643,20 +48653,20 @@ }, { "ename": "helm-core", - "commit": "ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7", - "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda", + "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", + "sha256": "11h7fl7kisjzwpmwiaqjg2773jpif874w2wwk0n5jqvinpxyijmd", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220205, - 1456 + 20220217, + 812 ], "deps": [ "async" ], - "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db", - "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0" + "commit": "e17ad364b9ddc7b283b21df94b3ba2fa8bdc11e3", + "sha256": "0161qh6la4m5208ix737l8am7gzzwzpgsciiiklslawv28cykyxa" }, "stable": { "version": [ @@ -49213,8 +49223,8 @@ "deps": [ "helm" ], - "commit": "85c1413dc28a5f5257eeebb6678dad503072b9ec", - "sha256": "1k96284xfsdashlaw1cv61md4fqhynhs674bzphs59h9k8g1vrf5" + "commit": "73312c3d092db8fa401b2e2daa410c452b4e156a", + "sha256": "07aj2izjvjqvi8c7x9n9205vxza4rspw1c7c88ccaq859xz3fx1r" }, "stable": { "version": [ @@ -49478,8 +49488,8 @@ "flx", "helm" ], - "commit": "bc2068dd0da7e77ac7b394544d703720913fa660", - "sha256": "0gd2z8b2blc3flnz196yqcxi2r66lrkm2z0pd5j0n7p5a9ajdfb4" + "commit": "983acd152bfb636a168e81e138f82a25c95385a5", + "sha256": "15kbil5bj8kyn6q0vaacc8prqacjihkw80mb7h8bg8yrjy3ls1j0" }, "stable": { "version": [ @@ -51650,8 +51660,8 @@ "s", "searcher" ], - "commit": "0f89d04d322763a6db9ef58bbad747d41d9479ae", - "sha256": "03q6bs4zhyg7q5rpp1339h3dihl7fp0a16q8253nfr4k3b5qs79x" + "commit": "238b36b0c9c969e322f2ebd1cb0aabecf7076123", + "sha256": "1k2i85qscbpqpd9s799q8n3jdw9f33am2m7419v6cwkymn28qv32" }, "stable": { "version": [ @@ -52196,6 +52206,27 @@ } }, { + "ename": "helm-twitch", + "commit": "a0079a6c9a2207906efcf1d63d5006c50295a9c8", + "sha256": "0rishxgk04y1axkcskxn1dj0m5z6rmm4khsx6x9v1vj9b8yvghd1", + "fetcher": "github", + "repo": "BenediktBroich/helm-twitch", + "unstable": { + "version": [ + 20220207, + 1314 + ], + "deps": [ + "dash", + "helm", + "streamlink", + "twitch-api" + ], + "commit": "533216a1add8acc2d6f2b4039c67528b97d06549", + "sha256": "14686l3idn34scz9a3bai2x42zsrbfazpv1am6j64y7mrp284p8g" + } + }, + { "ename": "helm-unicode", "commit": "f720b9f9b667bf9ff3080938beab36aa0036dc92", "sha256": "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224", @@ -53424,11 +53455,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20211029, - 602 + 20220211, + 548 ], - "commit": "0593a1a77db28503025d5c1850e6a99551c3bcbd", - "sha256": "1rkxm6ak1zaqzp6q6mqpng0k4qjnsshkwydfxfm63xfsgr4vwhwv" + "commit": "3dd29cfbf24fec16eaf3d47936338adb6b34f5c8", + "sha256": "0c0533id01lx0xf5dkkddd3gwb3k2jh55fa6z0d2xzrmc7p1971x" } }, { @@ -53475,11 +53506,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20220131, - 358 + 20220211, + 548 ], - "commit": "8275de778fa273f63a6254a17f80c83c6780cac2", - "sha256": "1i94x08fdkbcixfj5mq0mvdlnwgbc6a0gjdska58icksalc6814v" + "commit": "aaa9cd5085c13cbbfa41648ca4134a1699e64d5e", + "sha256": "1pbhyskam5jklglrqmzqdfzs5vgh8qykp3ihr9q4rsmh2wypxy4g" } }, { @@ -54117,8 +54148,8 @@ 20200929, 559 ], - "commit": "40075bdd61cb0f839c26d2f86b67d22d04f21093", - "sha256": "05565ybwz4mkcfdqihphm47am842x8mibh7p95qg6y3myr3g4dl7" + "commit": "b10c95db3347f21aca02d117fe036dbf036ec6ef", + "sha256": "1x015d5qzc88vh361hf6bzyzcclypq50iakg7jzw2lw4m9vmg0r2" }, "stable": { "version": [ @@ -55010,11 +55041,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20220121, - 2251 + 20220211, + 548 ], - "commit": "5881f796ad167a5fd46e8e964733725aa825516f", - "sha256": "1a1pkq0q8g40s033ldlyvbn1s83lw9irc9hskv78pjgch1k3qz8y" + "commit": "0a24f8e402383b0da1f956d946781317fba14bbc", + "sha256": "11mbm87rx4i093csdqrgin550wgkps69ysgy2ig56m3l1hs5pp78" } }, { @@ -55474,11 +55505,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20220119, - 658 + 20220216, + 717 ], - "commit": "44968bea9bff8fdd5bf9d227f53814c44bb9f619", - "sha256": "15l0dprhgfv948vlc05n91npb4331n4i3v1idd3zww6vrw85n9l6" + "commit": "27c61866b1b9b8d77629ac702e5f48e67dfe0d3b", + "sha256": "07z659w9m94h79wnvs2fg80f5impidqhsmg6awc3fxwd3ib0yzih" }, "stable": { "version": [ @@ -55872,20 +55903,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20220203, - 1519 + 20220214, + 1859 ], - "commit": "90a0f4e6992a99d000d016b5a82fe1a10fcc5e1a", - "sha256": "0s7vvn300x7cazsp13jzp28r1jrf9bg3asvxm92xi64d45pkki4q" + "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", + "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" }, "stable": { "version": [ 0, - 7, - 1 + 9, + 0 ], - "commit": "b2b625f690e207bab7b60a23585eba9c2831607a", - "sha256": "173mw87hbr1hk0k859liba7sybsxpmdv0d7d97iyy2khhmn7xkn6" + "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", + "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" } }, { @@ -55942,8 +55973,8 @@ "htmlize", "simple-httpd" ], - "commit": "cbddfd54242210df3e1c3b590fada5bb5423f5ed", - "sha256": "14jnni828ndl1sj92cy49r0aa6y8qwqbm2rrxc87j0yfn5sdckc7" + "commit": "479a2412596ff1dbdddeb7bdbba45482ce5b230c", + "sha256": "09ns4csq36x4jnja8ayla6j29c5pyw9psf534rd56d7l33sbgyvl" }, "stable": { "version": [ @@ -55973,8 +56004,8 @@ "deps": [ "impatient-mode" ], - "commit": "a57c628abb765a834c85f9299bf816e50ee35d23", - "sha256": "1j9lfxxvgg97l2cmdwyc9c82n09xvc9ybpqn31hm7i71y9l943w7" + "commit": "4fad373753f2169064c54e9a653ee182fb4c648a", + "sha256": "01lz8b4n5k35p5q7335bfdjxn5qxcp6p2ldz31y4ajckwq89ihnz" }, "stable": { "version": [ @@ -55997,26 +56028,26 @@ "repo": "Galooshi/emacs-import-js", "unstable": { "version": [ - 20180709, - 1833 + 20220215, + 1948 ], "deps": [ "grizzl" ], - "commit": "fb1f167e33c388b09a2afd32fbda90a67bfb2e40", - "sha256": "0if117lia2ykd6ai0cf5z4ddhsm9icijigwbrn079v7m9s8yl43p" + "commit": "d2bbb53f96395415f9f01de4fa88d82c1f59ba63", + "sha256": "1r2in6zjhp0cywlyncnqblhb0k1bymhbhs7r974khrpf8byw69p9" }, "stable": { "version": [ - 2, + 3, 0, 0 ], "deps": [ "grizzl" ], - "commit": "0a1032894445062b87dbe4e2c8cdba35ac25c250", - "sha256": "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3" + "commit": "d2bbb53f96395415f9f01de4fa88d82c1f59ba63", + "sha256": "1r2in6zjhp0cywlyncnqblhb0k1bymhbhs7r974khrpf8byw69p9" } }, { @@ -56114,8 +56145,8 @@ 20210508, 309 ], - "commit": "208f21c7ece23acec6b2eb2b0c64928464f6863e", - "sha256": "0i5jhvsjjgfmpi4j9scv618sl0p26hpq7x3yp81s1f390brmf4dz" + "commit": "6fb3e291fb151208cebdd6686f71d60e47948702", + "sha256": "00mr0lhgi4gky5ddqqw56yqcbch9xlm62ciz4r17n32mii6ys25d" }, "stable": { "version": [ @@ -56320,14 +56351,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20211027, - 1611 + 20220208, + 1627 ], "deps": [ "clojure-mode" ], - "commit": "765653dc23dc2a2c1520a1e24332ab9d4b49dd47", - "sha256": "1hbylg5nsix65a85bibwgzcyjkf19rjvdkg04p9hnvsgh59x2d5l" + "commit": "e47684de78da1ee470d42ae2a411909b2cf61d50", + "sha256": "0ngkhp4i3qgl6lgld5qbnrk8grd8r18mabrsana8z2pmy58hxz73" }, "stable": { "version": [ @@ -56771,11 +56802,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20211130, - 214 + 20220211, + 548 ], - "commit": "9afc537af6e56dda5a3ef60792f15ed391ba3b8b", - "sha256": "0mffhf0zzvlrc0kcvfj91p4q7wx9v4ih1v1spjad40h5790gn9an" + "commit": "eb3f6deac945e536cdc8ddc09f6021fdbaa645eb", + "sha256": "1s0srxvcwv1myba22z0phkrs7da7cn22mgp6m6d01v5zgj03924m" } }, { @@ -56804,17 +56835,17 @@ }, { "ename": "inline-docs", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p", - "fetcher": "github", - "repo": "stardiviner/inline-docs.el", + "commit": "9a2649839bd44bf3b2f0db55255f511685dce089", + "sha256": "0dih87jzwr4fwi79gf2hhamhw33vs3a04x2cajg5g31jclpwcz11", + "fetcher": "git", + "url": "https://repo.or.cz/inline-docs.git", "unstable": { "version": [ - 20170523, - 450 + 20220210, + 1402 ], - "commit": "b57f1681be6147f999cdc12abff414a0442e8897", - "sha256": "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv" + "commit": "cda596d9ff4c2aa5035692a97c430f6589eafbb1", + "sha256": "0kc73qv3986n7fv8qrxr81zyg5lk14266v4rpwrib4nv5qwhzjza" } }, { @@ -56882,11 +56913,11 @@ "url": "https://git.sr.ht/~pkal/insert-kaomoji", "unstable": { "version": [ - 20210707, - 1126 + 20220215, + 1204 ], - "commit": "e818845a99d418e04c1685f06fe25116916f6168", - "sha256": "0acyzysz04sd3rahymw6x3a8zy57sy84d36zp6prd62y4w0sw361" + "commit": "974bb7dc02059253e032c501b2c3c0ece448d472", + "sha256": "061809gl7dfz4mis5igz9aiis1gq4np3fk75ydmzm0j9isz4dc2q" } }, { @@ -57350,8 +57381,8 @@ "deps": [ "f" ], - "commit": "c1e3cc7971c278a95eda16ade7b68ad157481a5a", - "sha256": "0lppyr74bsq9dx2qm6cc34vg4i2i8dnrrlbm3xc3nzcsay85cbjx" + "commit": "1f284ab9d731bab9e5e211a3b5f75cef8cf659a2", + "sha256": "0rx4bvr4rym42ivb0z9a4xs7wkbagi0sydykybmr6scqrybx4jwj" }, "stable": { "version": [ @@ -57861,8 +57892,8 @@ "ivy", "s" ], - "commit": "cb7e0f03e1df90855b7cb1433706a8b46f5592aa", - "sha256": "0l2r32k6lzxsww245afddzfpwhy0k80kw0q3jkm5hfw3qgkwd864" + "commit": "77aa87d2ebbf1a0189321b6cfdb2dff5df4de737", + "sha256": "02dslll7ywcrf3vdzazzcyyiyy282nfqqj155h2cv9asnlh7z3nn" }, "stable": { "version": [ @@ -58315,8 +58346,8 @@ "s", "searcher" ], - "commit": "b38ddcbce45f604948c4880cde224beab099b8da", - "sha256": "0719r16pwnvpq9qpa0d2pd2s5yzvawm5gycvxqzvlkgjw49h5rhv" + "commit": "5b6ad49b927a570cb8ba0c52b6a5c527c0f0b7f0", + "sha256": "1s0aqfbvr2f6y6ay1f4dm937qvq9rsnlv0k3r99023kzvk3wjpb5" }, "stable": { "version": [ @@ -59188,8 +59219,8 @@ 20210602, 1430 ], - "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", - "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" + "commit": "296e3ca6e0341d9882f4771131a386fe2991e913", + "sha256": "0algc4smi734r5p72k5csjz4kl5iwhrs4mk5h039wab915vjbbkl" }, "stable": { "version": [ @@ -60256,8 +60287,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220117, - 2310 + 20220216, + 2301 ], "deps": [ "dash", @@ -60266,8 +60297,8 @@ "spinner", "vterm" ], - "commit": "92b47f1d4afa1d4ddffd432e23ad35e55c64a7a4", - "sha256": "0grr50ym834p73w1k7abbiswf1qviydm12f803v4i15l6miwvwpn" + "commit": "d06598796f863010e6783b48e946d0337b88e68f", + "sha256": "1b8ggag14mp8wwfkn2kcbcyfpykvncpymrs7zyxnlvy98kyqmypv" }, "stable": { "version": [ @@ -60447,8 +60478,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220105, - 1943 + 20220212, + 210 ], "deps": [ "cl-lib", @@ -60456,8 +60487,8 @@ "websocket", "zmq" ], - "commit": "42a9765897ad36518b5371f558b36cdac3a0ec74", - "sha256": "09nrw32bmkcafbr69csz94lykpmbib7f22xa4y165szrd3va8qk9" + "commit": "0a7055d7b12cf98723110415b08ee91869fa7d94", + "sha256": "183313jlmfnbndczllkqm47y4495prw4ks2jav3pdwn5qqfmpznx" }, "stable": { "version": [ @@ -60507,8 +60538,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20210924, - 1138 + 20220212, + 814 ], "deps": [ "f", @@ -60516,13 +60547,13 @@ "transient", "xterm-color" ], - "commit": "18604956b8f6ba58cba99470464c67f7b16ce329", - "sha256": "1d6y84gm5n9gkn7v9rhxhxsihabrdgx6mddam0pw75ka53q5s8wi" + "commit": "f60f57ad3e8c97509af3ea925dbb3afa2a25f814", + "sha256": "1gkfz54x80a5k1nw2dmcqs3m7cp1zsm7v7hmbz9xzrszfdiq5zil" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "f", @@ -60530,8 +60561,8 @@ "transient", "xterm-color" ], - "commit": "db77f4ada0840dfb6080121f80249b11721ee779", - "sha256": "0250yayv136ypsy5gy814lv1schm1pza51lvsad7ayr3z1l812b3" + "commit": "d4ffe4752d36915f5dbd8da11b38b4a81743cbc4", + "sha256": "02rrmhacmbh43wqfvf2ls744q5zkr5c1qr4r0miajhy7lnz1binp" } }, { @@ -61202,20 +61233,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220126, - 2100 + 20220211, + 2035 ], - "commit": "ebe6ea5e4ce73fb7b30f9d6647d7635396410837", - "sha256": "02izx6cgdzi5882zny38gwsc6frdry854f6ihfspfv53qiwslxzd" + "commit": "a94f9839addabc2d491ee5c8927453ae2c5ce0fb", + "sha256": "0yxi1s4czkxhzl6dp3b9iaqds35gjccqgrghvfmqyyvmzi0lzss4" }, "stable": { "version": [ 1, - 1, - 3 + 2, + 0 ], - "commit": "b4965ff5db0e913e58c906c228042921b22335a0", - "sha256": "0s31b3kal4j08waa2fwz5d6269wsdywb60a7h4r5vzsrr238lks3" + "commit": "98c2dda1a2ca0fc95f7425847a36abad5b31a4c7", + "sha256": "01z20lsnjk8pwdsl4vx5dqdc4603bmb7fxan7n8j1fgvkvi63yzl" } }, { @@ -61437,8 +61468,8 @@ 20210523, 403 ], - "commit": "f725c1113879bae4c04f2ccf59c6b1ced3bf7583", - "sha256": "0ipqqc4jsg43yv4626265478nd6gwy9am9ligx4jjn2vpwsrkjz9" + "commit": "2af814641fd0cca7b379ffb025ab49917330651c", + "sha256": "1bd78f1sjs47zqvvp8b0mvrlk6qcrivnnbx5qavabzsfg9x9ng5w" }, "stable": { "version": [ @@ -61693,8 +61724,8 @@ 20210318, 2106 ], - "commit": "6bb8fe8e3e581bb30ebb584d9079a2ca83a30b6d", - "sha256": "1nf9lz0lj82z945h0rknl6wk0kblmrlc68gnjlr74lh62hg6gih3" + "commit": "27dff1fadbfe2d42d0f8097a8ae72cf1aa8bd3aa", + "sha256": "1xpzh74agsczq4qxg3hl6gmpvspszyrnp6mk1m5z7wkhya7312jh" }, "stable": { "version": [ @@ -61704,42 +61735,38 @@ -1, 1 ], - "commit": "8451d298c1260ba488545194d9111d48c224a5b1", - "sha256": "0hd38xb13b9k76lirmflr1xlqya6q6kl56qy0apk01cv8dkqh4ga" + "commit": "87b60702e0bf8eee929ba9ac4db725d12274d7ba", + "sha256": "0ppy54rvknghjcxrbja72n45yn5ljcqbvddb3rvn8pfpzih6j1pg" } }, { "ename": "kiwix", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07", - "fetcher": "github", - "repo": "stardiviner/kiwix.el", + "commit": "6d33d35c4228eca53de36d14296bc3e8219a3169", + "sha256": "18sxrdccqvkd8w6pj4lwbps1d04dm55lx0f5hr7hyc454q4vbg80", + "fetcher": "git", + "url": "https://repo.or.cz/kiwix.el.git", "unstable": { "version": [ - 20220110, - 1542 + 20220210, + 1403 ], "deps": [ "request" ], - "commit": "1645c5b659a74c7fe3cae364b967edd45f64d61c", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/stardiviner/kiwix.el/archive/1645c5b659a74c7fe3cae364b967edd45f64d61c.tar.gz': HTTP error 404 ('')\n\n response body:\n\n Not Found\n" - ] + "commit": "d21cbe30d697fa6720d016c52a807c8502719d4d", + "sha256": "0yapgm2fp9igc39did3h1kf3m236683h08n6615kldq8wxd5w774" }, "stable": { "version": [ 1, - 1, - 4 + 0, + 2 ], "deps": [ "request" ], - "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", - "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" + "commit": "86c163cbc0515e9e516f05e809796087b1d3ba8d", + "sha256": "0fh5bx6c2jm492z70vq46b6fmsk4mqagxc75xcizl47s80wq6yvn" } }, { @@ -62080,8 +62107,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220111, - 1305 + 20220213, + 1809 ], "deps": [ "dash", @@ -62092,8 +62119,8 @@ "transient", "with-editor" ], - "commit": "16b60452e40b79dd35f40deeb61cc203a581a1c0", - "sha256": "1ghx9jk106f4m3wlk87g68ksm4cnwk84777kyf96riwhrs2bp88a" + "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", + "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" }, "stable": { "version": [ @@ -62127,8 +62154,8 @@ "evil", "kubernetes" ], - "commit": "16b60452e40b79dd35f40deeb61cc203a581a1c0", - "sha256": "1ghx9jk106f4m3wlk87g68ksm4cnwk84777kyf96riwhrs2bp88a" + "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", + "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" }, "stable": { "version": [ @@ -63232,8 +63259,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20211005, - 1331 + 20220206, + 1515 ], "deps": [ "aio", @@ -63242,14 +63269,14 @@ "log4e", "spinner" ], - "commit": "e278b099173dced55e6e39f9924e90899542ebf1", - "sha256": "1cm6z3ad3c704y3n0f1h38fhqrd69mrf7f4x79l8v76f6fj8vdhh" + "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", + "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" }, "stable": { "version": [ 0, 1, - 23 + 24 ], "deps": [ "aio", @@ -63258,8 +63285,8 @@ "log4e", "spinner" ], - "commit": "e278b099173dced55e6e39f9924e90899542ebf1", - "sha256": "1cm6z3ad3c704y3n0f1h38fhqrd69mrf7f4x79l8v76f6fj8vdhh" + "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", + "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" } }, { @@ -63475,11 +63502,11 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20210729, - 1808 + 20220211, + 1347 ], - "commit": "a49235c918d626f5053344604cb1c464960762af", - "sha256": "1b4k80bm2p7sqh33dx72qag7056nlxqv9s8czql2qfvi8vlnwzz0" + "commit": "6301a5ad00cf8eb74e7a522c84c7ccabbec16241", + "sha256": "1bh5x3zhcx0pdfbqr90dvh6b4q361z6nsmzzcry4pld093wji0dn" } }, { @@ -63512,8 +63539,8 @@ 20220102, 1653 ], - "commit": "4c9f2ede47f710dfb0548d4e32793ad5766ca8fa", - "sha256": "1qcmcmi8s174v8549r86438smsxvnbfjhhq2iyhwwwxr3hxvr7l1" + "commit": "fc5ae30f6738dfd0664864698bfebb5423241ff8", + "sha256": "1ici0jqx136vcqh3rzcg4xgqsh3kjg65d5hnpivvhmflbjhkbxzr" }, "stable": { "version": [ @@ -63689,11 +63716,11 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20200607, - 103 + 20220215, + 303 ], - "commit": "482e58ab83fff86ed754b00be27b62a219597e7c", - "sha256": "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7" + "commit": "b15230dbfc66cc92bbde8f9fd369522d7666c0c7", + "sha256": "0xpjcp4b76lc0d5jpry055d572rdp93vkbm8ck5yh97wy1y2837w" }, "stable": { "version": [ @@ -63736,8 +63763,8 @@ "deps": [ "request" ], - "commit": "a4273a6dcc45dabf237c4bfd780ec22420711c70", - "sha256": "0lj997453mywdnl6zf5fvdgw4j4k3i2q9ayi2rnhdaikn5a36nmd" + "commit": "3736a80aa1d87389d8472a2310f24d8854be943f", + "sha256": "04cba1xshwza0y562vcgq9dcn54snqjjb4vlvz16b4qsdz1ghicn" }, "stable": { "version": [ @@ -63775,20 +63802,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20211119, - 1813 + 20220209, + 755 ], - "commit": "222e084b09a8b95ff194d3e9e3d8b89941c2052c", - "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6" + "commit": "2437b101739f2e1b02a87327180fcad415498b57", + "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" }, "stable": { "version": [ 0, - 35, + 36, 0 ], - "commit": "b7cfd2109934bc15967723dead5b98822af58473", - "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6" + "commit": "a66064050e228d7d3e322817f841187a8f38b089", + "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" } }, { @@ -63799,16 +63826,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220204, - 952 + 20220206, + 1919 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8", - "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs" + "commit": "c17c316b8593e5c9b662172131fd187d5e742d4a", + "sha256": "0jii3lvsp5cx5yqiaz5v5hmxpgll9ylirc9853s5m2gad3z6cy3v" }, "stable": { "version": [ @@ -63836,8 +63863,8 @@ 20180219, 1024 ], - "commit": "9aba9e57432873c2634ef504240e0a4431d3cadc", - "sha256": "001ljhsg7h3qxw3xd4c457dc2wrm1sybla04h78kq82cikmmnqgi" + "commit": "254ee815eb3fe77edea7c9da6f6f3839163735f3", + "sha256": "1q66yylmd9af3sjmlxs4l6lk6kvshg2fmalappj89c4gs9idcip8" }, "stable": { "version": [ @@ -64053,8 +64080,8 @@ 20211004, 1429 ], - "commit": "5450cf3fae023cb652ef7391d96d9969eadf3866", - "sha256": "005s4p73zman1pnk46ajwj1m0b648i067frfg6i37wikryrcnz95" + "commit": "7b208f99612a359690da76efdcce7196fef6a65a", + "sha256": "0n39573gkmqbmjlzh7al4qlhavmdqg3s7sz0xw7i7fbinq1lw88z" }, "stable": { "version": [ @@ -64169,8 +64196,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220203, - 1437 + 20220209, + 1138 ], "deps": [ "ace-window", @@ -64179,8 +64206,8 @@ "swiper", "zoutline" ], - "commit": "80a4f6e9a7fb39e514a5ddfa919fa14f73716b71", - "sha256": "0vkvsg0x24yabkhcal25xlz0r5zbvdhd4x0zni9w5wg3rcf2rvmj" + "commit": "df1b7e614fb0f73646755343e8892ddda310f427", + "sha256": "02pmnn9cqslahnvllqzawp2j5icmb3wgkrk4qrfxjds68jg7pjj4" }, "stable": { "version": [ @@ -64470,14 +64497,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20211101, - 948 + 20220215, + 1814 ], "deps": [ "s" ], - "commit": "ba7d22140a165b0fdd900a8d04916115ca6ab8ff", - "sha256": "1bdybw44pmhfpikdv1kg2sx88546xyncks5a4b2s0ak4p66r82k3" + "commit": "f5133e65d8ffdab918cdfc269ac0c067a0de5e9b", + "sha256": "0gvha2fl5macpwsp4fpa9nv14sg0yqr90s3v92f6imx89ll0rcya" } }, { @@ -64614,20 +64641,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220130, - 237 + 20220208, + 308 ], - "commit": "d6efd5dbecd873b65da5c55270cfa8fe09ff6f07", - "sha256": "0lcdvf540dwsk5v3v17add2s6vv1yg24z479f6vngwssn281scqc" + "commit": "9d310b173c4128fdd7da876cd84b9ef888567773", + "sha256": "1kwhjj5kkfdbgqr0v5kwyabp741rhww7ydlc3krajih7m18zsbsy" }, "stable": { "version": [ 4, - 7, + 8, 0 ], - "commit": "a5f1953904ae6ad7d347f15975d905b7f74ef16a", - "sha256": "0kaf7gki5m351gipa92kqbp3jf74c2vjj7nm57vkq4gkxr4wmfi1" + "commit": "cc2adbd4455dcc70cc1366af5e0754a619e75242", + "sha256": "14n8cf020hpz9hrhf7pxcxszvbkp19s5j5cz3a42n4jh7jpacdzp" } }, { @@ -65013,8 +65040,8 @@ "ht", "s" ], - "commit": "40e3b873e91393a19bd3251615817166aa2f5d4b", - "sha256": "1c4fx533xbffj5hj2nnlr76v6l9a1ah3pwbhncw7w31dq5v6vzx7" + "commit": "19c3ab12689f2162fefc14061d46861c7f653a76", + "sha256": "11i9r69irn20rf8jxd78b4anmrx763qh672gkjjl0sna0pfs287s" }, "stable": { "version": [ @@ -65186,11 +65213,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20220206, - 207 + 20220213, + 126 ], - "commit": "f1f4217b442fd52fb91cdbea34ff2c6af99ec8de", - "sha256": "145swf80935wq7pgz46f0g3ix4j0szi6r8cxwq5aw9fc8y1438n3" + "commit": "c6e7baedd652a9a2b7e6b9418039e8f4922e0baf", + "sha256": "0r6yp86nbbxv6m4mzh7xya2mqxrq77s3qpzf5w5aj9hlnx1p5psl" } }, { @@ -65224,20 +65251,20 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220204, - 1512 + 20220217, + 1452 ], - "commit": "d2a48068c4ce29966229f128d50163762b685091", - "sha256": "0hx5x7mv98sr935v97j2zxzjcmvzkh6h2zxra5vjxvwgwykqk9am" + "commit": "474b706dab58dfb8bec40b9ac5084b8dc26e833b", + "sha256": "085d6k3yi2lzyxm0raycr9ssavqb5yqqxn94jpvwhnlzg00qpiah" }, "stable": { "version": [ 0, 8, - 1 + 2 ], - "commit": "0b3bfd1dbb61f29d21b8aa17c60848456aad76c9", - "sha256": "043j28jrpifzqqdia4y2kdy0l0xw5cnh96mv3wr3sfbi3x33m44p" + "commit": "4d887f7695b48be92c4226faf683c9c328257481", + "sha256": "19iv3jvl5zb4i1q5fvn57xka93z9w6sfb1m0ry8mqb8g2bp5alnl" } }, { @@ -65248,15 +65275,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220110, - 144 + 20220209, + 320 ], "deps": [ "map", "seq" ], - "commit": "e7a6bd15cebe94d7dfe2732187afb50bcd58088c", - "sha256": "0yz9xxah6jg1wrvk2g4slrl1vaxc99icfb62ic62gs54s1cz27qs" + "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", + "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" }, "stable": { "version": [ @@ -65287,8 +65314,8 @@ "dash", "loopy" ], - "commit": "e7a6bd15cebe94d7dfe2732187afb50bcd58088c", - "sha256": "0yz9xxah6jg1wrvk2g4slrl1vaxc99icfb62ic62gs54s1cz27qs" + "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", + "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" }, "stable": { "version": [ @@ -65368,8 +65395,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220129, - 1427 + 20220212, + 27 ], "deps": [ "dap-mode", @@ -65379,8 +65406,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "5cef1b6a34327bf236c8b7b23c44bdd968b4585b", - "sha256": "0kvjkpv0yvahmlkqyzl9ayl3mmmr4gcmi3p5pp8092ah0xgys86p" + "commit": "40aa90d8ad0ec6d5f9682e135eefb794b675dc9a", + "sha256": "0dbbfsspwfx654y8gkn12whf5942lchcma8ki6jy06h7pbx4wgm8" }, "stable": { "version": [ @@ -65472,8 +65499,8 @@ "request", "s" ], - "commit": "8b2368675ab820b48abed3a3d7b5208fdc88d94b", - "sha256": "0wx51wra4gg7i2bf0q0y42gmnm8nn5vrzhlya678g36pk2h48h2z" + "commit": "d929ce8c324a722554c866e7fd76857121f193cb", + "sha256": "1qlwz2cx03mdd40vwmgn7cvn1h3d1d1m58r48np1cs1bjf2wbmb2" }, "stable": { "version": [ @@ -65803,8 +65830,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220201, - 852 + 20220213, + 906 ], "deps": [ "dash", @@ -65814,8 +65841,8 @@ "markdown-mode", "spinner" ], - "commit": "fbfaa80095a82f7473cb7e45fe73b32ecc1900ae", - "sha256": "0lg9sl5gfglx070230i4gszcp58b1s5pdgfq50hy6wanifvxsvah" + "commit": "9b3a9215807af0727b514e8c7cf440bcc0bdad44", + "sha256": "0wq2nrg7dfd5570q5s8w36z3c8brsdby1q9iqfxrab7v1byxzyd8" }, "stable": { "version": [ @@ -66382,30 +66409,30 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20220204, - 916 + 20220207, + 1326 ], "deps": [ "emms", "f", "request" ], - "commit": "f6948259b388102208d8a29dabf383f10f801cab", - "sha256": "1p7dpnjspjcxs3wi7fmfnwxgl5ha3d420imhni4wlgdx2nyjqp8f" + "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", + "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "emms", "f", "request" ], - "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", - "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", + "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" } }, { @@ -66669,8 +66696,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220203, - 2302 + 20220217, + 349 ], "deps": [ "dash", @@ -66679,8 +66706,8 @@ "transient", "with-editor" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -66759,14 +66786,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20220124, - 557 + 20220211, + 548 ], "deps": [ "magit" ], - "commit": "d02a69c0c1b411157e8ba34d6e986767c5ea758c", - "sha256": "1adqc4c9xqydmmk1zh4ar590hznfq4ls8g9x5xc0id7mc0pc9rjs" + "commit": "4845e535a38da2dae1b2dd857cef9eb15abefb41", + "sha256": "0vnp1xn7s447waa1319bix8xnvwbbz0vshplzl37zdjyh1myf33k" } }, { @@ -67045,8 +67072,8 @@ "libgit", "magit" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -67108,14 +67135,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20210910, - 1333 + 20220209, + 1857 ], "deps": [ "magit" ], - "commit": "875f8ace4c38d1f6f2126ab0f038687c42f1ab2b", - "sha256": "1mbh5qshaiv5x6rlklzx9l3icccb9kn3rvbdaq1xbqbgfdpfhfwd" + "commit": "e792755514cb5a98b94fcd1c5eacd487f7e04d7b", + "sha256": "1x6663ycyvxmacww7cdq82cxbjkpgjpwcvxgaqgh6pfc2wwqiwml" } }, { @@ -67194,14 +67221,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220130, - 2007 + 20220216, + 1853 ], "deps": [ "dash" ], - "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4", - "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg" + "commit": "f9a15cb349b24ce705cae3dde646a1e027dc54d5", + "sha256": "1w0ld6wl9k4r6yzx4a0xhxkpz1bkndh5rvlzkkml8dfyaddcvqa8" }, "stable": { "version": [ @@ -67409,8 +67436,8 @@ "markdown-mode", "s" ], - "commit": "9fb9c653d0dad3da7ccff3ae321fa6e54c08f41b", - "sha256": "047dyiysdhf81qfcmmaxzixgxy35fjm9wyhwwv9630s5b83fh094" + "commit": "b75bb92eb5defeb358aac09bc50f6067e3c1d250", + "sha256": "1yxkzxxlbx1bhdxry114r5h6ncipycg6szn8gs8xnzj6yi5niyig" }, "stable": { "version": [ @@ -67539,22 +67566,21 @@ }, { "ename": "major-mode-icons", - "commit": "c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56", - "sha256": "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95", - "fetcher": "github", - "repo": "stardiviner/major-mode-icons", + "commit": "15057fc5b590c36f62b78243f301a288c85a6d3f", + "sha256": "1rl0b7k45y3gyip4n3wf1hpl94h5q0ndhm84f83k36w8q5pqhy29", + "fetcher": "git", + "url": "https://repo.or.cz/major-mode-icons.git", "unstable": { "version": [ - 20200127, - 512 + 20220210, + 1404 ], "deps": [ "all-the-icons", - "powerline", - "xpm" + "powerline" ], - "commit": "b36eae2e976bad3c431b082c64b1a724a2ba1fe6", - "sha256": "1jjmma9lx5g4qprmy71izgdp564lbdb0wsiysl1f6d8wipml78ys" + "commit": "b0214e0af13cd3691c4d28f03e3108bd98ec7a85", + "sha256": "04zhns2ziwkz67zlnh4qc7faqq751f9mc5b38zmkh6nidlhfhjj5" } }, { @@ -67803,8 +67829,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "67cac2f9e3804fa815490b305e98e37fa55023ea", - "sha256": "1a36fpl6qhby64cnpm359sgsdbn0qakfc7qc8nkb6dl0lmbkfxdg" + "commit": "ff6cfaa5bb4d48f8909f0cc3d0da41720c1f69f4", + "sha256": "197087nvw8jdj2nqvrs12wkd72gbwygh7iv82lilffpb2dbvgfi3" }, "stable": { "version": [ @@ -67980,11 +68006,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220131, - 738 + 20220217, + 21 ], - "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a", - "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg" + "commit": "097bd81743026c9b4889b860efd0283b26e64ccf", + "sha256": "1zkm3axkg676jcr0rv3na4v212cq4m2lpk0zac5a2s1y0fgvvx2q" }, "stable": { "version": [ @@ -68100,19 +68126,19 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220118, - 1509 + 20220212, + 728 ], - "commit": "541bd7b48a4b7586f3c419f9ee1bb24810e1f56d", - "sha256": "0m634gigg6ypns2j9ipf97jv659d6zdcdfff825kazb31hz9lms4" + "commit": "521658eb32e456681592443e04ae507c3a59ed07", + "sha256": "162xfchw2nxsx5a53kx15qlhr0vqqsn1vpqjnfp3ys7yngs3vvdm" }, "stable": { "version": [ 2, - 4 + 5 ], - "commit": "7b854c8e70b6d6edee12aec4194f4eb239586804", - "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" + "commit": "eecf2f20b097f9e6a0eaf938af967122fbec35dd", + "sha256": "02vw1zsbwa2hc3sxvbpvbldi5cf1xgd5b9l6fwg24d24j6b2af0j" } }, { @@ -68315,8 +68341,8 @@ 20200720, 1034 ], - "commit": "9c2fca7a7709d5ba4d83020669ab9d8b6d992624", - "sha256": "1frlnh73aygiz099r3dh7jlfr55ijplww3zyj4ig70mzd8qm08b9" + "commit": "2bcfa9ecdc555279e74ef5a73966c636bff07743", + "sha256": "0cmwxpdj4b3pvm4awbpbvbf31qv7pkvknw3nj1qrpvmhj7qga5f7" }, "stable": { "version": [ @@ -68396,15 +68422,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220130, - 952 + 20220216, + 1103 ], "deps": [ "request", "seq" ], - "commit": "5a0cc2fcc5fa0dad2d884dcc9989222d6df9e88e", - "sha256": "0ndawsh4gg2lcgs7php8660wvc2qbwrqnb6cbw7dkzhhcnyyi266" + "commit": "813faf2381a7c4322c1ef71ca1364457609a3a57", + "sha256": "1skxk0ahvqqfxm0mg0940cf04k2zk6nln4dwgjfsw11dcj9ns89z" }, "stable": { "version": [ @@ -69011,20 +69037,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220202, - 1100 + 20220217, + 1046 ], - "commit": "845c4693ade5aa24715d3c0e4da678ca3fa98b51", - "sha256": "124afg43kxlizn69hfhd7w157i3c59ifap1ilfcpga3dgvhn3ws7" + "commit": "2cbb794904002362ab342d8b6b27addbb119998d", + "sha256": "1irdasnwfh512d4dkwcsihmc6a88bxd3g490h4wbn4x87z8pzhzg" }, "stable": { "version": [ 1, 4, - 0 + 1 ], - "commit": "6bb3fee0b91a74622e891537307918e828a4ed89", - "sha256": "04vin23bmds8dp2i1xihph9r7v43lcfz6fm23f4nvcyka9rqxc0z" + "commit": "b494651e1e02a232c5b9a359d6d4474ade736baa", + "sha256": "1w6586q237c5li8c0rrivissvhn2hic6l199yr9qx92mm9cvic0q" } }, { @@ -69038,8 +69064,8 @@ 20210720, 950 ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69067,8 +69093,8 @@ "auto-complete", "merlin" ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69100,8 +69126,8 @@ "company", "merlin" ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69162,8 +69188,8 @@ "iedit", "merlin" ], - "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e", - "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06" + "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", + "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" }, "stable": { "version": [ @@ -69432,11 +69458,11 @@ "repo": "jagrg/metronome", "unstable": { "version": [ - 20200502, - 1748 + 20220210, + 147 ], - "commit": "18257ecdd7b3d816104e83a5f0f96e676cc9fbfc", - "sha256": "14qzb1i9l149nw4zhx8jlrrz7nvflc974zr5lbv7vv2zky0pya6w" + "commit": "1e1bd5234f3ecfb608041d423be7412c461ad3c2", + "sha256": "1igx3ajzgrrhc1bxzj24bf1r9ipm3pd4haq82wqdqskf60gidkac" } }, { @@ -69519,8 +69545,8 @@ 20210131, 2152 ], - "commit": "bf7e45439b044d18d0fdf3151fbdd7994875edce", - "sha256": "1i8frxbqmq5qakl2gnrmz7v3kvbfz6jp45ayn9kk4mq1j2ync3lh" + "commit": "0ab2406db9b4d5dac2348dd033d5fd37abd92a94", + "sha256": "0jdv58k2h90jr2a7sxkif4diwj3c0978ajyhaapk58icihfn66sa" }, "stable": { "version": [ @@ -70392,8 +70418,8 @@ "deps": [ "cl-lib" ], - "commit": "82cfba411c544c862a0854f682494a437642c957", - "sha256": "02rg73rnz9kp73f6c9vm7wihg3hp4x3x7bw6khx206qjwpy8pcfk" + "commit": "a5f978e84e07a1d79c6c8e35043ac93d8e5d50ed", + "sha256": "19xbr4vbr3d1wx0a19jplrb27bhnxb4w65avg3n0avi4dg734yy1" }, "stable": { "version": [ @@ -70463,11 +70489,11 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20210215, - 2345 + 20220211, + 548 ], - "commit": "8454a5ef404c6f4fe954a10da6ce4fd4311decfa", - "sha256": "01aq4bgris8v7q0yfyz1928q4rh9mba3b799zw2df8slqiigbf8i" + "commit": "ab45689351aa089c9fa82805b2cf34847d26b407", + "sha256": "08flayni445wfzkmzzvppw6ak03c0asipxdl3b8rwmwjjxglx9pd" } }, { @@ -70583,20 +70609,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220206, - 751 + 20220217, + 1635 ], - "commit": "6789e5790c8faec1cdac5036a5910d4644707eba", - "sha256": "18jw3dyf1mpfkq8rnqlzwp805kqqf3my0av72kbzynw5biggaqzk" + "commit": "4bd32dac89cc0e0ae9ad2074133ff1d2c60bdbcc", + "sha256": "1v5p057drqpd23m04vckc100pr4hfxj2ms7j3xwlvqbh6z4fnkg2" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "e02480f0b0a56b8575351db6504bf0d0417719ad", - "sha256": "0fh9nw7gz3bqpk6r1v6rggajhqaymk6hyww7i3hfb34g74qhyq3i" + "commit": "1c7776497617a6437a3ff3d805fc0eeee41d30e0", + "sha256": "1v5p057drqpd23m04vckc100pr4hfxj2ms7j3xwlvqbh6z4fnkg2" } }, { @@ -70940,10 +70966,10 @@ "version": [ 0, 7, - 0 + 1 ], - "commit": "ee5df762d10e60cc19e771b1a64da9459c584cf3", - "sha256": "1xzi93hp4jrxqi3x31cpx4ff1yh2gq9y7qvv65gj19cfk9a0da88" + "commit": "aa6666eb344947bf1eb9d14619f4249403048321", + "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4" } }, { @@ -71218,8 +71244,8 @@ 20210306, 1053 ], - "commit": "7329757e1ad30e327c1ae823a8302c79482d6b9c", - "sha256": "0pkar3dyc47vqalrsrzrsny81615v4yi5y5hr4gdkhnbb54hsw4r" + "commit": "cdb6ca32615805af5d2b7aa1dc5a9b300ae1b09f", + "sha256": "04y80fmk5ykjdqkag2fz8zppnwdxs81dyqj1jl1xs5g75g6j3c6z" }, "stable": { "version": [ @@ -71729,20 +71755,20 @@ }, { "ename": "mu4e-marker-icons", - "commit": "52f7c75f26eb02a58ed023a9d709fdcc09e11587", - "sha256": "1lyxcw7a842z4ss47sa8gzyh84p886d3qsszz9vl6978gy77i4al", - "fetcher": "github", - "repo": "stardiviner/mu4e-marker-icons", + "commit": "d1fb8cc83e74cf9993c3123213d195935c61aa13", + "sha256": "160ycz6bbnczhxz3zixjbqa0d4rb8240lwjvk7aijgypzbgn95il", + "fetcher": "git", + "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20210124, - 514 + 20220210, + 1405 ], "deps": [ "all-the-icons" ], - "commit": "e5c4f9b14eab69a0a28f108c6fee3390e19bd080", - "sha256": "1a3cinvi0j92j65qfgzmnx6z0xvq4l2jkvw9wydhm3bkmi3v6ni4" + "commit": "35ca0c9bd0d1512eed943f704ffc73ed97cca454", + "sha256": "1x7vkc7bagnk8xan0ylckj8wfxpqk2r4ij64vy9p0z0rgyrvj56v" } }, { @@ -71792,16 +71818,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20211222, - 1457 + 20220214, + 358 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "a1d7268eb2b737ee69b5bdf45aacbc30e50204fe", - "sha256": "00yj0ldyxhzqdsbxr4jr4rd4j1njy1r0blh7py2nlxqia22c015g" + "commit": "84a17bb3d725cb8b37cd700a6b88fbf98f5ca094", + "sha256": "05ygjbr6vbkji5jh1vyyyxh8inc8qis95xwp9zdjwc57dzjb2kah" }, "stable": { "version": [ @@ -73185,14 +73211,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20220206, - 1052 + 20220211, + 1326 ], "deps": [ "request" ], - "commit": "c94ab2fc0beb80f4cb378dceba566b9314095152", - "sha256": "0s7inq1j053lnfgyn7nsh3s12bx1wc9f1fp001n5gj4qna8lbfw9" + "commit": "0738c875045072c277c85882330778fadd3d29f7", + "sha256": "1rxqgb3fj9zvl5pmfd2pb4hd7jrgl8620pnq455qg6b8ck24gl2i" }, "stable": { "version": [ @@ -73893,8 +73919,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20210926, - 1845 + 20220210, + 1529 ], "deps": [ "anaphora", @@ -73902,8 +73928,8 @@ "json-rpc", "rbenv" ], - "commit": "168b5ff1d8d8c39ac2db31e56fbab0927d557d7f", - "sha256": "1vka4i3hsgvwiwqh06xsdrlf50q7mjzyvc4gdk28705gaxnzqmiy" + "commit": "1b7d7bfc99b104b7c4948af9f3394b416105e9d9", + "sha256": "0c38j3drf89f98b6h3xcky6alggszrr86325g72mlbkknszkhh95" } }, { @@ -73972,16 +73998,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20220125, - 2030 + 20220213, + 1654 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "221902b1acb3ed4f9527eaee6584c2d9ff0d309f", - "sha256": "0l6izdzsaxx0zfhm502blvrlvw012mld2niln404c7ca9b49ma19" + "commit": "354781f9d2da04649823a6923ad372d801f10ca7", + "sha256": "0y6cniqjgyap95jq2crfwxa72f2ln4frn299p4b9p26n2q6a3rrh" } }, { @@ -74007,26 +74033,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220129, - 1234 + 20220210, + 1734 ], "deps": [ "cl-lib" ], - "commit": "ba3facc3f6204ca82fa5b139dc01d8ce9e202443", - "sha256": "0w2r49c94xaag4nyfzz8ga05b15nc5zgm8y6sw63vaxbzg291nmz" + "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", + "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" }, "stable": { "version": [ 1, 2, - 4 + 5 ], "deps": [ "cl-lib" ], - "commit": "665e324abb690fb50e9d255bc656eb12bb83b0c6", - "sha256": "1gk1l5zk5r8alnzfbfsck5gxcwr55k04rd08sxmb4j9jds6w6zyv" + "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", + "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" } }, { @@ -74321,27 +74347,25 @@ }, { "ename": "notmuch", - "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", - "sha256": "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7", + "commit": "e3077f441b343d54d88490811eb2477e6ead87c4", + "sha256": "0n9qfr0qnb93ws3ys2qxlqyf1ardfa6phq1rsj57i1r8wkly5ddf", "fetcher": "git", "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220126, - 1122 + 20220216, + 1156 ], - "commit": "0c357ce78516ca176156a12eb362fb1d854074b6", - "sha256": "1aj749afw6nvq20wfmicwly9glv4mb4ga5dyiy92h6srkkf39y1a" + "commit": "6286b76a69f11a72927c96a928d4493cab2237ce", + "sha256": "17zj6af4y22r703g2z6jw7pk2jn56iv5ai25q2y3z8icsnx0dmzv" }, "stable": { "version": [ 0, - 35, - -1, - 0 + 35 ], - "commit": "6a9f66ef324aa286d4fb8721a10837784e87ee98", - "sha256": "1s84gxiiicwrjijjdvz5vkgww3zay8m6xr0gxig749kd1dx9x6w6" + "commit": "7b5921877e748338359a25dae578771f768183af", + "sha256": "1jkninm2ynavacmz835s0v5iy10fw7b3v6hrnhvk1yr7zyiwhy88" } }, { @@ -74875,15 +74899,15 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20220119, - 1655 + 20220214, + 1526 ], "deps": [ "dash", "s" ], - "commit": "d57dc535cb19c42c969fef7184451918c91864bc", - "sha256": "0s2dx8xbyyscbx1swsl3j9drvlyf1mgk5vq3kfia7d2q8hg5z6sc" + "commit": "cfec608e1b95bc834e801bf285b0ff5451ccdf33", + "sha256": "1k05i8xa7c6nzgv0k4kngjnsgcpllvnwj76nl15an4k2jphcd17g" }, "stable": { "version": [ @@ -75052,26 +75076,6 @@ } }, { - "ename": "ob-ammonite", - "commit": "508358506a6994baf120be2acba86762f5727c6c", - "sha256": "0wr7p3sfn9m8vz87lzas943zcm8vkzgfki9pbs3rh3fxvdc197lb", - "fetcher": "github", - "repo": "zwild/ob-ammonite", - "unstable": { - "version": [ - 20190813, - 59 - ], - "deps": [ - "ammonite-term-repl", - "s", - "xterm-color" - ], - "commit": "39937dff395e70aff76a4224fa49cf2ec6c57cca", - "sha256": "0aibvrhwj2swv9ixl6hx4b2yicbpi095mvs0fib7i1nhlg0zciqd" - } - }, - { "ename": "ob-applescript", "commit": "23b075774be913539c3f057dcb7f24fbc05c37a4", "sha256": "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc", @@ -75777,20 +75781,20 @@ }, { "ename": "ob-php", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp", - "fetcher": "github", - "repo": "stardiviner/ob-php", + "commit": "efb4e6d8540e6ca38c3aa0997116f5995ba1ea83", + "sha256": "09j53drzi2pkfzpjasmpfijsdlirh919vkg9yv9nhls2x3vgmrjb", + "fetcher": "git", + "url": "https://repo.or.cz/ob-php.git", "unstable": { "version": [ - 20211229, - 744 + 20220210, + 1406 ], "deps": [ "org" ], - "commit": "cff022a2aaaf1785e1937e232c31670d748b8c6e", - "sha256": "1g53j5wy7m3mkfbyk5m5rz49sacmx64j1xl5535fdc06cl2kcxjm" + "commit": "e9d46541ca1b522ddf423dd8ec5b5d2f00b0b5ed", + "sha256": "1828h5cvl1cdinx45dn3xfqw49p1ivm633h6kb73mpi1mkh0ywn8" } }, { @@ -75819,20 +75823,20 @@ }, { "ename": "ob-redis", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm", - "fetcher": "github", - "repo": "stardiviner/ob-redis", + "commit": "baba2cef36a0e392b4df720d257642bcac67e724", + "sha256": "138q9405v5ihp9d24x4jkrmzrfhza2hjr31xhz7nfc2b63vh6mkg", + "fetcher": "git", + "url": "https://repo.or.cz/ob-redis.git", "unstable": { "version": [ - 20210527, - 1336 + 20220210, + 1407 ], "deps": [ "org" ], - "commit": "ad31bf482a081b9c595a02ee6053c1426e3d8faf", - "sha256": "1w8wbiwzi8b3gm376yyynvc833skkvgylmrn803pnqsa1ij77jni" + "commit": "937099d74f2e8cb68e4166c141ff742a278c4dec", + "sha256": "0r5ciwdxnsw5hilx6s65mg649zzrysydfd28c1llhjwhjqcdhxrg" } }, { @@ -75919,21 +75923,21 @@ }, { "ename": "ob-smiles", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb", - "fetcher": "github", - "repo": "stardiviner/ob-smiles", + "commit": "b3335e721482d50f474dd7cb1650788036162145", + "sha256": "0zbs2camiqcc9mkpcw41mxdrsl2b551si1yiqpnhv3smvc2ppki6", + "fetcher": "git", + "url": "https://repo.or.cz/ob-smiles.git", "unstable": { "version": [ - 20210527, - 1401 + 20220210, + 1412 ], "deps": [ "org", "smiles-mode" ], - "commit": "9f1fed213eb194924ab7d12b9d6e1074578a791c", - "sha256": "1x0rq9l9j3khp47q2j9bnyhhj2xrs4zggw9p8rmmai165drh1i9r" + "commit": "5a5462d25b24ef30960740202c3952c55278fb1d", + "sha256": "07qcydf2w5xspl6v9qhzyi8yvn8qagf926ybm38qjxxdfza0vjk9" } }, { @@ -75967,21 +75971,21 @@ }, { "ename": "ob-spice", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2", - "fetcher": "github", - "repo": "stardiviner/ob-spice", + "commit": "79b2eab8f2fc328df6c24661f35b246e46e6e5ec", + "sha256": "0sw5ffwbjlf2s0dbk883ljddh266p6crgvaf5ym8p5y0asijvp3d", + "fetcher": "git", + "url": "https://repo.or.cz/ob-spice.git", "unstable": { "version": [ - 20210527, - 1355 + 20220210, + 1415 ], "deps": [ "org", "spice-mode" ], - "commit": "3c77144ecb059411441730bb47f6d5892b62d13d", - "sha256": "00cnym62hp0masikr3ndk2a0mpafjw0cjx0xavcq486w2xi7r8rm" + "commit": "6dc2c6b9391ea8dd8123224f6c282b673b89dc94", + "sha256": "15lnmqzpgaz8n6zh0x9dm6hynl7rf1pcyf5m3fk7bbinqbxclljn" }, "stable": { "version": [ @@ -76294,8 +76298,8 @@ 20210923, 1348 ], - "commit": "fb005d5abc34bad8b7c39b9da04a16d997932a0d", - "sha256": "18ay9jrmc6ldywzrjac2gcjqczbsny7a4r2vf8kxaz8camgh7081" + "commit": "88b09cea663b20f9141fe52ce3e47c7289dc27cd", + "sha256": "01ziikn7lr41040pdb3zwvhhvpi2ybfh3z40yxq4zd1ahafk7z3y" }, "stable": { "version": [ @@ -77235,11 +77239,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220113, - 137 + 20220212, + 356 ], - "commit": "ce462a63e32dd32bceea041f656bb79da953d62f", - "sha256": "1phqqhddsialm5ls0ab6jr4hwwj0isyks2l9pi1w1k9blkyqx994" + "commit": "7ddf5dfe9e982ee1510ceec36eeb4d8bb802ea73", + "sha256": "0jl9zcpxlz89fzvagvwz73y2qxq0vbmzk7rmqcz37f8r75fz63aw" }, "stable": { "version": [ @@ -77431,14 +77435,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220122, - 1913 + 20220211, + 727 ], "deps": [ "org" ], - "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f", - "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6" + "commit": "ffbd742267ff81ba8433177fac5d7fe22b6d68a9", + "sha256": "0h1689mzkcgnrnpjwlh3a9ks9vb0a8sj60nlyn9x2nkcalg6vsw4" }, "stable": { "version": [ @@ -78270,14 +78274,14 @@ "repo": "eschulte/org-ehtml", "unstable": { "version": [ - 20220110, - 1917 + 20220216, + 2054 ], "deps": [ "web-server" ], - "commit": "4db3756249b069310dabc0db43c7d9bbe55fb233", - "sha256": "05r4p1mxwy0a4xiyza3h2a7dy1w2px866pmvcg245xcsq77ikyz4" + "commit": "419932d6dbce193b0d90b1ccf9bf643169d21f52", + "sha256": "09cq6i2yzlpzmj5xcym6s8fji86kqcv7jy7r8d9p64fx74khh6jp" } }, { @@ -78565,8 +78569,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20220112, - 437 + 20220213, + 41 ], "deps": [ "f", @@ -78575,8 +78579,8 @@ "org-edna", "transient" ], - "commit": "835b316c7273e234383d1876d43ebc90a45ace59", - "sha256": "1wwx35smvnxdh3fq7077s98cmphfmwzcr1bcxawnnnh7dd9yxnrn" + "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", + "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" }, "stable": { "version": [ @@ -78842,6 +78846,40 @@ } }, { + "ename": "org-journal-tags", + "commit": "11deda6e0bb96bf2e4542f18a40c16b874a512b9", + "sha256": "1j5zsm4lgqh3as0h74d759nldcb737lpwhw5dl77996y0ani5byf", + "fetcher": "github", + "repo": "SqrtMinusOne/org-journal-tags", + "unstable": { + "version": [ + 20220216, + 801 + ], + "deps": [ + "magit-section", + "org-journal", + "transient" + ], + "commit": "f8ad372c5839eeb882d2bd256ddd740e900aad95", + "sha256": "0ky4am88azrnhync6zr3ilq9lf5hknymm6m0cg4iphklx0694v6m" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "magit-section", + "org-journal", + "transient" + ], + "commit": "16e7ad11ca3ff3085f3098f492c5cfb3f6ded253", + "sha256": "12l0r1ayi7qwczaaa9590rqfmib8rj0f287c0s7gphmvyds078j7" + } + }, + { "ename": "org-kanban", "commit": "a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1", "sha256": "1flgqa2pwzw6b2zm3j09i9bvz1i8k03mbwj6l75yrk29lh4njq41", @@ -78877,21 +78915,21 @@ }, { "ename": "org-kindle", - "commit": "29d08205620d51d4d76e3a4a6124884b5a6b9db7", - "sha256": "17sxvyh3z5pn2353iz2v6xjxp98yxwd4n7wkqsa9nwihsw5mmrrw", - "fetcher": "github", - "repo": "stardiviner/org-kindle", + "commit": "f5a3cc21b619d420c84161c82fac70f1b37cdda3", + "sha256": "18bp1p8hyzfp7vp5yz374sg5487i0a752b7cnr40avnq44j48d5y", + "fetcher": "git", + "url": "https://repo.or.cz/org-kindle.git", "unstable": { "version": [ - 20210930, - 1008 + 20220210, + 1408 ], "deps": [ "cl-lib", "seq" ], - "commit": "fdba34a47b670226f46ad7b3a4db4edc7f7907e7", - "sha256": "17klypc5fk6v9ccnyixak9ixyvsfzv3ivm7j8aiv9dk3acjf4yrd" + "commit": "fadcfd62e254d0c45e87d63128a82a08ae21869a", + "sha256": "0f61xy0hv3pjbhx9wmhpbi43nis90rsx1ljw9kirp99h64gg0jgd" } }, { @@ -78917,20 +78955,20 @@ }, { "ename": "org-link-beautify", - "commit": "ee5e68e4aeea824af0abef8b6552852a8436b178", - "sha256": "0s0hrq3pr3c7mdmnl69spn7k8905y3j75wkzncnq8dsia9s5q7xi", - "fetcher": "github", - "repo": "stardiviner/org-link-beautify", + "commit": "acd9bcc86c90e507fcd76f16e7ab57d64114f8b4", + "sha256": "1k1rczs3w3cxh9fryd1qr1dnr5v2hhxad1vcyjrqvyqpbm1dqnlh", + "fetcher": "git", + "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20211229, - 241 + 20220210, + 1409 ], "deps": [ "all-the-icons" ], - "commit": "c755af07a9ca0c75e99ba06412d29829a7dfccc6", - "sha256": "1m0l864rw27myrdyby3706f8ir4znibkjyprpi83i5b04hkbyfbx" + "commit": "e8be9d886b5a9467244ed906ebb48089d9406aa2", + "sha256": "0rivgwi1570ybzz136q02kijv6cjbqx8ncwm71kas0gvcp6i73py" } }, { @@ -80049,8 +80087,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220202, - 1733 + 20220212, + 1552 ], "deps": [ "avy", @@ -80060,11 +80098,12 @@ "f", "htmlize", "hydra", + "org", "parsebib", "s" ], - "commit": "9db9afb50407cdb1a8ec7c28bea69d0b6208fbdb", - "sha256": "1qs8c1sdz53pr2p53lqd1kx1747r4i2h9ynwi6dq6xab148zmdjg" + "commit": "b7d43f4c66baeea7cf9a1d3af8a3cc874a6abcea", + "sha256": "1hkqaq8ksda60bsp7qlpvpz66syms0qxs5ig693q3py372p6g9pp" }, "stable": { "version": [ @@ -80140,28 +80179,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220119, - 1444 + 20220214, + 1344 ], "deps": [ "dash", "org" ], - "commit": "341e829a730dd9eb1c14e2588fecb3ad7361f989", - "sha256": "0cj5ijf4bndx8n0ziwjp4q8wj779xhm12k0m0ld9hy21vn22z8l1" + "commit": "38724365176f50b7a94ad13c1215ca4755e16a28", + "sha256": "11zl5a350cg99aja5xmn48fgziqhi5ivdra61rk8yh4x8bmhxmc9" }, "stable": { "version": [ 0, 3, - 6 + 7 ], "deps": [ "dash", "org" ], - "commit": "4162756a7f0fb6f4734527ad5d6b879c3523ff70", - "sha256": "1jrbz367m3ss62kl9bq86piim9czvi8nky5g8iwb0hs3m9h9j3m7" + "commit": "0926af467579d801fa46c108cb4e55325328aebc", + "sha256": "12378ny4q5bixpaz6a93nvng906ys63g7npk3iw8j5mmw83yknd7" } }, { @@ -80211,8 +80250,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220131, - 654 + 20220208, + 1712 ], "deps": [ "dash", @@ -80221,8 +80260,8 @@ "magit-section", "org" ], - "commit": "eed1df90f571b19cae1581e7f5d938892b00c24d", - "sha256": "1pd887c4g9rykfz4sf7n6845b9md1sh64bychjbbwbj63375xvsm" + "commit": "b163c900b8ec2e3637bc251d9b90421efc771c02", + "sha256": "0ifvysgmdcn6gjmqm9cdb6rkl5bbg3db6pgj9gbzz734bvx3648d" }, "stable": { "version": [ @@ -80250,15 +80289,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20220117, - 801 + 20220213, + 1609 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "3ac2445f431bc39aa0ca5abfc80e28c0c06f0738", - "sha256": "07qiis3c7ypfvy6v6b6wsj993yp41cw8yi66gc0ssmg053vymz5p" + "commit": "714b519f000697983eee291f7a28d595ef731d99", + "sha256": "0sl9dy63g6isjj5kmcc3lijjlsjwdp1fb11zri454lvnlmwa4w8i" }, "stable": { "version": [ @@ -80384,10 +80423,10 @@ }, { "ename": "org-seek", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7", - "fetcher": "github", - "repo": "stardiviner/org-seek.el", + "commit": "7b9ce2952ee260d769d247ab20f7c7909042a812", + "sha256": "1nck8j65zchaqxq4vkq1flaw04jwv554cfnha2gmx3c9j47af3bi", + "fetcher": "git", + "url": "https://repo.or.cz/org-seek.el.git", "unstable": { "version": [ 20161217, @@ -80838,25 +80877,21 @@ }, { "ename": "org-tag-beautify", - "commit": "faa48723cbc4486c2d8262d00aa9967bfad81738", - "sha256": "1dn164z53c38bfzx8m22dynfx2wlw8cgcm63q6kvz5xsxqqwwsmp", - "fetcher": "github", - "repo": "stardiviner/org-tag-beautify", + "commit": "e06ae4c7cd46c2aa88782726e3637842f23932ca", + "sha256": "1rhmg2ff7sk1drzgfzibadin2kd1hlwmxy2d71rcy9ibmzhk8x0f", + "fetcher": "git", + "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220111, - 826 + 20220212, + 1727 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "98f419d81fb71d39c097c1a58f14923e9c705ba0", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/stardiviner/org-tag-beautify/archive/98f419d81fb71d39c097c1a58f14923e9c705ba0.tar.gz': HTTP error 404 ('')\n\n response body:\n\n Not Found\n" - ] + "commit": "10286cce91a1675c681c482a4f2d99ce5dd220e6", + "sha256": "1d9z3kczbs6jp02c2h2m36dixw7g5zy6h8xai9w1zhkzirqx6dmh" } }, { @@ -81653,8 +81688,8 @@ "ht", "s" ], - "commit": "8d90885d5a0cb5ad57b5202e2046bd3a0f3ce1f4", - "sha256": "1rp4dqm1qr6ndhrs7b06jhsy2ch8n9a82yma7abaz9hjdx6a6gz3" + "commit": "a9189e2688f774c8c3b9e2366d94b137fbf3d271", + "sha256": "1454wv4xska8lrsdl88s59zr5zi2wil8ip727wr5wp94n2jhq7j7" }, "stable": { "version": [ @@ -81712,28 +81747,28 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220107, - 1206 + 20220211, + 25 ], "deps": [ "magit", "org" ], - "commit": "66367d6bfc5e00726fb74f7cd20c32175ab8521b", - "sha256": "0lc2lk9c7b92c1cna2pyb88x9fa4bydcqkp4zcn0khpdv54fmszq" + "commit": "42b7f682b3e4e487ff209a44221a729921241133", + "sha256": "0vns8fbavfgyazlhbvwgc17w3v5iaf7ng92na2sl4lvc33rk941j" }, "stable": { "version": [ 1, - 7, - 2 + 8, + 0 ], "deps": [ "magit", "org" ], - "commit": "66367d6bfc5e00726fb74f7cd20c32175ab8521b", - "sha256": "0lc2lk9c7b92c1cna2pyb88x9fa4bydcqkp4zcn0khpdv54fmszq" + "commit": "0b49d7a869b8fef3537a75df4db693ca3e3935a3", + "sha256": "1hjfsj12qx06m8ji4l2sg502a55sabar4h6c2b2i9nmp1xf5889l" } }, { @@ -81744,8 +81779,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210615, - 1516 + 20220211, + 26 ], "deps": [ "forge", @@ -81753,14 +81788,14 @@ "org", "orgit" ], - "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", - "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" + "commit": "36e57a0359992e02312f453b8086512e77beb150", + "sha256": "0mrq7mrgvj5r0bmxa4365xycfwp6m42mdqi5l5pljr5xz6k3rnc4" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "forge", @@ -81768,8 +81803,8 @@ "org", "orgit" ], - "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", - "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" + "commit": "e11df20bfe500220bf48423fcc1529cd3ccb6bf2", + "sha256": "1s87svins72m9cj89xxpmkws85670djkx57pd90zqcs20qb788f2" } }, { @@ -82820,14 +82855,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220204, - 1606 + 20220217, + 1816 ], "deps": [ "org" ], - "commit": "e52b7e50db825027b5e770c433793b3284ce4367", - "sha256": "0gfzkzlfl5119nxlrc8dm1y6gqppvqc21ljy68nz2npp6fcswkb7" + "commit": "f7838b766d200efbcbe06dfd4dfc529fbe5a689f", + "sha256": "1fbgf7zdmx22a1639yixbgajcs61rymlkwi3hbdwp3dx5li6k78r" }, "stable": { "version": [ @@ -83179,14 +83214,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220205, - 1046 + 20220216, + 1506 ], "deps": [ "org" ], - "commit": "2f1509cc145c3604a0b17a306603f231d067ea16", - "sha256": "06p6r86way5cxvp6z65j5hdmv09frk69qly2c02zg64xxymc8n55" + "commit": "fed9be1f4c317c08ca2372bd45cb9d1bcf8a3f7e", + "sha256": "1vmkj60lmah79r62k2gigkblilkw21ciyj324iwvk6hqmaahw6km" } }, { @@ -83203,8 +83238,8 @@ "deps": [ "org" ], - "commit": "c9c1be3ff0ac2464f0d514939887f34f9b4198b2", - "sha256": "005qrg580328l4h67i0mm2r540dknmn0bnqyy2vdpk75qc2rirca" + "commit": "b8722a0197c3ad935c80007b2f413bb005f255b2", + "sha256": "0jj00i7ji59qrw536wz13xzixgskawv032l5p4zwf7brqd573zva" } }, { @@ -83616,14 +83651,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220115, - 2346 + 20220210, + 1334 ], "deps": [ "cl-lib" ], - "commit": "415552b9548fb4fd929a62ec09563e94dfbec5c9", - "sha256": "0y5b6y0a39x82qrg7bjk1gs5xn0qj68gywz2wkxkh5g4m90kylsg" + "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1", + "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r" }, "stable": { "version": [ @@ -83660,27 +83695,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20211122, - 1152 + 20220213, + 1457 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "b5f5554ec38ec2a4d5ef49a0ad9f57f6825d9af9", - "sha256": "1ic1a0j8gj930ssc623vi55jflyfw52gb9zkf3yg51w43cw4isfn" + "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", + "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", - "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" } }, { @@ -83697,19 +83732,19 @@ "deps": [ "package-lint" ], - "commit": "b5f5554ec38ec2a4d5ef49a0ad9f57f6825d9af9", - "sha256": "1ic1a0j8gj930ssc623vi55jflyfw52gb9zkf3yg51w43cw4isfn" + "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", + "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "package-lint" ], - "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", - "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" } }, { @@ -83927,6 +83962,50 @@ } }, { + "ename": "paimon", + "commit": "bb634388ab592171fbe2b9066d52e1f0f31ebbf7", + "sha256": "1rqhi45m4pz1vjm6q9h91p5z00751q9dkrd845rl6cpdr2nsr270", + "fetcher": "github", + "repo": "r0man/paimon.el", + "unstable": { + "version": [ + 20220214, + 2145 + ], + "deps": [ + "aio", + "closql", + "emacsql", + "emacsql-sqlite", + "f", + "ht", + "request", + "transient" + ], + "commit": "826a11d449a6cc8453093d79a8c031f43f753139", + "sha256": "183lvy7i71ilsp98hqifmdhagf2a57x7lbhw5qq0nzk4jjaam2yp" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "aio", + "closql", + "emacsql", + "emacsql-sqlite", + "f", + "ht", + "request", + "transient" + ], + "commit": "3ea3c862497573ea426d9f0cbfdc4f2d34e626b8", + "sha256": "00jff4q36wnpgi0qs4316g17zadqiinw5kr0z5gbdr6l21f49yzh" + } + }, + { "ename": "pair-tree", "commit": "ca9422233229d8703641d87d9250ad3f38c11fd7", "sha256": "0rv6yp2vzcvnjkrlihm2a2a62879rcqwnzw7ph535drvwfl0inws", @@ -84334,10 +84413,10 @@ "version": [ 1, 0, - 7 + 8 ], - "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", - "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" + "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10", + "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y" } }, { @@ -84434,14 +84513,14 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20210306, - 821 + 20220214, + 1531 ], "deps": [ "s" ], - "commit": "b9b77285fdef7936baea5447b37651f67c51f041", - "sha256": "1xg829a0wjrjh64lzccr65j5sr1zh9wzvbid65f0c733nyizcy0f" + "commit": "5c163ffc63d52631c1494c260b50d63c04c37a97", + "sha256": "0xhbr59sn0220ymqlxjm45zzphlbmig7jhbz8z8kwa9paw2bqnz1" }, "stable": { "version": [ @@ -84517,20 +84596,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20211013, - 453 + 20220207, + 1351 ], - "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", - "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" + "commit": "90595049634549e6d8872f719b13e9555897d17b", + "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 0 ], - "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", - "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" + "commit": "90595049634549e6d8872f719b13e9555897d17b", + "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" } }, { @@ -84541,28 +84620,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20211013, - 452 + 20220207, + 1352 ], "deps": [ "map", "parseclj" ], - "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", - "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" + "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", + "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 0 ], "deps": [ "map", "parseclj" ], - "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", - "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" + "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", + "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" } }, { @@ -85223,16 +85302,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220125, - 1708 + 20220214, + 344 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "72ef774320d9eacd4d79b5016e9e989ab176afba", - "sha256": "15da6k648r0ir515bpyqf88wg7f8rxqz60zk88c4277ywa61z1zq" + "commit": "326552eef71ae6d53e215c46be5bf532575b7abb", + "sha256": "1gvaw0684svv9v294f8zgmqa2ym2wa3gymn9y9v2slhamf51r4vk" }, "stable": { "version": [ @@ -85539,11 +85618,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20201128, - 2015 + 20220206, + 1742 ], - "commit": "298df111f081b5925f0aa0126a1b8d334117e0a2", - "sha256": "0r2j8zs6hwpfvwd6av35izlyd3kplnvc4c941vjjq7sm6j95q6k8" + "commit": "7a594a3d8f1c4ba9234dcd831a589e87f3f4ae86", + "sha256": "0ckcnqg2fn4m5zp06jlw5cj81clizrm8cxjiwz5rd4d9m9lwdrgd" }, "stable": { "version": [ @@ -85672,8 +85751,8 @@ "exwm", "perspective" ], - "commit": "541946caa0359c14c90da58196bec7baed122a46", - "sha256": "0mcrvv9mhg0cfkcp64hkdd9wh9j04hw0d9dz1ghafa4h6hf3azfl" + "commit": "8afdbf894a888854ce9dfbe0ad2a5dc41f75ecb8", + "sha256": "191xm4l5id480bcf2nlliacrn2a9qrxs18pfkd4sk4bn9xxz74dx" }, "stable": { "version": [ @@ -87997,16 +88076,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20211219, - 728 + 20220208, + 1648 ], "deps": [ "alert", "seq", "transient" ], - "commit": "596eed778fa30e7b33910f015543eda13abd1888", - "sha256": "0arhl9x9d4d1s4x5qcf1kn9hkwgsrs6sjn0rky10pgja7gqh6214" + "commit": "6dc3b5f913908bca8db85e4b2161a1de76c60a58", + "sha256": "1rxlz0l58g2vvlhf0y3s7abfph3nplvm7q4vrymgj1s251kjxmmi" }, "stable": { "version": [ @@ -88182,10 +88261,10 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220126, - 844 + 20220216, + 1906 ], - "commit": "a50edecacf2939fc50ad2bc48f1015486a09f885", + "commit": "7b02960025fb89384f78ba12ad03cae0ddf1e411", "sha256": "0p12zz2lhm10yikhnq52z66xwy64gcvig42bzajv5q7x09qvvna7" }, "stable": { @@ -88208,8 +88287,8 @@ 20211231, 1823 ], - "commit": "ec3d3169a4d60b0374198580e31b6c59f51ab08a", - "sha256": "12ymj71fsps0q4rk2hcj80nf93i5iq93sg0fw6dkn8swdvmhp1lz" + "commit": "37a04117ac83b3ed24a2cba894443a32795c2f1a", + "sha256": "0vyg6va1wzl0h9sd85a2zy922w6q8za0fq6v07hcq956lhh6wi6y" }, "stable": { "version": [ @@ -88659,14 +88738,11 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200812, - 844 - ], - "deps": [ - "leaf" + 20220211, + 1529 ], - "commit": "86dad69c3a7dae770f6b99285647dff2aad81930", - "sha256": "01c82h5j7yggsbhbrlbcwl562mpd79c0i878129r4ivvhka3nha3" + "commit": "d5d854c3006dfd268e62c7f91c2aad6f86a505b5", + "sha256": "1brx3fz2amsrir6qzxwj4w8v0hhib5zcnyc5l00y5k7mrnaklh86" }, "stable": { "version": [ @@ -88686,8 +88762,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20211219, - 224 + 20220213, + 1524 ], "deps": [ "ghub", @@ -88695,8 +88771,8 @@ "magit-section", "markdown-mode" ], - "commit": "bae2d8aff61cbe05da6f3f41e6cf854ece4a41f0", - "sha256": "1p9vbhsal667cjh36wmww95c6c3srp3hqi2yfq9srmplma7ffc5n" + "commit": "5c44b06e314a43a30de8323cae75b1e87594f991", + "sha256": "1f2lrwbb85i31vcjin9b0gi89m2zn9w2npwi1sqp0bjd0ndimwp5" } }, { @@ -88972,8 +89048,8 @@ 20220124, 16 ], - "commit": "ea3daaf6a526a1ad4ae385066c99fd9643da7f94", - "sha256": "0irnp6v1i930s8fh1iqmbs4amyia9qdnggq7n5hxfi4ni0p66yqq" + "commit": "4153fed2c83faad90803f57a3c9364609eb7b3eb", + "sha256": "0s3mms1lvid47g77pp6681zrnvx1v0s08xyk3272nja5w16fizyh" } }, { @@ -89281,8 +89357,8 @@ 20210715, 1213 ], - "commit": "8c76f26c667a9748835a86ded0c7fc8f1c558b4c", - "sha256": "05fxlia6bqf9jcx963fa0kn06va256dj7hmdli04vlp8h748sljj" + "commit": "4db55e41560daa2a8f5d21a99fde65d75abdc4b1", + "sha256": "0c3dlip7k1dambqdnqrbr93a8fbg7q93g1vvkbq99fzvvyp867r7" }, "stable": { "version": [ @@ -89438,11 +89514,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220203, - 1326 + 20220211, + 932 ], - "commit": "df3d73e1f0ff625a09196ff3ba6f4be82a53fb3b", - "sha256": "1iy5i8mdvzgfirsv5k59v8i45fcm6cimlfl546hgzb9ygl6l15vr" + "commit": "0243ad7dc96072126fc6c23e48184a0419bab028", + "sha256": "0ryvhffvf8dv0x6g1ianisw7ff8zxvcdz5x043fld33mykfp716h" }, "stable": { "version": [ @@ -89844,11 +89920,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20211217, - 1753 + 20220209, + 1726 ], - "commit": "a61a1d8e5ffa610b794535995d58adf18e9ec47b", - "sha256": "1c6216yz2wb9c5yn5rq6jr9pwxb44vhvgnsi0wsh0rcccm24mdp8" + "commit": "df19c7ba0eadf9f47e9dd757a7d0350fc967da99", + "sha256": "0xh9x6b4fmbnvs8awdkg74msabchqf7lx9w3z14qwfzn4jjzqwlb" } }, { @@ -89943,8 +90019,8 @@ 20211013, 1726 ], - "commit": "3ea30d80847cd9561db570ae7f673afc15523545", - "sha256": "1yh2ayksfc3x6kavix8nk4y51gpajjrrf5cd9b18rkw2rn5xnb55" + "commit": "2f7ee91e326d95915b63918f968244cfefbc022a", + "sha256": "1y90vjdnz7174xlyp9rqc3jhj4gq0l40nzfm3nih9chnmz6ifgx6" }, "stable": { "version": [ @@ -89987,17 +90063,17 @@ }, { "ename": "proxy-mode", - "commit": "25224d3bcdb625314e931d5acc22f60c7192a84b", - "sha256": "0ldjfmxn8k8bzvdrlsfpijsmgn754aza54by5d59k7a1xn6d37mp", - "fetcher": "github", - "repo": "stardiviner/proxy-mode", + "commit": "6f61331b1d9ca910f01bded48023bea5f8baeb25", + "sha256": "14g6r3vvv56h9b84cc1lcri2xavifc6n0gq1qyi9k9qjls1mnijl", + "fetcher": "git", + "url": "https://repo.or.cz/proxy-mode.git", "unstable": { "version": [ - 20201214, - 727 + 20220210, + 1410 ], - "commit": "dbf163413e9e404c652cc0ea7185c623016a38e1", - "sha256": "1c5m0gb4qms28vahvi5kam1qf1hnpd9v1f6cwxiqdj8aka9ll8sd" + "commit": "620e48c6afaf760d0ee9f5bdf583fd91cd9d0ec6", + "sha256": "0xlla1ymqgpb15bycxl4xijlgcwir01krcvsyhxl4anmrpj2c0hm" } }, { @@ -91034,8 +91110,8 @@ 20210411, 1931 ], - "commit": "d7013f6799d28a69dbbf3329da7867a8afacce82", - "sha256": "19w4i7yymj204v147z4ggqwb0ghiz6zsh1ykda3x3rc32d5aap3h" + "commit": "67055f4221324a5aba057c0e7e3a5ffdc41a7e35", + "sha256": "03ggzjjiqx8q555vaif9c3wlzyn5bdql8pfwjiwcnxvgbxwz8l81" }, "stable": { "version": [ @@ -91382,11 +91458,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20211229, - 1002 + 20220216, + 1924 ], - "commit": "dcb376044d020dfe30f8e4273e61863b7d9615ce", - "sha256": "1638zl7aa2rf74d7rc396b5hda9fvlndapnivv3axc06mnf86rkk" + "commit": "3e28ca0310774c83026c927688610fa36fc4992a", + "sha256": "0606ypkwwr545ap09sc4x8c3pkal03xj70i354mv79gfy6n149xd" }, "stable": { "version": [ @@ -92025,11 +92101,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220204, - 2212 + 20220217, + 1940 ], - "commit": "cef5a55d2b766973db92f9d9ab2210c03fa8ba02", - "sha256": "0zzk0s4akx6ffsbhylgfflcypkkg36a3accxhmmdd11yn5rckv7f" + "commit": "a946f57c3af6238f94e4e750cffbc2324d7f4a38", + "sha256": "00mflc9i762pl13askadgn7nh60mfbf4r8wb4lfb0111q96x5nvi" } }, { @@ -92173,20 +92249,20 @@ }, { "ename": "rainbow-fart", - "commit": "cdcc8091357c42f5edbc1a13886253130f104242", - "sha256": "0zi1r8bgzd3g1dvginlp5nywyjk3lh495j6j3girgjqhsblnhfrx", - "fetcher": "github", - "repo": "stardiviner/emacs-rainbow-fart", + "commit": "c8de127d69c03addc9d93b712e2059f065a757f5", + "sha256": "0r9v9laaga02mzh1ch45a6y89bsmdr8433kz71fzrx6mam208i32", + "fetcher": "git", + "url": "https://repo.or.cz/emacs-rainbow-fart.git", "unstable": { "version": [ - 20211114, - 905 + 20220210, + 1359 ], "deps": [ "flycheck" ], - "commit": "aaaec8e20b3bde3a567baa501623c451f796a46a", - "sha256": "1mrq585wq4c23jv6fvphh03y4s8wjrh02dhd0l2369axl6bdslz7" + "commit": "4e5d3cca6cdc667e5da3300c04e1b3d1b00664a8", + "sha256": "06874ymiqpmx2isys0bf1fxw83xfzx64sxjq01xjzb3zv5ydy13w" } }, { @@ -92221,30 +92297,30 @@ "repo": "asok/rake", "unstable": { "version": [ - 20220131, - 808 + 20220211, + 827 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "759fb373b90dc4cf762a58217e81d8a3fecb5563", - "sha256": "0w677abkmrghphi2gwbxypyb59znyv331shmg4j8y5fcqf1whm14" + "commit": "452ea0caca33376487103c64177c295ed2960cca", + "sha256": "13wi9mkj1qhypii8zagxg0cly2pp8kvj3h76iij6yfizdhxq026r" }, "stable": { "version": [ 0, 4, - 1 + 3 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "e680f1a8f2591af7c80cad188340601b101b5ddc", - "sha256": "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n" + "commit": "452ea0caca33376487103c64177c295ed2960cca", + "sha256": "13wi9mkj1qhypii8zagxg0cly2pp8kvj3h76iij6yfizdhxq026r" } }, { @@ -93029,11 +93105,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220109, - 1305 + 20220211, + 1223 ], - "commit": "18a2bdb3f6a5934cf39dbeea5899f10f55e753a9", - "sha256": "0qlcl0dp1ggydz0jcyxzph2vjj8f457jyb81c1a6ds5bvybv8m28" + "commit": "d073fa8d00411af58fced861b7236aaa23b0692d", + "sha256": "0qg81yasilwk15jpxm0177slh9byihni9kc217m44pn0fxgpnsmi" }, "stable": { "version": [ @@ -93219,11 +93295,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20220206, - 1140 + 20220211, + 548 ], - "commit": "2b38ca25e3392636fe936d3edad447970279a463", - "sha256": "0fqrhfk3jg4dyf4z8nx6sgpi9l5mxzld2w0icz81kr8vm9p92nmx" + "commit": "d0d380929460ff35534900e34ababad43d23c966", + "sha256": "178415wsvjvji4caz72mksrv4krr7aykh02cggnp41w66chm503y" } }, { @@ -94433,11 +94509,11 @@ "repo": "ideasman42/emacs-revert-buffer-all", "unstable": { "version": [ - 20211004, - 1321 + 20220211, + 548 ], - "commit": "947f2471acaf1b9d5162f8a886aed6a211dd8fca", - "sha256": "19nmz7nw8v2i395wzyva96y5sm5z6h01jh1fl6n9dpavq12s934a" + "commit": "0343c04a4408ff6cb3c8a9dff7d1ffee8256aa70", + "sha256": "16ws4j2fpnv96338z7vcibhscjrjmym910hsxc137lqrkavqhm19" } }, { @@ -94448,11 +94524,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20210516, - 503 + 20220215, + 842 ], - "commit": "4f64f0ce1fe3a59389a1462dc26d6ba89d44d51c", - "sha256": "05w3n8hv5wclgwy58wbnximkf7xi6anp8vpxh523dplzxd77b5q6" + "commit": "f08ef20d9ff4f03a00a8c24dae9ce416da0d9d1c", + "sha256": "0wyjh9ymj62rlvvhahcqy48xjw768x6pkvhrwp8sp8pyb64ghkj3" } }, { @@ -95655,16 +95731,17 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20220205, - 1840 + 20220208, + 1018 ], "deps": [ "dash", "f", - "run-command" + "run-command", + "s" ], - "commit": "93de193267da8be1d1f6a23faf3988797f597846", - "sha256": "1pz5d7dh6k7qbv5qq21g279il43zy5aipncbfh1kgnkq5ackk779" + "commit": "e2751673e19e55fa364bc917e150c72b8ccc3294", + "sha256": "178qs6k5z4s74xx4n6r4qadw4svarvm8sfdxm5z964166r8d3x1y" } }, { @@ -95675,11 +95752,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20211007, - 304 + 20220211, + 548 ], - "commit": "db66c1ca0f6a090f8c9ae17f80f99c878047778e", - "sha256": "1kfnk3pa3p50nfylhxhcngxa4n8ilqwna1k179w4abmnsm0r4xz8" + "commit": "3723346dc6d867bdc3fd86ca11c32efc43704d7c", + "sha256": "0082mv45a8ybfrrvw8jnc52rk2zw80i52gid1387q2hxsdil0csm" } }, { @@ -95776,10 +95853,10 @@ "version": [ 1, 0, - 3 + 4 ], - "commit": "b017f746503df27ccdca8ee6d2627529d64d76e1", - "sha256": "11fdxbv51anrjfdqqpgrqz2md9qkcn5y3524lzjippqi9i31lnjn" + "commit": "e35a1800fc0f9ed178539d6fb82ed885c1014fb5", + "sha256": "10972zw2h1dijx08j5h7aa4d717vhrmahzkslisy3dk2gd8y2v0q" } }, { @@ -95813,8 +95890,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220204, - 1613 + 20220217, + 1820 ], "deps": [ "dash", @@ -95828,13 +95905,13 @@ "spinner", "xterm-color" ], - "commit": "7261c78004317628d2fdaf425a4c1a1bdb687605", - "sha256": "0fzkpli0l8ir4wa4hibkhgia2gxc5pb56zr7mpfyd736j3016acl" + "commit": "6f7a6055cd5f21903ec1e405be096fafc03626ed", + "sha256": "070kw2lcj5lk1ps9azsamx1wz7zy9c7w51384pwanwc72fwbsaxb" }, "stable": { "version": [ 2, - 6 + 7 ], "deps": [ "dash", @@ -95848,8 +95925,8 @@ "spinner", "xterm-color" ], - "commit": "4aca1c28676fa53d5784b7aee3565f26d43751e9", - "sha256": "0lnymi6nxn5dafm8q0av07dcjwrqxd3gm4hj1pi26kw62aw0ws24" + "commit": "737b8ace93565a0435305fc46707307b2aad3888", + "sha256": "0l1gh6arxrbq927lbj229pwqk9ly6z97b581smh434r5bh5wk8j5" } }, { @@ -96338,8 +96415,8 @@ 20200830, 301 ], - "commit": "a83597a7e67a2aa05a0a8c0c9af0c70c61a263e2", - "sha256": "18nxc94gii1hq5m9p9am00mfc2yprhwdrd9d3hs84868lwv7rack" + "commit": "eb274ac9a18e2557946787fd84d231304f2b6419", + "sha256": "1fh9hdccs1qk8piar0fay42rdikacichjhanw80y521my727454v" } }, { @@ -96385,25 +96462,6 @@ } }, { - "ename": "scalariform", - "commit": "1912f795e5842be534160e3879bfb96f3440e163", - "sha256": "096y63j91910hqsy6qvz16c9lzyi7ni3r7h039z5zw2v97aggh9i", - "fetcher": "github", - "repo": "zwild/scalariform", - "unstable": { - "version": [ - 20190114, - 215 - ], - "deps": [ - "f", - "s" - ], - "commit": "478a15ccb4f825aba73262bccd3e61ce7017f64b", - "sha256": "1c76jnj35bkcq2rhdq6d57b7vf6rvn8rpzpx49ywkxz4cx36svv6" - } - }, - { "ename": "scf-mode", "commit": "376be7f8903dbea69643600ae14e934ee5e2a11b", "sha256": "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0", @@ -96710,11 +96768,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20211127, - 1220 + 20220211, + 548 ], - "commit": "97741be699f08952c79a630869f5772918b378aa", - "sha256": "01y34ghp02znckafq51cvzahlbqbnpxdwpdrcgg1insq3qv658wb" + "commit": "d93b69eed6947cabdfde53dfbcf4bd919cb1f154", + "sha256": "0r1c3b7w1mh7hpi7pi1szdac297w1ig0i1a9c1r7qs41id2bvw51" } }, { @@ -96725,11 +96783,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20220126, - 2331 + 20220211, + 548 ], - "commit": "1e9e09f0ccadf805e9bb4dbd1050944f82c5ed0f", - "sha256": "0n472jp8j1al7c4cf1k8l5my1hzln68ix5gl8vz8kpaxhlh0s8p0" + "commit": "99386fc01b3c7bc2e75458efca408a23220a5f87", + "sha256": "0b3d5bw635jjirkmym4w0y5x450zd88ic3k74jmmgf4fw0fl1q0z" } }, { @@ -96844,14 +96902,14 @@ }, { "ename": "sdcv", - "commit": "173e233b2dacaaf54d92f3bcc06e54d068520dd4", - "sha256": "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a", - "fetcher": "github", - "repo": "stardiviner/sdcv.el", + "commit": "97663b3f4e6615f629571791f66d9bc3afeea7b7", + "sha256": "1y56jb5jy68ic1wwrwhqk2jwk49p90icbwrg80pxv1s6xigk2f02", + "fetcher": "git", + "url": "https://repo.or.cz/sdcv.el.git", "unstable": { "version": [ - 20190610, - 732 + 20220210, + 1412 ], "deps": [ "cl-lib", @@ -96859,8 +96917,8 @@ "pos-tip", "showtip" ], - "commit": "943ae3e90cc9a0a88a37cc710acd7424fd4defc4", - "sha256": "0i1ylvw7p46pkf3yyyzcdmdhsspzymnnnvx8s0i7vynngr5x0vzh" + "commit": "98e239c7380c63282845d5bc55ea6d605f5a33b8", + "sha256": "17jxnc8z2a5rdfrjxw6gfkijp06jkjpsvj0pyxrhmg94gimfprxa" } }, { @@ -96916,8 +96974,8 @@ "dash", "f" ], - "commit": "bdef718d17a09ba56b1bda7f6718588b4a33e06b", - "sha256": "0cd2lzb2z6cp3hlmwbmp98640q26875k3w5j0hqqg64rncxqx8yk" + "commit": "eea299701a4aa9500c4790c2a2e8c157f1d900db", + "sha256": "1ln4hpk759m7r9p0qc6fbz9s1hq2mnhmx1gz8iqab6zqbrnl2js0" }, "stable": { "version": [ @@ -97439,15 +97497,15 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20210629, - 2303 + 20220212, + 304 ], "deps": [ "dash", "transient" ], - "commit": "a5ce1bfd06ed90bba9947a9045659d13f3362a96", - "sha256": "0gjwp0h9ip58da1p8q9s9pjfh0g6pav4gam9s51xnx8mv0vbgb68" + "commit": "4706db081bd214b272e0bcaabb66887e4b5b0968", + "sha256": "0ghnxli8xjlr5yb0c1jlax42dc4bjhz49x6mjm7m2jz94sa397ls" } }, { @@ -98332,8 +98390,8 @@ 20210715, 1227 ], - "commit": "c952c072e210c605b08aa5d2a917bfa3f92dfe8b", - "sha256": "13abir9kr4h63krnn206gnjfln895zzjidcaidrjc8zwnysaa8k3" + "commit": "b3e4eba2994c368d742b9593a2e618d7b02e60c1", + "sha256": "0zxww99hcvn5c17m6xnyycfjy2lwvlrfxzslhw0ifla1qzj7ipy8" }, "stable": { "version": [ @@ -98706,11 +98764,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20220104, - 217 + 20220211, + 548 ], - "commit": "c90ccd6a02538c7263f6499ca7bd4456ec06791e", - "sha256": "02nnvf4c78grdzcd62611qvlq93vspd09ffk4jvc047l2jb8nw6l" + "commit": "b69943575bfa7f13ee99c8b8871d3216ad24c85f", + "sha256": "0bfl4py2s3mxpzc60l9qmmdy079li0llzd6gsczwbmvfnrs1189q" } }, { @@ -98901,14 +98959,14 @@ "repo": "jorenvo/simple-mpc", "unstable": { "version": [ - 20220204, - 2207 + 20220216, + 102 ], "deps": [ "s" ], - "commit": "265ee01f6c7c6c44f103b740c37df14f4c1fdb16", - "sha256": "14z8sqs094xq1n3hynglh1bj38kmzwfd9h66nxp95wdxanzlzghz" + "commit": "57ee14ada8aec477ddde5e4f632c8d3d99a66535", + "sha256": "1gij7kjidi21p8sbywlj9734s5cq1h31h6mv71drcj3cna9n06pb" } }, { @@ -98919,14 +98977,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20210806, - 1022 + 20220207, + 2007 ], "deps": [ "cl-lib" ], - "commit": "7eec13672c2b6d0226d56de8b8b1e12a1f78aa57", - "sha256": "03mxy2f4i8pjmb1d9s6llaa4pmzrsigxaf1srfdwzc8ccaj1qi5n" + "commit": "a454901635dfe4142d8c4f0153e737ddc778d708", + "sha256": "0b0ix9h5in324bbyv9q9l9xrifpfhjs6zhr6r5cadd36iip40r6g" } }, { @@ -99063,6 +99121,21 @@ } }, { + "ename": "simplicity-theme", + "commit": "d90f310efac200b31d90b29261f74932ba06756c", + "sha256": "0f2ixpnil14509skicaf7rm5062d1w1429jsflack14niba41d1a", + "fetcher": "github", + "repo": "smallwat3r/emacs-simplicity-theme", + "unstable": { + "version": [ + 20220217, + 1928 + ], + "commit": "2a0aaf19cf1e99c50df0d2e6225a2d2931a203d2", + "sha256": "0xv1gf0a9i3ajxd6cprr7b62xvar6r6ia5qd4sjvr8pnaw3cav45" + } + }, + { "ename": "siri-shortcuts", "commit": "f3a67195c63059fbc2d2714b540505bb9cde49d1", "sha256": "04fnzv6sq5mbj5difddbchvp7sgz48qrhs5izhl5w1si5q2ds5ri", @@ -99360,15 +99433,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220204, - 1357 + 20220217, + 1145 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "2080537746ba808b9c1683a280e803e65f196a9c", - "sha256": "0shi2zazr44bnc1j985wvx2248gl2gp20v1kyb2mzsydw3w462vw" + "commit": "33d9f46a48809fab77fc0aef209196d99be4df0c", + "sha256": "0mxznpp521nlc2n49f05gwxcjcgq3ssmvsvsrzsr8abipdi5zkni" }, "stable": { "version": [ @@ -100271,17 +100344,17 @@ }, { "ename": "smiles-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k", - "fetcher": "github", - "repo": "stardiviner/smiles-mode", + "commit": "67901d48323deba9311b32100574972c7476ad7b", + "sha256": "1j3dpq5yw1g3cdalgrbnsw5429r64jiz4krh19zr1w86lh148pdr", + "fetcher": "git", + "url": "https://repo.or.cz/smiles-mode.git", "unstable": { "version": [ - 20160717, - 1120 + 20220210, + 1413 ], - "commit": "fbb381758adcb000a0c304be1b797f985f00e2de", - "sha256": "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr" + "commit": "950a8b3224f8f069c82faeb0282d041f872d5550", + "sha256": "1pvbxmxhkmzhimvvzw2gmwhzkssgg8hs765vl0ly9jcdgqc46lgq" } }, { @@ -100610,15 +100683,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20220206, - 815 + 20220210, + 1654 ], "deps": [ "dash", "s" ], - "commit": "f629aa45bbfbbde99390e7d4791f14b649d79f35", - "sha256": "070nbk9a68ww1mrb4xpda59s3wlcxvz0x2krc0f1g546vj3drakx" + "commit": "5824a3c33ee51acc1d3cba36ef6892ebb3a8df1c", + "sha256": "0svjaid3x3l7c59g7ckpgsnmgh7j118rakmfs0qhjh5xla60bglm" } }, { @@ -101513,11 +101586,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20211007, - 307 + 20220211, + 548 ], - "commit": "03bc1255dfaa87fb6cb62a850877445bd7a14455", - "sha256": "0xyyc89205qc3i9q96jp1in3y3ravcfia9pc5s2smam01kqvipld" + "commit": "0365544483f957db79b8e617fb0bd8160134a655", + "sha256": "0c52dfy1jqmbkl8ml06xif166kxbyy9q8z33cpvkljh36ia23y1z" } }, { @@ -101528,11 +101601,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220204, - 53 + 20220207, + 54 ], - "commit": "38cfd66c3044f26cd1c7d6e599bc73f9b9fc0760", - "sha256": "1s5hi5kgq6m2ms9k2f0an3h0mf1lm9s5yriprkp7kmr4d4rk3c6s" + "commit": "cc331a92f5e81613796110a529b3f9fb511dda87", + "sha256": "1z4nyax8glnvax7fj05p2mgwy9g1gbs4n0lqghc4a6ih0cm314nk" } }, { @@ -101659,11 +101732,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20220119, - 2344 + 20220213, + 1215 ], - "commit": "50be652a6ec8590c3098f46094a92213623349c1", - "sha256": "0n7qwnirvkh2aprb7l1wj9rywdsn33a7s32716m3afcvy7z9pyh4" + "commit": "8185467b24f05bceb428a0e9909651ec083cc54e", + "sha256": "0ka7i2jl9vbr5071pbb3n8ckc9nqgpxrbfgij7wn33g01dpn2zjn" } }, { @@ -101748,17 +101821,17 @@ }, { "ename": "spice-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg", - "fetcher": "github", - "repo": "stardiviner/spice-mode", + "commit": "ae5f7b427e85726e4b4f2030a713c88d2e559f4a", + "sha256": "0qv691x5fcmb9xcx3pd0jqhl918qim0h9fg4r2mscccqnricshj4", + "fetcher": "git", + "url": "https://repo.or.cz/spice-mode.git", "unstable": { "version": [ - 20190608, - 1033 + 20220210, + 1414 ], - "commit": "e5e0644f03f9696f56dd69e2b6979da7f30ed600", - "sha256": "01905cdplj9icbxzr7sqb62x5qchzgvs8qjf5s4qga4x3vjh1dc4" + "commit": "f55c2b6dd35caace0ec7250b5c7b5d119235a23d", + "sha256": "1jkqwclk65rcyv5qj2vq7qpiimlrqij7c7fbjvxv4pf4zd2wx0k8" } }, { @@ -102619,14 +102692,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20210404, - 1658 + 20220208, + 2122 ], "deps": [ "cl-lib" ], - "commit": "2b24198844e7296c68f870490fabe896ed101baa", - "sha256": "0vcqpsz843djc2blkbjwqhr8km8chckfl8fgr78ii5zg9wdlvbrp" + "commit": "08e7b3474bb065d128734b90cd8c6c9aa3b6aece", + "sha256": "1x1jdg6k75d3r26cikf7vfzh69sam39vlwcx4srqr5czl15c5ins" } }, { @@ -102720,11 +102793,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210920, - 1345 + 20220210, + 1829 ], - "commit": "caf1c099ee5da59c6686af99c36eb846ebb7a610", - "sha256": "112l5g5s71r8krbcx03xgm18v5lm3r4dz10a3qss27s2m6a1y8i5" + "commit": "ce7c9805c9030fe28c4f29720bfe413ee4674c2d", + "sha256": "0pspxxpydzb5yhw1lmw5y6lcgrxq9zdrp40ckgjwdq0x49j7166z" } }, { @@ -105060,28 +105133,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220206, - 849 + 20220216, + 1307 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "13077c5e5eaa5621fbb68838ca3c15238faf73e0", - "sha256": "0z5h4g2c5ldfdsxzsiyj1dfwrk684vwhb7vx25mjvv01591mgq5c" + "commit": "9b0525e5e83de3ce86666c3d147a30a6f10f01de", + "sha256": "0apbf523gcmg9qkldznfshas63fvjm172bh922faflqn8wp8jb4b" }, "stable": { "version": [ 0, 8, - 2 + 3 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "4c981d6d65d612948227bde6ae8b7d601e0a190f", - "sha256": "0f600wd1wz2mfk6cbaxpd6f1sdpbkq5n4d1km5nzgynbjpr2is91" + "commit": "ac3634e2e7efe9c29c4311196e0ed67085d58f11", + "sha256": "1ffy17i5fi1bw5r5m6x372c52hc1k83wxdxvi4z0hixyklj48nsv" } }, { @@ -105181,11 +105254,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220203, - 2002 + 20220213, + 1913 ], - "commit": "6ca08f66585dee09d1e48ee600cbaab579720488", - "sha256": "09l7scif2sc0m9ral5nzv4rf02pwsk7z5822y77klj36zsrxigdc" + "commit": "5242ebb37fbf14f60c8eecf4461091ee22389912", + "sha256": "1j6f9y50w4h7cn4bl3dabv8d1i94kc0cf0rla825lglai206cwrx" }, "stable": { "version": [ @@ -106204,18 +106277,18 @@ 20200212, 1903 ], - "commit": "2f2a408f31d3f3e87415865676479091fea1749c", - "sha256": "0mw3lhw0g7b5abaq57q97376bpn4n6q7pb9yazmr8csv6apjk0xd" + "commit": "82d2e5abebb400997a1587115275bc2f7211acec", + "sha256": "0d15fka004yqmcx6z4brzrr37iadnggg7f31cf0l4qaqnhi9zswf" }, "stable": { "version": [ 2022, - 1, - 31, + 2, + 14, 0 ], - "commit": "a0a3b22d57d9ec2ee61e37c882467f5580749b1f", - "sha256": "18gp39nfw9lzg7d399sr2llaf87yg8rwwf4palncz7spvl0ikyfr" + "commit": "e47a693bc7921bd20ee6cf425f6ecd4f834249a4", + "sha256": "04agrdspg4q19kddpynhnngz5qrkrh3kjaccx5whb36a6p5a0730" } }, { @@ -106271,8 +106344,8 @@ "deps": [ "haskell-mode" ], - "commit": "9f86bc9aa03251065de988e57ffd209665a3acff", - "sha256": "11q86l6c82isb07al8lif96a8xsfih4zjxnamx9f76xxq0hxskqb" + "commit": "12c40a5b6d9fafcd3b895d9b90de1ac97483cbbf", + "sha256": "1gvn70a9w9fbn5wr3dzlnsyhyyrq602k61g82irh5z4amarq1blh" }, "stable": { "version": [ @@ -106882,11 +106955,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220202, - 1805 + 20220215, + 1121 ], - "commit": "5df42d3f5569d9005f9180337aa88befaf77c491", - "sha256": "120lh5c01wbv92zljw8jhx16cdjp154bjas8k0bi461x1xa5mzl5" + "commit": "f78976e448853646e3b5e718783ddb8256bf341e", + "sha256": "06fc46gxsbc8wv3y68n4pxyz34cfln7b5pbrwih68qs4ybp51nn8" } }, { @@ -107343,11 +107416,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220130, - 1941 + 20220216, + 2303 ], - "commit": "440a341831398b825dc2288a10821cf7be1999ca", - "sha256": "0vaaxjkk6rllypfspvi2gb0kcfkgh3sipg6nmfwaz62y1kviwc1s" + "commit": "72b8c013936b8e8d891105144107781a43516735", + "sha256": "098j2yflc84xy0bfbxzdf5f413j6gy77ncvpn3j8xy9qi5frnn0i" }, "stable": { "version": [ @@ -107476,8 +107549,8 @@ 20200910, 1636 ], - "commit": "090677c53a2127d0960204b7b6d3e39f6bf2c7fd", - "sha256": "1b6g83gcjars06vcq7pbrwaw0cn7yqpny162iaf0rqaazr5wggx6" + "commit": "9d65b39ec3cee901566bead7a8f82941693c43b5", + "sha256": "1qmmryy2plw5qrrqh7y5q63sv93hbvffkl89sd0m1842xi2jzd2i" }, "stable": { "version": [ @@ -107587,8 +107660,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220129, - 448 + 20220211, + 1633 ], "deps": [ "dash", @@ -107598,8 +107671,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8", - "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y" + "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", + "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" } }, { @@ -107625,26 +107698,26 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20220129, - 1630 + 20220212, + 1632 ], "deps": [ "tsc" ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", + "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" }, "stable": { "version": [ 0, - 17, + 18, 0 ], "deps": [ "tsc" ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, { @@ -107686,26 +107759,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220129, - 1702 + 20220212, + 641 ], "deps": [ "tree-sitter" ], - "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc", - "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18" + "commit": "599570cd2a6d1b43a109634896b5c52121e155e3", + "sha256": "1sgpsjd3037pbvwk7lgw70gb4j0fyqikv4lwxwa6l5dwnqvqxgq6" }, "stable": { "version": [ 0, 11, - 0 + 3 ], "deps": [ "tree-sitter" ], - "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc", - "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18" + "commit": "599570cd2a6d1b43a109634896b5c52121e155e3", + "sha256": "1sgpsjd3037pbvwk7lgw70gb4j0fyqikv4lwxwa6l5dwnqvqxgq6" } }, { @@ -107752,8 +107825,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220129, - 1122 + 20220216, + 1950 ], "deps": [ "ace-window", @@ -107765,8 +107838,8 @@ "pfuture", "s" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107803,8 +107876,8 @@ "all-the-icons", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107835,8 +107908,8 @@ "evil", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107866,8 +107939,8 @@ "deps": [ "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107898,8 +107971,8 @@ "pfuture", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107924,16 +107997,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220209, + 2117 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107958,16 +108031,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220209, + 2117 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -107999,8 +108072,8 @@ "projectile", "treemacs" ], - "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314", - "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar" + "commit": "2b19baaf2a69897dc274bceff56070372033de09", + "sha256": "0vzg0hz78jr2l9sjn3x8ws6wzypxapf1dgdhx2sdrqil61k3cs24" }, "stable": { "version": [ @@ -108256,20 +108329,20 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20220129, - 1630 + 20220212, + 1632 ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", + "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" }, "stable": { "version": [ 0, - 17, + 18, 0 ], - "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256", - "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66" + "commit": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, { @@ -108554,6 +108627,24 @@ } }, { + "ename": "twitch-api", + "commit": "d68bb5cb21fdc7d91ba5548354a8214a6b603b3d", + "sha256": "1zsqm8nwjfsdbwkylxf2dc26zh4dy4ni6yv48yvk20nvcsi8sz80", + "fetcher": "github", + "repo": "BenediktBroich/twitch-api", + "unstable": { + "version": [ + 20220207, + 813 + ], + "deps": [ + "dash" + ], + "commit": "e48b0b350516e20eaf85514e8855c2fbfbf09c11", + "sha256": "1pfrqa7lc85b9ww54w15liwi0swj3h9vx41fcmv7w0b31fijmzjd" + } + }, + { "ename": "twittering-mode", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1", @@ -109025,8 +109116,8 @@ 20200719, 618 ], - "commit": "70b287aad04d97ec902ea2aa71cf9ff4b7d701ec", - "sha256": "0api91jqkafqglq6f1fqb0lac81dq7xr2czdwrb4m0lgkxv325sj" + "commit": "ad3913d41471852a56ee9c46cf76198de9b020e7", + "sha256": "0nzgrad4h2v9a5c7qq2mhj9q9yk0kags921pwlwn86ywq338mfkc" }, "stable": { "version": [ @@ -109069,11 +109160,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20211030, - 612 + 20220211, + 548 ], - "commit": "ab8bc10e424bccc847800c31ab41888db789d55d", - "sha256": "1vdaysc328gwqi57fp4cfbl96g76m8wc2qr53wgb3l89m9kx5sgg" + "commit": "e81c8da4416b15cac9d5ac7574e11471417a65ca", + "sha256": "1f25h3rx09ci56gkpypsscp8bkqmj7fr2yfniki0y92czix9x70s" } }, { @@ -109084,11 +109175,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20220117, - 2256 + 20220211, + 548 ], - "commit": "edf050d6133478d04fc06cc65914517b18d6bcc6", - "sha256": "1sbd5fmpc3kcw9w566aqx7css2bjbca503j9y8aj6h08hpais561" + "commit": "d4f078abcbeea614ac2b32808c9cadf460a61e2e", + "sha256": "02b95pasbgr82g2ii225ixfd39w2y7jncxwmvm7ix2pw77g9mc7v" } }, { @@ -109990,11 +110081,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211008, - 454 + 20220211, + 548 ], - "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", - "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" + "commit": "0e36664ffe9f278bb008107d1b743edfcfba60f1", + "sha256": "1ninhp8z9lr705k8a5pd8cvm3nwrml9wp2hvrv3lilmdr9879h0y" } }, { @@ -110011,8 +110102,8 @@ "deps": [ "tuareg" ], - "commit": "676e2cd6545fd327e02330d1ccb20c02d6b26eab", - "sha256": "1mdpqc1b67p5rm2jsbwy0gjjgdlfqcakjyh1cwdj959ykz4zy9ld" + "commit": "d5dbad6b807f09731d87344ea778b29c432b76e2", + "sha256": "0lndsas27h9mmrjv1g2r5jhwjip1si6xrinp58w04kvzcvgypp2w" }, "stable": { "version": [ @@ -110703,11 +110794,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20211103, - 1927 + 20220214, + 943 ], - "commit": "6250360b3b06f590dd37885f3c33a451a3eab5d3", - "sha256": "07xdl2ng435iy9zqrq1wgrmwygarc91kqmz6ck1ngvn4mh86ndxk" + "commit": "f6fd85d913c39603695e52d258d02e6030e3d42d", + "sha256": "032s7i4gg7cc35cqa816sji8bhww2wzlihizvvbbzplsz435mdbs" }, "stable": { "version": [ @@ -111419,11 +111510,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220201, - 1229 + 20220214, + 1401 ], - "commit": "e292c57d53823038733105d22f576a83b5dfdaae", - "sha256": "0687q8m5a3rqwdjgr898gz4nckyi5awksz5z6m6qhga3zmhcmqkw" + "commit": "899a46132c47b37e262e66ebef3bf7f89f9b161a", + "sha256": "0i0wbs9w3rlfqal3pwbvjqqd85yw5m3whmycgk4d1md5hcw8pdym" }, "stable": { "version": [ @@ -111442,11 +111533,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220201, - 1228 + 20220214, + 1401 ], - "commit": "b99fdcfdb5259b2d831302f38288bdbb3a21ed19", - "sha256": "09nbdyw4kjbfpyswjwn0rdffpcmcnl5y32vrncaxwx44rsg3y1cr" + "commit": "aaed826c9c7e34cd86f173fd30a9a677addf0bd5", + "sha256": "1hbxpjvbcksp5c5y4yz1lvyzwjq66ji6v61p7rv9jpm45bv6r09g" }, "stable": { "version": [ @@ -111480,11 +111571,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210925, - 1940 + 20220217, + 350 ], - "commit": "2b86fe42b85b602ba97ea7f757676d623cfbb8d0", - "sha256": "0dgg8qmpfwb2z7yzvl5hj298lx1dk056wdbyr74vvwgn450x77sd" + "commit": "612646c3e707f9665bdbd034a6c2e17cb2645c3a", + "sha256": "0m6vwvrsl4dnw42pd3fi2s513jjlq8km7gzks8c6jch7lydwxabk" }, "stable": { "version": [ @@ -111625,8 +111716,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20211116, - 1109 + 20220214, + 647 ], "deps": [ "bind-key", @@ -111635,8 +111726,8 @@ "s", "versuri" ], - "commit": "ddfd4be99b46ddc042139028980ad8dd616b7d45", - "sha256": "10wjzx8vq8k16dwcjppnr28pkiilxl2ak78h60h68flakmdzibmg" + "commit": "0b46ce53aaf1b7d96ec2d9cedbd5e143bc27fec3", + "sha256": "0y10y5r0aa84w1z2aj16w4pxfsvda6a84hkyhc6xjng5sg3j3flh" }, "stable": { "version": [ @@ -111670,8 +111761,8 @@ "org-roam", "s" ], - "commit": "38efd2e08345d02f64b768629e26fa4e4e7beb85", - "sha256": "1n1fhy9456d10isddfp29dqnjccs6hs4ymdxcs05c55sw2vgjc1l" + "commit": "266c491ee2d583648f391803a278e8c5befbd8bd", + "sha256": "1dw05c0kfrjv09lqdkwg8i6hkxd3g2zaclixfhfzgs2976a9r23k" }, "stable": { "version": [ @@ -111867,11 +111958,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20211217, - 1406 + 20220211, + 1304 ], - "commit": "cb65d5e32fae0da77118db492cd40b58585d5cf2", - "sha256": "0ai5kw8v3778h5ry9191xb7bcmqp3j92h800223aiclh3hrfdc3b" + "commit": "ed86134f91c532a38d2739dd15ea6cec879cbd8a", + "sha256": "1p23jr4h6hhalvsi3mk3kcf6dbph6di2h3h92ym86fxry4jjxlzh" } }, { @@ -112783,20 +112874,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220102, - 1433 + 20220214, + 1818 ], - "commit": "9f64733e4ac563c0cda3685acf4e1c2cf600319b", - "sha256": "086jcw31jl3cb6ahgrgf40s7ydp7gv58pah2ai12j7j3g6vvdjnj" + "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", + "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" }, "stable": { "version": [ 3, - 5, - 4 + 6, + 0 ], - "commit": "1bb1f723dab2fc8b88b7f7273d0a7fa11134b936", - "sha256": "0wz3bb7vzxqi3wqpn46z6ps00m9wjcpv9cfvqi7lyvm920sxzlv7" + "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", + "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" } }, { @@ -113470,11 +113561,11 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20220204, - 436 + 20220208, + 636 ], - "commit": "08b3d086d1f1ac77a7d14f763063e75c29e600c8", - "sha256": "08zh4fdmdpi3wd2ysfv3awbq9lfvscanz3478k4fliw6igidk3qa" + "commit": "d266109b95e73281ae3aa1ed9a023346b6d39d28", + "sha256": "0fr3p6cfqxxj01bix9aiglfb2ls2grr62l735wdkn2r7lfvf5hjx" } }, { @@ -113515,20 +113606,20 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220130, - 1942 + 20220211, + 2034 ], - "commit": "edf4445edb613c8355c45209264f691268116f0f", - "sha256": "1rrzn34cqi2vf5vp4ip15qcprbm9y7jw9kh2yxkw82mxm8gh7m3h" + "commit": "f514f23258af67a10fc8e1c431bfe94702b6e65b", + "sha256": "095gmw87ch8mnwcldyab89a04wr5ahb2hgh0nd0gbhg7mkca17ph" }, "stable": { "version": [ 3, - 1, - 1 + 2, + 0 ], - "commit": "a4e720b12a0946a271a274bbe0b45ae07f83520b", - "sha256": "06a66119rp5vfqdzqk10df3qyh9jvjl6j3pqm03jy0b110v2bfa8" + "commit": "a762199d9bb8ee60311eaabf791b3dd64140effd", + "sha256": "1d98hagpm6h5vgx80qlh3zrfcb6z000rfc707w9zzmh634dkg3xx" } }, { @@ -113766,11 +113857,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220124, - 251 + 20220213, + 243 ], - "commit": "c2f0d61646d2744167661e5ce60fae679d50c850", - "sha256": "12b42qcmc8k15n2zdvl264sz9w697f6dm9vynyw7gk3g16rydbhj" + "commit": "cb0321c79abbcf31a61d9be02690b434ece55d4d", + "sha256": "09wamwxplj02xi603jkp246n0qynjaj83gvg7d3jn5z0fhgr6blp" } }, { @@ -114684,11 +114775,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20211006, - 2319 + 20220211, + 548 ], - "commit": "4ca1c15e9fe98fadfb13098dd0ee104d5ca6abf2", - "sha256": "0rawl98fsx1rrhq051d77wmz1xp82m9yr9rgb8k3p5g0yacyfkfv" + "commit": "f07722ac9c2952e86d9e84546c3c5eb1a768247e", + "sha256": "1wq815c2bs1fqjkl7kjpzmhdlw95dsayvcgclnkk1bb70xgzsivg" } }, { @@ -115241,11 +115332,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20220116, - 2241 + 20220212, + 1742 ], - "commit": "a5920d660f660ed05f4ca63bfd5e70f912baf9d2", - "sha256": "1dbqjxyxl5p7hg2z249nlw06cx2hn4sciv7fvxlnyhcdnhhv2bhd" + "commit": "289d547e66b7699ee11cc889d2df50ba863a9298", + "sha256": "1dn66733fcwsm9bnq26qsl2zca1r9naf02rg7lr97q7zycj6lfbv" }, "stable": { "version": [ @@ -116159,11 +116250,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220205, - 2000 + 20220214, + 1500 ], - "commit": "44b59d15e4ec491129104b6d1a1a0ed8bdff645f", - "sha256": "1fgcdip4jn8j5668ws0pxma8hibsnsamk1gq0fb4mcb24mczxvc3" + "commit": "624ca6665e469b790dd66f6b6f0a1af10c384e3f", + "sha256": "11jzgrj8z2ich8n7f2s7lqnqdclmprvwwlxpkadd31dl7njc8fb2" } }, { diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 38aea982633c1..c749000533e2d 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { description = "The Berkeley Vi Editor"; license = licenses.free; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin }; } diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 773b1f278e0fd..50366863d6730 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -25,6 +25,7 @@ in buildFHSUserEnv rec { # qsys requirements xorg.libXtst xorg.libXi + libudev0-shim ]; multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 4e4835783e46c..e5bdc28b80ef2 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5"; + sha256 = "sha256-CLQWbwwJnr6Al223GvV1hVNK13p2iAyjNF7PhdaU9N0="; }; # We have not packaged tests. @@ -36,8 +36,9 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; + changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej tstrobel ]; }; } diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 6b380e32bc690..894b7a43c013a 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo="; + hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY="; }; format = "other"; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 688b8d7f04db5..d381e89e75af6 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JmnJUpbOPAkURTgRDLuTf1Mqh+simog1BE6s5+mA20Q="; + sha256 = "sha256-5yh0+Z6SbHEFKvCJjQY9BS8vUihBspGhFjfhrUOfiIo="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index d5d52010e0501..b1ab8c57ee8b2 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0s45ydca4lmcyki58n4zmvdpn32x7z1q249i3qxcn2a5ay2mhhxc"; - x86_64-darwin = "1wab60dx5hfgmsw313qk8cbwvyq291d1q82hwll129dgcfhkrzrj"; - aarch64-linux = "1mkvca3hjcqf3k0v04lynmlm5j3lj86l5j15a505a3f8xp97yvdy"; - armv7l-linux = "1lcaq5k17km9p6xx26dpxgq5zrnjvh3yf8svz5nb5fa01v8fz4ds"; + x86_64-linux = "0ldfp4r7nb9npvjadgj63sd369nqmbgf5y4kpp93slsy1lbs0bk8"; + x86_64-darwin = "05z0jx2cc1askzzdxa8vxj8gp0v9rm1jw6005bpmijvyb8s2d30w"; + aarch64-linux = "1a5fyxzz51rb0af0wv3xh2h87yq00y5k501p7idqhj0zvd5mpqh6"; + armv7l-linux = "05byi0aba516whzry5qkxfkm82sy2dgv1m0hyycmnkb2dwmb552m"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.64.0"; + version = "1.64.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index b2539e7dac5d2..7e36aeccdec76 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.0.2"; + version = "3.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-VIudVgENibOz8RK0oK80U74wy592q3vKEnl3zuS7oSI="; + sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/emulators/ares/default.nix b/pkgs/applications/emulators/ares/default.nix index 33a7858455d67..33a7858455d67 100644 --- a/pkgs/misc/emulators/ares/default.nix +++ b/pkgs/applications/emulators/ares/default.nix diff --git a/pkgs/misc/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/ares/fix-ruby.patch index 01bd57ebaaddf..01bd57ebaaddf 100644 --- a/pkgs/misc/emulators/ares/fix-ruby.patch +++ b/pkgs/applications/emulators/ares/fix-ruby.patch diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/applications/emulators/atari++/default.nix index 5e35dcaebd0f1..5e35dcaebd0f1 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/applications/emulators/atari++/default.nix diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index 37e0d83f14060..37e0d83f14060 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix index 7a3f61fd8dc29..4f560e64a1ab9 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/applications/emulators/attract-mode/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "attract-mode"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "mickelson"; repo = "attract"; rev = "v${version}"; - sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii"; + sha256 = "sha256-gKxUU2y6Gtm5a/tXYw/fsaTBrriNh5vouPGICs3Ph3c="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix index 1f02219c8314e..1f02219c8314e 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/emulators/bochs/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes-hd/default.nix index 6494185958c29..6494185958c29 100644 --- a/pkgs/misc/emulators/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes-hd/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch index d38efbc99bce1..d38efbc99bce1 100644 --- a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch +++ b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch index 85adb33e3ab4f..85adb33e3ab4f 100644 --- a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch +++ b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/applications/emulators/caprice32/default.nix index 6c2932f7e10ba..6c2932f7e10ba 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/applications/emulators/caprice32/default.nix diff --git a/pkgs/misc/emulators/caprice32/string.patch b/pkgs/applications/emulators/caprice32/string.patch index fabbbd80d5d37..fabbbd80d5d37 100644 --- a/pkgs/misc/emulators/caprice32/string.patch +++ b/pkgs/applications/emulators/caprice32/string.patch diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 11f24d59e5c31..11f24d59e5c31 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 338c64a24b81a..338c64a24b81a 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix index 9464bde70bf71..9464bde70bf71 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/applications/emulators/cdemu/base.nix diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix index 06604e3eae997..06604e3eae997 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/applications/emulators/cdemu/client.nix diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 3df9e4ad5437f..3df9e4ad5437f 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index 15e595a617299..15e595a617299 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index 7016a42d247b5..7016a42d247b5 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index aeadcf5c1c1dc..aeadcf5c1c1dc 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix index ddf455473378b..ddf455473378b 100644 --- a/pkgs/misc/emulators/cen64/default.nix +++ b/pkgs/applications/emulators/cen64/default.nix diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 92d0f5b1d3648..92d0f5b1d3648 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix diff --git a/pkgs/misc/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix index 73442215ff1ea..73442215ff1ea 100644 --- a/pkgs/misc/emulators/commanderx16/emulator.nix +++ b/pkgs/applications/emulators/commanderx16/emulator.nix diff --git a/pkgs/misc/emulators/commanderx16/rom.nix b/pkgs/applications/emulators/commanderx16/rom.nix index 5da77ebceefe2..5da77ebceefe2 100644 --- a/pkgs/misc/emulators/commanderx16/rom.nix +++ b/pkgs/applications/emulators/commanderx16/rom.nix diff --git a/pkgs/misc/emulators/commanderx16/run.nix b/pkgs/applications/emulators/commanderx16/run.nix index 1f14fdb223c71..1f14fdb223c71 100644 --- a/pkgs/misc/emulators/commanderx16/run.nix +++ b/pkgs/applications/emulators/commanderx16/run.nix diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 3bc9e0b81cc05..3bc9e0b81cc05 100644 --- a/pkgs/misc/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/applications/emulators/darcnes/default.nix index 7919e0a9009c3..7919e0a9009c3 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/applications/emulators/darcnes/default.nix diff --git a/pkgs/misc/emulators/darcnes/label.patch b/pkgs/applications/emulators/darcnes/label.patch index 612aa1e3911e1..612aa1e3911e1 100644 --- a/pkgs/misc/emulators/darcnes/label.patch +++ b/pkgs/applications/emulators/darcnes/label.patch diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 49cb2498e64fa..49cb2498e64fa 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix index e56ca12a4e96e..e56ca12a4e96e 100644 --- a/pkgs/misc/emulators/dgen-sdl/default.nix +++ b/pkgs/applications/emulators/dgen-sdl/default.nix diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/applications/emulators/dlx/default.nix index 9573dd6d48dc3..9573dd6d48dc3 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/applications/emulators/dlx/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index c2d73d3e7fff3..c2d73d3e7fff3 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 56e107300b54f..56e107300b54f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix diff --git a/pkgs/misc/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 90510d645226f..90510d645226f 100644 --- a/pkgs/misc/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix diff --git a/pkgs/misc/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index 438849e7fd8a3..438849e7fd8a3 100644 --- a/pkgs/misc/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 383e943ff2466..383e943ff2466 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 8e4d909a724ac..8e4d909a724ac 100644 --- a/pkgs/misc/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix index 7f3320101530c..26ff779ba05ac 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libelf +, libpcap +}: stdenv.mkDerivation rec { pname = "dynamips"; @@ -8,7 +14,7 @@ stdenv.mkDerivation rec { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; + hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8="; }; nativeBuildInputs = [ cmake ]; @@ -17,12 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; meta = with lib; { + inherit (src.meta) homepage; description = "A Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco routers. ''; - inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix index 7949a3f2b0518..7949a3f2b0518 100644 --- a/pkgs/misc/emulators/emu2/default.nix +++ b/pkgs/applications/emulators/emu2/default.nix diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix index 4cb5ca9ec2e68..4cb5ca9ec2e68 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/applications/emulators/emulationstation/default.nix diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix index f39c2ae74ac46..f39c2ae74ac46 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/applications/emulators/epsxe/default.nix diff --git a/pkgs/misc/emulators/fakenes/build.patch b/pkgs/applications/emulators/fakenes/build.patch index 90799d977a144..90799d977a144 100644 --- a/pkgs/misc/emulators/fakenes/build.patch +++ b/pkgs/applications/emulators/fakenes/build.patch diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/applications/emulators/fakenes/default.nix index 6bc4b1480ffc9..6bc4b1480ffc9 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/applications/emulators/fakenes/default.nix diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 9289fb081f010..9289fb081f010 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix index 8a759d005829b..8a759d005829b 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/applications/emulators/firebird-emu/default.nix diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix index 4bd67908a7875..4bd67908a7875 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/applications/emulators/fs-uae/default.nix diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index afe12aab0c830..afe12aab0c830 100644 --- a/pkgs/misc/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix index 35e28ba55f6ae..35e28ba55f6ae 100644 --- a/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/pkgs/applications/emulators/fuse-emulator/default.nix diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix index 0fbd12fc36511..0fbd12fc36511 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/applications/emulators/gens-gs/default.nix diff --git a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch index 3ed9cabc7ad26..3ed9cabc7ad26 100644 --- a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch +++ b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix index cacb521c2fbbf..cacb521c2fbbf 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/applications/emulators/gxemul/default.nix diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix index de98278b83251..de98278b83251 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/applications/emulators/hatari/default.nix diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/emulators/hercules/default.nix index f33055baacbcb..67506d36b63c1 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/emulators/hercules/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "hercules"; @@ -10,8 +13,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; + description = "IBM mainframe emulator"; + longDescription = '' + Hercules is an open source software implementation of the mainframe + System/370 and ESA/390 architectures, in addition to the latest 64-bit + z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and + Mac OS X. + ''; license = licenses.qpl; maintainers = [ maintainers.anna328p ]; }; diff --git a/pkgs/misc/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/higan/001-include-cmath.patch index 67644e656aa79..67644e656aa79 100644 --- a/pkgs/misc/emulators/higan/001-include-cmath.patch +++ b/pkgs/applications/emulators/higan/001-include-cmath.patch diff --git a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch index 0585c8a38c725..0585c8a38c725 100644 --- a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch +++ b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/applications/emulators/higan/default.nix index c5f38a040c1fc..c5f38a040c1fc 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/applications/emulators/higan/default.nix diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index e8feb1ea7ed50..e8feb1ea7ed50 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix index a17a0eadfd5b9..a17a0eadfd5b9 100644 --- a/pkgs/misc/emulators/lambda-delta/default.nix +++ b/pkgs/applications/emulators/lambda-delta/default.nix diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/applications/emulators/libdsk/default.nix index 247aef118e8e9..247aef118e8e9 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/applications/emulators/libdsk/default.nix diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix index e78b680d617a8..e78b680d617a8 100644 --- a/pkgs/misc/emulators/maiko/default.nix +++ b/pkgs/applications/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index e0915703003a4..e0915703003a4 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch index b85291f52f746..b85291f52f746 100644 --- a/pkgs/misc/emulators/mame/emuopts.patch +++ b/pkgs/applications/emulators/mame/emuopts.patch diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix index f76ddb78bd56f..235386cba2587 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/applications/emulators/mednafen/default.nix @@ -1,28 +1,46 @@ -{ lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }: +{ lib +, stdenv +, fetchurl +, SDL2 +, SDL2_net +, alsa-lib +, flac +, freeglut +, libGL +, libGLU +, libX11 +, libcdio +, libjack2 +, libsamplerate +, libsndfile +, pkg-config +, zlib +}: stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.26.1"; + version = "1.29.0"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"; + hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + SDL2 + SDL2_net + alsa-lib + flac freeglut - libGLU libGL + libGL + libGLU + libX11 libcdio libjack2 - alsa-lib libsamplerate libsndfile - libX11 - SDL2 - SDL2_net zlib ]; @@ -34,6 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://mednafen.github.io/"; description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; longDescription = '' Mednafen is a portable, utilizing OpenGL and SDL, @@ -66,8 +85,7 @@ stdenv.mkDerivation rec { - Sega Saturn (experimental, x86_64 only) - Sony PlayStation ''; - homepage = "https://mednafen.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix index 24c13bf0228ce..24c13bf0228ce 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/applications/emulators/mednafen/server.nix diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix index 4874d5efee7ae..4874d5efee7ae 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/applications/emulators/mednaffe/default.nix diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 3e30be8c2a3ff..3e30be8c2a3ff 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index d8defe6f2e966..d8defe6f2e966 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix index f5d17d9d3951e..f5d17d9d3951e 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/applications/emulators/mupen64plus/default.nix diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/applications/emulators/nestopia/build-fix.patch index a7d82ead15cad..a7d82ead15cad 100644 --- a/pkgs/misc/emulators/nestopia/build-fix.patch +++ b/pkgs/applications/emulators/nestopia/build-fix.patch diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix index fa55c2e9635df..fa55c2e9635df 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/applications/emulators/nestopia/default.nix diff --git a/pkgs/misc/emulators/nestopia/gcc6.patch b/pkgs/applications/emulators/nestopia/gcc6.patch index 65dcc72c0c252..65dcc72c0c252 100644 --- a/pkgs/misc/emulators/nestopia/gcc6.patch +++ b/pkgs/applications/emulators/nestopia/gcc6.patch diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix index 0ed47af8f5bfd..0ed47af8f5bfd 100644 --- a/pkgs/misc/emulators/np2kai/default.nix +++ b/pkgs/applications/emulators/np2kai/default.nix diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/applications/emulators/oberon-risc-emu/default.nix index 749e3549bf80f..749e3549bf80f 100644 --- a/pkgs/misc/emulators/oberon-risc-emu/default.nix +++ b/pkgs/applications/emulators/oberon-risc-emu/default.nix diff --git a/pkgs/misc/emulators/openmsx/custom-nix.mk b/pkgs/applications/emulators/openmsx/custom-nix.mk index 9098762e40d5d..9098762e40d5d 100644 --- a/pkgs/misc/emulators/openmsx/custom-nix.mk +++ b/pkgs/applications/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index f054b954b59bd..f054b954b59bd 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix index 2e6aa683e4d3a..2e6aa683e4d3a 100644 --- a/pkgs/misc/emulators/pcem/default.nix +++ b/pkgs/applications/emulators/pcem/default.nix diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 2e22e7d9053a9..2e22e7d9053a9 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix diff --git a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch index 0edc6281a7efb..0edc6281a7efb 100644 --- a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch +++ b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index e3126efe82db7..e3126efe82db7 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch index 356868ce7a8b6..356868ce7a8b6 100644 --- a/pkgs/misc/emulators/pcsxr/uncompress2.patch +++ b/pkgs/applications/emulators/pcsxr/uncompress2.patch diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index b84d18a4e7a0c..b84d18a4e7a0c 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix index d10c43642325b..d10c43642325b 100644 --- a/pkgs/misc/emulators/proton-caller/default.nix +++ b/pkgs/applications/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index 9b147de4fa937..9b147de4fa937 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix diff --git a/pkgs/misc/emulators/py65/default.nix b/pkgs/applications/emulators/py65/default.nix index 66ba3cdf4b419..66ba3cdf4b419 100644 --- a/pkgs/misc/emulators/py65/default.nix +++ b/pkgs/applications/emulators/py65/default.nix diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/applications/emulators/qmc2/default.nix index 6c6a52fc65ca0..6c6a52fc65ca0 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/applications/emulators/qmc2/default.nix diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/applications/emulators/reicast/default.nix index f9e8e4d69376f..f9e8e4d69376f 100644 --- a/pkgs/misc/emulators/reicast/default.nix +++ b/pkgs/applications/emulators/reicast/default.nix diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix index 49d7721174f5f..49d7721174f5f 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/applications/emulators/resim/default.nix diff --git a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch index 75018dc8c4d1e..75018dc8c4d1e 100644 --- a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch +++ b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch diff --git a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch index 9aa8db6ab048b..9aa8db6ab048b 100644 --- a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch +++ b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e0045a3827d18..e0045a3827d18 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 2c49874e54468..2c49874e54468 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix diff --git a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch index 34fea554ef71e..34fea554ef71e 100644 --- a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch +++ b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch diff --git a/pkgs/misc/emulators/retroarch/fix-config.patch b/pkgs/applications/emulators/retroarch/fix-config.patch index 1a71bf43cb11f..1a71bf43cb11f 100644 --- a/pkgs/misc/emulators/retroarch/fix-config.patch +++ b/pkgs/applications/emulators/retroarch/fix-config.patch diff --git a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch index 203ce836533d5..203ce836533d5 100644 --- a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch +++ b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 1280f25047d89..1280f25047d89 100644 --- a/pkgs/misc/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix index 9d83c46396c37..9d83c46396c37 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py index 68f72103168e8..68f72103168e8 100755 --- a/pkgs/misc/emulators/retroarch/update.py +++ b/pkgs/applications/emulators/retroarch/update.py diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix index e667afdf079c4..b3797c9e9e368 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/applications/emulators/retroarch/wrapper.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation { preferLocalBuild = true; meta = with retroarch.meta; { - inherit changelog license homepage platforms maintainers; - description = description - + " (with cores: " + inherit changelog description homepage license maintainers platforms; + longDescription = + "RetroArch is the reference frontend for the libretro API. The following cores are included: " + lib.concatStringsSep ", " (map (x: "${x.name}") cores) - + ")"; + + "."; }; } diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/applications/emulators/retrofe/default.nix index dc1a23f33b398..dc1a23f33b398 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/applications/emulators/retrofe/default.nix diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/pkgs/applications/emulators/retrofe/include-paths.patch index 02eef2594ea63..02eef2594ea63 100644 --- a/pkgs/misc/emulators/retrofe/include-paths.patch +++ b/pkgs/applications/emulators/retrofe/include-paths.patch diff --git a/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch index dccf06fc07866..dccf06fc07866 100644 --- a/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch +++ b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 0ea56d3a72d32..0ea56d3a72d32 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/applications/emulators/rpcs3/update.sh index 0c8477c5282ba..0c8477c5282ba 100755 --- a/pkgs/misc/emulators/rpcs3/update.sh +++ b/pkgs/applications/emulators/rpcs3/update.sh diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 784ea69d3979e..784ea69d3979e 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 2f684257114aa..2f684257114aa 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 991d00a5a4b8e..991d00a5a4b8e 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/applications/emulators/ryujinx/log.patch index 57e96e5c25cb8..57e96e5c25cb8 100644 --- a/pkgs/misc/emulators/ryujinx/log.patch +++ b/pkgs/applications/emulators/ryujinx/log.patch diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 0861414f0bf4c..0861414f0bf4c 100755 --- a/pkgs/misc/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 6838a7baaf2a6..6838a7baaf2a6 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 1e939538cda34..1e939538cda34 100644 --- a/pkgs/misc/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix index d073098507ee2..d073098507ee2 100644 --- a/pkgs/misc/emulators/simplenes/default.nix +++ b/pkgs/applications/emulators/simplenes/default.nix diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix index 27f3400cc0b1c..27f3400cc0b1c 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/applications/emulators/snes9x-gtk/default.nix diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/applications/emulators/stella/default.nix index 212c06690468e..212c06690468e 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/applications/emulators/stella/default.nix diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/applications/emulators/termtekst/default.nix index 56f56cffad973..56f56cffad973 100644 --- a/pkgs/misc/emulators/termtekst/default.nix +++ b/pkgs/applications/emulators/termtekst/default.nix diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix index bde706e23040d..bde706e23040d 100644 --- a/pkgs/misc/emulators/tilem/default.nix +++ b/pkgs/applications/emulators/tilem/default.nix diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix index 60d69432cde67..a0cc6bd7929b6 100644 --- a/pkgs/applications/virtualization/tiny8086/default.nix +++ b/pkgs/applications/emulators/tiny8086/default.nix @@ -24,32 +24,33 @@ stdenv.mkDerivation rec { makeFlags = [ "8086tiny" ]; postBuild = lib.optionalString localBios '' - ( - cd bios_source - nasm -f bin bios.asm -o bios - ) + pushd bios_source + nasm -f bin bios.asm -o bios + popd ''; installPhase = '' - mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images + runHook preInstall + mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images install -m 755 8086tiny $out/bin install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm install -m 644 docs/8086tiny.css $out/share/doc/8086tiny install -m 644 docs/doc.html $out/share/doc/$name - for i in docs/images/\*.gif; do - install -m 644 $i $out/share/doc/8086tiny/images + for image in docs/images/\*.gif; do + install -m 644 $image $out/share/doc/8086tiny/images done - ${if localBios then - "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios" - else - "install -m 644 bios $out/share/8086tiny/8086tiny-bios"} + install -m 644 ${lib.optionalString localBios "bios_source/"}bios \ + $out/share/8086tiny/8086tiny-bios + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/adriancable/8086tiny"; description = "An open-source small 8086 emulator"; longDescription = '' 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = "https://github.com/adriancable/8086tiny"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix new file mode 100644 index 0000000000000..c32fd24fe4770 --- /dev/null +++ b/pkgs/applications/emulators/tinyemu/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, SDL +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "tinyemu"; + version = "2019-12-21"; + + src = fetchurl { + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; + hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; + }; + + buildInputs = [ + SDL + curl + openssl + ]; + + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + homepage = "https://bellard.org/tinyemu/"; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = '' + TinyEMU is a system emulator for the RISC-V and x86 architectures. Its + purpose is to be small and simple while being complete. + ''; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ jhhuh AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index 64f311c4a8a62..64f311c4a8a62 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/applications/emulators/uxn/default.nix index 0b797e2e160b7..0b797e2e160b7 100644 --- a/pkgs/misc/emulators/uxn/default.nix +++ b/pkgs/applications/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index bb5e7cea4e009..bb5e7cea4e009 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix index ca0de2f827663..ca0de2f827663 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/applications/emulators/vice/default.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 480fc009504e9..f13e224627a9a 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, pkgArches, callPackage, +{ stdenv, lib, pkgArches, callPackage, makeSetupHook, name, version, src, mingwGccs, monos, geckos, platforms, bison, flex, fontforge, makeWrapper, pkg-config, autoconf, hexdump, perl, nixosTests, supportFlags, patches, vkd3dArches, + moltenvk, buildScript ? null, configureFlags ? [] }: @@ -15,9 +16,31 @@ let prevName = name; prevPlatforms = platforms; prevConfigFlags = configureFlags; + setupHookDarwin = makeSetupHook { + name = "darwin-mingw-hook"; + substitutions = { + darwinSuffixSalt = stdenv.cc.suffixSalt; + mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs; + }; + } ./setup-hook-darwin.sh; in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; +}) // (lib.optionalAttrs stdenv.isDarwin { + postConfigure = '' + # dynamic fallback, so this shouldn’t cause problems for older versions of macOS and will + # provide additional functionality on newer ones. This can be removed once the x86_64-darwin + # SDK is updated. + sed 's|/\* #undef HAVE_MTLDEVICE_REGISTRYID \*/|#define HAVE_MTLDEVICE_REGISTRYID 1|' \ + -i include/config.h + ''; + postBuild = '' + # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link + # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and + # rebuild it with empty NIX_LDFLAGS. + rm loader/wine64-preloader + make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" + ''; }) // rec { inherit src; @@ -38,11 +61,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { hexdump perl ] - ++ lib.optionals supportFlags.mingwSupport mingwGccs; + ++ lib.optionals supportFlags.mingwSupport (mingwGccs + ++ lib.optional stdenv.isDarwin setupHookDarwin); buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: - [ pkgs.freetype pkgs.perl ] + [ pkgs.freetype pkgs.perl pkgs.libunwind ] ++ lib.optional stdenv.isLinux pkgs.libcap + ++ lib.optional stdenv.isDarwin pkgs.libinotify-kqueue ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus @@ -56,14 +81,16 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional v4lSupport pkgs.libv4l ++ lib.optional saneSupport pkgs.sane-backends ++ lib.optional gphoto2Support pkgs.libgphoto2 + ++ lib.optional krb5Support pkgs.libkrb5 ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev - ++ lib.optional vulkanSupport pkgs.vulkan-loader + ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 + ++ lib.optional usbSupport pkgs.libusb1 ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav @@ -83,12 +110,17 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev ]))); - patches = [ ] ++ patches'; + patches = [ ] + # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available + # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + ++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch + ++ patches'; configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ]; + ++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ] + ++ lib.optionals (stdenv.isDarwin && !supportFlags.xineramaSupport) [ "--without-x" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh index 0dd3194dc536b..0dd3194dc536b 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/applications/emulators/wine/builder-wow.sh diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/applications/emulators/wine/cert-path.patch index f0727f422f8c8..f0727f422f8c8 100644 --- a/pkgs/misc/emulators/wine/cert-path.patch +++ b/pkgs/applications/emulators/wine/cert-path.patch diff --git a/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/pkgs/applications/emulators/wine/darwin-metal-compat.patch new file mode 100644 index 0000000000000..aeee7533bbd48 --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-metal-compat.patch @@ -0,0 +1,31 @@ +diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +index f64a6c0f6ad..6da0391e3fa 100644 +--- a/dlls/winemac.drv/cocoa_display.m ++++ b/dlls/winemac.drv/cocoa_display.m +@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; +- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, (uint64_t)[primary_device registryID])) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ +@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + + for (i = 0; i < devices.count; i++) + { +- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], (uint64_t)[devices[i] registryID])) + goto done; + + if (hide_integrated && devices[i].isLowPower) +@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) +- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); ++ ret = macdrv_get_gpu_info_from_registry_id(gpu, (uint64_t)[device registryID]); + + done: + [pool release]; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 191fd4b29800c..37953f73c5dcf 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -6,7 +6,7 @@ # }; # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; -{ lib, stdenv, callPackage, +{ lib, stdenv, callPackage, darwin, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", gettextSupport ? false, @@ -29,6 +29,7 @@ v4lSupport ? false, saneSupport ? false, gphoto2Support ? false, + krb5Support ? false, ldapSupport ? false, pulseaudioSupport ? false, udevSupport ? false, @@ -36,9 +37,11 @@ vulkanSupport ? false, sdlSupport ? false, vkd3dSupport ? false, + usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", - embedInstallers ? false # The Mono and Gecko MSI installers + embedInstallers ? false, # The Mono and Gecko MSI installers + moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily }: let wine-build = build: release: @@ -48,11 +51,12 @@ let wine-build = build: release: inherit cupsSupport gettextSupport dbusSupport openalSupport cairoSupport odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support ldapSupport fontconfigSupport + v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; + sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; }; + inherit moltenvk; }); in if wineRelease == "staging" then diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix index 0ee1b3973d86c..0ee1b3973d86c 100644 --- a/pkgs/misc/emulators/wine/fonts.nix +++ b/pkgs/applications/emulators/wine/fonts.nix diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index cb857daef0a6c..bf3f57aff0ff3 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -1,16 +1,16 @@ -{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, +{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, moltenvk, wineRelease ? "stable", supportFlags }: let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); - vkd3d = pkgs.callPackage ./vkd3d.nix {}; - vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix {}; + vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; }; + vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { name = "wine-${version}"; - inherit src version supportFlags patches; + inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; geckos = [ gecko32 ]; @@ -20,7 +20,7 @@ in with src; { }; wine64 = callPackage ./base.nix { name = "wine64-${version}"; - inherit src version supportFlags patches; + inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; @@ -31,7 +31,7 @@ in with src; { }; wineWow = callPackage ./base.nix { name = "wine-wow-${version}"; - inherit src version supportFlags patches; + inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; diff --git a/pkgs/applications/emulators/wine/setup-hook-darwin.sh b/pkgs/applications/emulators/wine/setup-hook-darwin.sh new file mode 100644 index 0000000000000..39eee193ded62 --- /dev/null +++ b/pkgs/applications/emulators/wine/setup-hook-darwin.sh @@ -0,0 +1,37 @@ + +fixupCFlagsForDarwin() { + # Because it’s getting called from a Darwin stdenv, MinGW will pick up on Darwin-specific + # flags, and the ./configure tests will fail to consider it a working cross-compiler. + # Strip them out, so Wine can use MinGW to build its DLLs instead of trying to use Clang. + # Ideally, it would be possible to build the DLLs on Windows (i.e., as part of `pkgsCross``), + # but that is not the case currently with Wine’s build system. + cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g' + + # libiconv and libintl aren’t needed by Wine, and having them causes linking to fail. + # The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the + # Apple SDK’s setup hook. Remove that because MingW will fail due to file not found. + ldFlagsFilter='s|-lintl||g;s|-liconv||g;s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g' + + # `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a + # tuple, that’s not considered a stable interface, so the Wine derivation will provide them: + # - for Darwin: The source is `stdenv.cc.suffixSalt`; and + # - for MinGW: The source is the `suffixSalt`` attribute of each of the `mingwGccs`. + export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-} + export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-} + for mingwSalt in @mingwGccsSuffixSalts@; do + echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for $mingwSalt + export NIX_CFLAGS_COMPILE_$mingwSalt+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")" + echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for $mingwSalt + export NIX_LDFLAGS_$mingwSalt+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")" + done + + # Make sure the global flags aren’t accidentally influencing the platform-specific flags. + export NIX_CFLAGS_COMPILE="" + export NIX_LDFLAGS="" +} + +# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`. +function runFixupCFlagsForDarwinLast() { + preConfigureHooks+=(fixupCFlagsForDarwin) +} +postUnpackHooks+=(runFixupCFlagsForDarwinLast) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index b98aceddbd4d2..b98aceddbd4d2 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index c6bdb40124579..c6bdb40124579 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/applications/emulators/wine/util.nix index cd5bd03130b60..cd5bd03130b60 100644 --- a/pkgs/misc/emulators/wine/util.nix +++ b/pkgs/applications/emulators/wine/util.nix diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix index 303d33df217df..ac7c399cd97b8 100644 --- a/pkgs/misc/emulators/wine/vkd3d.nix +++ b/pkgs/applications/emulators/wine/vkd3d.nix @@ -1,6 +1,5 @@ -{ lib, stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: +{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader }: -#TODO: MoltenVK #TODO: unstable stdenv.mkDerivation rec { @@ -12,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh"; }; - buildInputs = [ vulkan-headers spirv-headers vulkan-loader ]; + buildInputs = [ vulkan-headers spirv-headers ] + ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; homepage = "https://source.winehq.org/git/vkd3d.git"; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.marius851000 ]; }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix index 61ca6515c4486..61ca6515c4486 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/applications/emulators/wine/winetricks.nix diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix index 633d44bb5ae4a..633d44bb5ae4a 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/applications/emulators/xcpc/default.nix diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch index 43539ef4ca581..43539ef4ca581 100644 --- a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch +++ b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index 17b7b563c15f4..17b7b563c15f4 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch index bb0491b373f8a..bb0491b373f8a 100644 --- a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch +++ b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix index 5f4b7771fb5ff..5f4b7771fb5ff 100644 --- a/pkgs/misc/emulators/yapesdl/default.nix +++ b/pkgs/applications/emulators/yapesdl/default.nix diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/applications/emulators/yuzu/base.nix index aff09134fae9f..aff09134fae9f 100644 --- a/pkgs/misc/emulators/yuzu/base.nix +++ b/pkgs/applications/emulators/yuzu/base.nix diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index 9e45ba0cd2cb9..9e45ba0cd2cb9 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix diff --git a/pkgs/misc/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix index 4df6cfafbc013..4df6cfafbc013 100644 --- a/pkgs/misc/emulators/zesarux/default.nix +++ b/pkgs/applications/emulators/zesarux/default.nix diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index ba2f5d6bdc1c5..ba2f5d6bdc1c5 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 3dafe27416346..19a754d92eed7 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-24"; + version = "7.1.0-25"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-tTdtVUQDBfVS3Rze1KKKR4wL8t8+ka5Ku9qcl+DP6Eo="; + hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 74dc55fc5e137..0e61da0041b60 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,31 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, libX11, libXext, libXi +{ lib, stdenv, fetchFromGitLab +, desktop-file-utils, shared-mime-info +, libiconv +, libX11, libXcursor, libXext, libXi , freetype, fontconfig -, libpng, libjpeg +, libjpeg, libpng, libtiff, libwebp , zlib }: stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.6"; + version = "3.0.4"; - src = fetchFromGitHub { - owner = "Symbian9"; + src = fetchFromGitLab { + owner = "azelpg"; repo = pname; rev = "v${version}"; - sha256 = "0i5g67s4ysnvbaxmi7dhan0hfcfk8an14xykkafl47pqfx33npva"; + hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; }; + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-info + ]; + buildInputs = [ - libX11 libXext libXi + libX11 libXcursor libXext libXi freetype fontconfig - libpng libjpeg + libjpeg libpng libtiff libwebp zlib - ]; + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + enableParallelBuilding = true; meta = with lib; { description = "Full color painting software for illustration drawing"; - homepage = "https://osdn.net/projects/azpainter"; + homepage = "http://azsky2.html.xdomain.jp/soft/azpainter.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 7feeb08105d54..e950d5e36f5ca 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -56,12 +56,12 @@ }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "3.8.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f"; + sha256 = "1xmyn9haagizh8qqg91bm1lx3dq1v8failxj943mipnvaj80dvl1"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; @@ -119,15 +119,6 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; - patches = [ - (fetchpatch { - # This is merged in darktable master and will hopefully be in 3.8.1 - name = "cmake-fix.patch"; - url = "https://github.com/darktable-org/darktable/commit/58d247f7ebea76c55fa2525beb9f5ce092c6670d.patch"; - sha256 = "11fn6d2mwlapbf1zbyv6bhgv29kxcwrs7cnbway0rnl9nj8wimf2"; - }) - ]; - # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 899495db93176..9c75742d52ba3 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -3,8 +3,6 @@ , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: -with lib; - stdenv.mkDerivation rec { pname = "feh"; version = "3.8"; @@ -22,22 +20,24 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ optional stdenv.isDarwin "verscmp=0" - ++ optional enableAutoreload "inotify=1"; + ] ++ lib.optional stdenv.isDarwin "verscmp=0" + ++ lib.optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \ + wrapProgram "$out/bin/feh" --prefix PATH : "${lib.makeBinPath [ libjpeg jpegexiforient ]}" \ --add-flags '--theme=feh' ''; checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); doCheck = true; - meta = { + meta = with lib; { description = "A light-weight image viewer"; homepage = "https://feh.finalrewind.org/"; - license = licenses.mit; + # released under a variant of the MIT license + # https://spdx.org/licenses/MIT-feh.html + license = licenses.mit-feh; maintainers = with maintainers; [ viric willibutz globin ma27 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4ed4d257ba521..037cf7c8ed624 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch, bash, doxygen +, nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-0E1TeAhkiK+hFJ4oMoeZLvfRehTzdGF3AtEVwf/MaF8="; + sha256 = "sha256-Abr7trlms6bxOAqE6xNKRv51TBGNilNdBhUZUg7OTKY="; }; patches = [ @@ -47,6 +48,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Lightweight GTK based image viewer"; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index e9c624d3c9655..9d8ae0c8d35f9 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.4"; + version = "2.12.5"; src = fetchurl { - url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-UrBt0QkSk7IP4mZYFoxFNJQ1Qmcb53CemvlYfsxjZ/s="; + url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; + sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index be079b6bdb20d..413e16718216e 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -57,8 +57,7 @@ mkDerivation rec { "SPNAV_LIBPATH=${libspnav}/lib" ]; - # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory - enableParallelBuilding = false; # true by default due to qmake + enableParallelBuilding = true; postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 30731afebfe74..e44c49ac6bb8d 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8="; + sha256 = "sha256-nwERwdNQYY1Fd7llwZHrJBzWDJNdsySRQ3ZvXZjB7YY="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix new file mode 100644 index 0000000000000..624959ffa9ee0 --- /dev/null +++ b/pkgs/applications/graphics/rnote/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, gio-sharp +, glib +, gstreamer +, gtk4 +, libadwaita +, libxml2 +, meson +, ninja +, pkg-config +, poppler +, python3 +, rustPlatform +, shared-mime-info +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "rnote"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "flxzt"; + repo = "rnote"; + rev = "v${version}"; + sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM="; + }; + + nativeBuildInputs = [ + desktop-file-utils # For update-desktop-database + meson + ninja + pkg-config + python3 # For the postinstall script + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + shared-mime-info # For update-mime-database + wrapGAppsHook4 + ]; + + buildInputs = [ + gio-sharp + glib + gstreamer + gtk4 + libadwaita + libxml2 + poppler + ]; + + postPatch = '' + pushd build-aux + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + popd + ''; + + meta = with lib; { + homepage = "https://github.com/flxzt/rnote"; + description = "Simple drawing application to create handwritten notes"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda yrd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 73c5a038aab6b..68744831538c4 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,27 +1,77 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, at-spi2-core +, cairo +, dbus +, freetype +, fontconfig +, glew +, gtkmm3 +, json_c +, libdatrie +, libepoxy +, libGLU +, libpng +, libselinux +, libsepol +, libthai +, libxkbcommon +, pangomm +, pcre +, util-linuxMinimal # provides libmount +, xorg +, zlib }: + stdenv.mkDerivation rec { pname = "solvespace"; - version = "v3.0"; + version = "3.0"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; + rev = "v${version}"; + hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; fetchSubmodules = true; }; nativeBuildInputs = [ - pkg-config cmake wrapGAppsHook + cmake + pkg-config + wrapGAppsHook ]; + buildInputs = [ - zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew libGLU - xorg.libpthreadstubs xorg.libXdmcp pcre + at-spi2-core + cairo + dbus + freetype + fontconfig + glew + gtkmm3 + json_c + libdatrie + libepoxy + libGLU + libpng + libselinux + libsepol + libthai + libxkbcommon + pangomm + pcre + util-linuxMinimal + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXtst + zlib ]; - preConfigure = '' + postPatch = '' patch CMakeLists.txt <<EOF @@ -20,9 +20,9 @@ # NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds @@ -35,16 +85,14 @@ stdenv.mkDerivation rec { EOF ''; - postInstall = '' - substituteInPlace $out/share/applications/solvespace.desktop \ - --replace /usr/bin/ $out/bin/ - ''; + cmakeFlags = [ "-DENABLE_OPENMP=ON" ]; meta = with lib; { description = "A parametric 3d CAD program"; license = licenses.gpl3Plus; maintainers = [ maintainers.edef ]; platforms = platforms.linux; - homepage = "http://solvespace.com"; + homepage = "https://solvespace.com"; + changelog = "https://github.com/solvespace/solvespace/raw/v${version}/CHANGELOG.md"; }; } diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix index 20e01a1701dad..ac73412117cf8 100644 --- a/pkgs/applications/graphics/xrgears/default.nix +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -9,18 +9,22 @@ , vulkan-headers , vulkan-loader , xxd +, SDL2 +, makeWrapper +, libGL +, glib }: stdenv.mkDerivation rec { pname = "xrgears"; - version = "unstable-2020-04-15"; + version = "unstable-2021-06-19"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "demos/xrgears"; - rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154"; - sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i"; + rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461"; + sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc="; }; nativeBuildInputs = [ @@ -29,6 +33,7 @@ stdenv.mkDerivation rec { ninja pkg-config xxd + makeWrapper ]; buildInputs = [ @@ -36,8 +41,14 @@ stdenv.mkDerivation rec { openxr-loader vulkan-headers vulkan-loader + glib ]; + fixupPhase = '' + wrapProgram $out/bin/xrgears \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]} + ''; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; description = "An OpenXR example using Vulkan for rendering"; diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 9998b2b559505..e80bb82ccec17 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.23.0"; + version = "0.23.5"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-53DyT8tunk0s1VGrlj6qQLOKNPN4Haqdyd8ozPi5z8w="; + sha256 = "sha256-kVM/F0LsIgMtur8jHZzUWkFIcfHe0i8y9Zxe3z5SkVM="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 60e4504cc5017..9f3c1c82b5e04 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Zh1rWMdRXPj/+80Sqvp9cbV5sDrNVBebPRGTTWM1DLk="; + sha256 = "sha256-Mms7Vibq1Rlb2XbxiV4o1UsjDRJcwG5ZZdPOWHjnW2A="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index c4c0132359425..0464ec5828d4b 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "5xRM3NQfomG0vJheNEBLy3OaS6UEwabNKYa96u2md6M="; + sha256 = "sha256-687/v3YvRXbop5EouXS5/aI5P+o0QgpWlUCVzDG8jzM="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 8f68a512c2113..9d64a31dded92 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-LWIcE86o+uU8G9DtumiH6iTqHhvq4y/QyQX7J3FhKEc="; + sha256 = "sha256-pYinePs7WFVfRMNYTY+Is8B+cv5w6IF7Ce+9v/mLRYg="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index f17730cc7e955..a3a8c1dcf6cf4 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -1,24 +1,16 @@ -{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: +{ mkDerivation, lib, fetchFromGitLab, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreaction"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc="; + sha256 = "sha256-XQ/GcSjGSe+3d0dJxjmmcBFoDzrmM6zsHMfbDdzmpPs="; }; - patches = [ - ## Fix Plugin Error: "The shared library was not found." "libbatery.so" - (fetchpatch { - url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch"; - sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f"; - }) - ]; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 56a05bc434ecf..7549ef20b112c 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corearchiver"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; + sha256 = "sha256-EUcUivUuuUApIC9daS6BFA1YoE4yO3Kc8jG0VIks/Y0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 3ec918db7af9f..a3314dface433 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corefm"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PczKIKY9uCD+cAzAC6Gkb+g+cn9KKCQYd3epoZK8bvA="; + sha256 = "sha256-uScM6cVRwYopZ6NY3PSAAyxNNyX3hVnFs6hkAyF29PA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 719047c8de7bb..f416f21c419a4 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coregarage"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s="; + sha256 = "sha256-Jq0lIXfw/1Ixd+QIY7D1ErBCOSKmwkWBupcDxUUEliM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index fb9bcd5e8ef4e..7da5ebe081fdd 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corehunt"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KnIqLI8MtLirFycW2YNHAjS7EDfU3dpqb6vVq9Tl6Ow="; + sha256 = "sha256-zhJadrdOXpl0bXxEPWjQ59Pzjg4MfIZXtYzCnJbh+pI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 224c946d1175f..6078d04be7a77 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreimage"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; + sha256 = "sha256-uG9/8sQK0G3f7O59OHEHqNHP8cUC73hmjsfpOnj0kFM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index d8df86abd8705..c5f7e49d45216 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreinfo"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0="; + sha256 = "sha256-KoX2U07giVF2xZR1diM6teiNfKYRiqjowTJgnsMlaN0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch new file mode 100644 index 0000000000000..084a650c610e2 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch @@ -0,0 +1,8 @@ +--- a/corekeyboard/CMakeLists.txt 2022-01-29 14:03:28.149607341 +0700 ++++ b/CMakeLists.txt 2022-01-29 14:04:00.178733700 +0700 +@@ -55,5 +55,4 @@ + + install( TARGETS corekeyboard DESTINATION bin ) + install( FILES org.cubocore.CoreKeyboard.desktop DESTINATION share/applications ) +-install( FILES org.cubocore.CoreKeyboard-Tray.desktop DESTINATION /etc/xdg/autostart ) + install( FILES org.cubocore.CoreKeyboard.svg DESTINATION share/icons/hicolor/scalable/apps/ ) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 3d4e6ddc30108..5116f80f4cb26 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,15 +2,20 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4="; + sha256 = "sha256-yJOcuE6HknDhXCr1qW/NJkerjvBABYntXos0owDDwcw="; }; + patches = [ + # Remove autostart + ./0001-fix-installPhase.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index fcd1bfa4a4ff6..bdded6e8f1fe3 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepad"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ="; + sha256 = "sha256-19qR08QhWeeXnJAQHe1SJjT0xnQLlbkXlzmd9uiMp14="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 6410da3ba607c..228b0175a7d28 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepaint"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg="; + sha256 = "sha256-uAFV3NKtgNri8GQLD+MRacl9WYMfkMVZcoVML+oSX78="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index bb93391c2af80..42f8fd0dd0fd8 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, qtwebengine, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corepdf"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM="; + sha256 = "sha256-VwJ3H/jNP3u5C+LATPUSftiWm89upx77fN3NqzTnU7Y="; }; nativeBuildInputs = [ @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase poppler + qtwebengine libcprime libcsys ]; diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index 80d3a096ffe66..7b5ba0ad7a606 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepins"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H/l/MHHrTmkfznVKUHFAhim8b/arT5SNK5fxTvjsTE4="; + sha256 = "sha256-CVToPF8/Tw+n31/A0bzyBbwF7xPBVirsqVOUsM8QtH0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index f92d532ba4a55..e13485619d9a9 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corerenamer"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OI7M7vV0CA42J5cWCqgGKEzUUHSgIJCWRTXmKRD6Jb0="; + sha256 = "sha256-WrMyz8Noq0EeBIxL4mSl6e+8wrivmwfoa1yKBrSgrRI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index bf9f5e49aea62..18d773e904bfb 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreshot"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; + sha256 = "sha256-wEpo/YINtKAYHqlGYytUPh9ndkvQBw3tRIlyjnKJaf8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index a6d71eaa6cb62..ac3f7280aa760 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestats"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WBetvbd8e4v+j6e2xbGtSLwNMdLlaahSIks6r889B4="; + sha256 = "sha256-154BZIKb6QDrTC4DXh4dbFtN/Lq0ok/qOrqTkXa+rAo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch new file mode 100644 index 0000000000000..d1db6a0a0a2e0 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch @@ -0,0 +1,11 @@ +--- a/corestuff/CMakeLists.txt 2022-01-29 14:09:02.699700817 +0700 ++++ b/CMakeLists.txt 2022-01-29 14:09:23.211754633 +0700 +@@ -120,8 +120,3 @@ + install( FILES org.cubocore.CoreStuff.desktop DESTINATION share/applications ) + install( FILES org.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ ) + install( FILES background/default.svg DESTINATION share/coreapps/background ) +- +-if ( DEFINED ADD_AUTOSTART ) +- message("INSTALLING TO AUTOSTART LOCATION") +- install( FILES org.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart ) +-endif() diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 57216f4710dad..04c6d82d4b27f 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -2,15 +2,20 @@ mkDerivation rec { pname = "corestuff"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/mmCIHZXn/Jpjr37neI6owWuU1VO6o7wmRj6ZH8tUbo="; + sha256 = "sha256-snzW6cqxIyiXJLOD5MoEqmzen1aZN4IALESaIWIOMro="; }; + patches = [ + # Remove autostart + ./0001-fix-installPhase.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index c2085686aab86..1203706a62e6b 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "coreterminal"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + sha256 = "sha256-0gxcbfDD43BnkxYWSdViK3hjzfgPGFruwzF4hCxFZ7c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index af33d474e3509..41fe2698e4eb9 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coretime"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b7oqHhsuHsy96IAXPUtw+WqneEHgn/nUDgHiJt2aXXM="; + sha256 = "sha256-MIcmgBfgyjEyJxXCq6IbQ/i6IdtL5cWVGpV2YZbzK58="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch index 8a8b0ae401091..3c0c942ee43a1 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch @@ -1,8 +1,8 @@ ---- a/corepkit/CMakeLists.txt -+++ b/corepkit/Cmakelists.txt +--- a/corepkit/CMakeLists.txt 2021-12-25 17:52:20.000000000 +0700 ++++ b/corepkit/CMakeLists.txt 2021-12-29 17:58:09.298024297 +0700 @@ -32,4 +32,4 @@ target_link_libraries( corepkit Qt5::Core ) install( TARGETS corepkit DESTINATION libexec/coreapps/ ) --install( FILES org.cubocore.coreapps.policy DESTINATION /usr/share/polkit-1/actions/ ) +-install( FILES org.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ ) +install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 154f4a389948a..b72008cd43ad4 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "coretoppings"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; + sha256 = "sha256-Yq57dY1zIuQN2Gj9haxJMomafL32B+/9v3lWlY9fvcc="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index 0a6ccaf721427..5e72458dad45e 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreuniverse"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YZCMyYMAvd/xQYNUnURIvmQwaM+X+Ql93OS4ZIyAZLY="; + sha256 = "sha256-KNjXrsm4OfBxida8mcAlKgomcpg0xJg51ZxEdhaiL84="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 00e297bf276a5..f100a3a104039 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libcprime"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + sha256 = "sha256-+z5dXKaV2anN6OLMycEz87kDqQScgHHEKwGhDAdHSd4="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index d1dde9942e92f..395a40ddfc664 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libcsys"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y="; + sha256 = "sha256-/iRFppe08+rMQNFjWSyxo3Noy0iNaelg0JAczg/BYBs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 42bc059986677..7c76b22dc99c3 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dmenu"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; + sha256 = "sha256-H01wnrujfrcybroOZl4PE75Pok7jXJWw15ww8Uo0j9U="; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 12a1b7f537d50..0685cb1349215 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "feedbackd"; # Not an actual upstream project release, # only a Debian package release that is tagged in the upstream repo - version = "0.0.0+git20210426"; + version = "0.0.0+git20211018"; outputs = [ "out" "dev" "devdoc" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn"; + hash = "sha256-jqKRHcxISK54xq/tQm6zV+J+U71eKh04OVTNHDDy65E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 802c1532979b6..02f0a09e0df1d 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.6"; + version = "0.3.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-GPECj0CVxKh+gTfAkkvs13tdiy93il97iqbSTxLQSiM="; + sha256 = "sha256-QTQiE/jnRSWPHbKMu2zMJ6YwCaXgAb95G74BzkNtTbc="; }; nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index ad568863d28cf..ac9b56f48c11a 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "10.3"; + version = "10.4"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-rKUj2XeVI2KdyCinwqipINg9OO0IhCSFBjSeYBSMLcQ="; + sha256 = "sha256-3AwUfx8IIWJO4uVAhXJE5Oola+60VUpXUwmALqJo2vw="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 69024e581e0a4..8c596b06fd0ff 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.5.1"; + version = "3.5.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-66krBK5mSMT0scCgMmiaigT/9nmYfItxe1OTzSbX+kE="; + sha256 = "sha256-PCr8lDQzypgozKCzD8FV4X4ls5lYZRMey1vfcFzo+Uc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gremlin-server/default.nix b/pkgs/applications/misc/gremlin-server/default.nix new file mode 100644 index 0000000000000..70068ec21f882 --- /dev/null +++ b/pkgs/applications/misc/gremlin-server/default.nix @@ -0,0 +1,33 @@ +{ fetchzip, lib, stdenv, makeWrapper, openjdk }: +stdenv.mkDerivation rec { + pname = "gremlin-server"; + version = "3.5.2"; + src = fetchzip { + url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-server-${version}-bin.zip"; + sha256 = "sha256-XFI2PQnvIPYjkJhm73TPSpMqH4+/Qv5RxS5iWkfuBg0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # Note you'll want to prefix any commands with LOG_DIR, PID_DIR, and RUN_DIR + # environment variables set to a writable director(y/ies). + + installPhase = '' + runHook preInstall + mkdir -p $out/opt + cp -r conf ext lib scripts $out/opt/ + install -D bin/gremlin-server.sh $out/opt/bin/gremlin-server + makeWrapper $out/opt/bin/gremlin-server $out/bin/gremlin-server \ + --prefix PATH ":" "${openjdk}/bin/" \ + --set CLASSPATH "$out/opt/lib/" + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://tinkerpop.apache.org/"; + description = "Server of the Apache TinkerPop graph computing framework"; + license = licenses.asl20; + maintainers = [ maintainers.jrpotter ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 741a17be9ee4e..0ce868ada6761 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.5.4"; + version = "0.5.9"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "PGrx2JBYmp5vQ8jLpOfiT1T1+SNeRt0W5oHUjHNKuBE="; + sha256 = "e47aaabcd940b54962625e224961e9b95b7f18b99724adbb6334cdc549617389"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index aae492c63cda1..7cfe873a44e6c 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,7 +1,10 @@ { lib , mkDerivation , fetchFromGitHub + , qmake +, qttools + , curl , ffmpeg , libmediainfo @@ -10,7 +13,6 @@ , qtdeclarative , qtmultimedia , qtsvg -, qttools , quazip }: @@ -28,7 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ]; + buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ]; qmakeFlags = [ "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" @@ -38,6 +40,11 @@ mkDerivation rec { substituteInPlace MediaElch.pro --replace "/usr" "$out" ''; + qtWrapperArgs = [ + # libmediainfo.so.0 is loaded dynamically + "--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib" + ]; + meta = with lib; { homepage = "https://mediaelch.de/mediaelch/"; description = "Media Manager for Kodi"; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 11f6e7bbc0482..7097f584f54a5 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -28,14 +28,14 @@ mkDerivation rec { preInstall = '' mkdir -p $udev/lib/udev/rules.d - sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | + sed -n '/^UDEV_RULE=="\$(cat <<-EOF$/,/^EOF$/p' ../data/moolticute.sh | sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules ''; meta = with lib; { description = "GUI app and daemon to work with Mooltipass device via USB"; longDescription = '' - To install udev rules, add `services.udev.packages == [ moolticute.udev ]` + To install udev rules, add `services.udev.packages = [ pkgs.moolticute.udev ]` into `nixos/configuration.nix`. ''; homepage = "https://github.com/mooltipass/moolticute"; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 184e09a275ff5..230ec3182b7a4 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-SumAHliY2cX2Q1umyw0ljCFmgnGKKHqoEFGglNJ/Bfg="; + sha256 = "sha256-ohfC10U7srs5IrFWPF5AKPwXPHaRxlYRK4ZZ0pE8tEs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix new file mode 100644 index 0000000000000..fb8d407ef12f9 --- /dev/null +++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix @@ -0,0 +1,42 @@ +{ + stdenv, lib, cmake, extra-cmake-modules, fetchFromGitHub, qtbase, kdeFrameworks +}: + +stdenv.mkDerivation rec { + pname = "plasma-theme-switcher"; + version = "0.1"; + dontWrapQtApps = true; + + src = fetchFromGitHub { + owner = "maldoinc"; + repo = "plasma-theme-switcher"; + rev = "v${version}"; + sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q="; + }; + + buildInputs = [ + qtbase + kdeFrameworks.plasma-framework + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp plasma-theme $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/maldoinc/plasma-theme-switcher/"; + description = "A KDE Plasma theme switcher"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ kevink ]; + }; +} diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 8ee84f2ca0d39..0a7b4bc7933c3 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "1.0.6"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xEbmCVZ28CHVvI6tGCQWzMFrmVyCQ2Xmzh2Lz3tGU14="; + sha256 = "sha256-eFO9v+CZ3sFJJ0Ksa2sV5snjBz9lUkElGSj4DfEUebs="; }; - cargoSha256 = "sha256-8g/dNCm5I5/qCAPOGQ9a453DND8LoeSpX9Nb8LwUme4="; + cargoSha256 = "sha256-cyuDXMmVrVx3kluumR6WleMzuoV+261f47rpkVYHzZA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 7b513a67e66d5..05223aeb5c128 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.6.6"; + version = "0.7.0"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "16hfp8dn270amrilvv3sjqhq2x295kw0cxszf63jh405z3ql834g"; + sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index a3aafaf4ef0cf..7617984ac910b 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PHKmrLN/JVPqefcK1FQByPWvMzNxHG5htXzgZ1D+Eds="; + sha256 = "sha256-Rs70LmJ/+pbISQpPuEYV2URFv7uf+jdTVQopUSKExSY="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 7ff59d9baa305..11face45145b6 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -3,29 +3,35 @@ , fetchFromGitHub , openssl , pkg-config +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-or8PDEj97ChZq6r3WlwETYbU6EvoEuh8HfTyBIbbO8M="; + sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60="; }; - cargoSha256 = "sha256-UpIPbY2beO1H0YR9kV1SkG6C3qcO4x2acfgqI3x5jiM="; + cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; homepage = "https://github.com/jameslittle230/stork"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ chuahou ]; + # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index e4b354845dded..d8708c5a3df13 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -1,19 +1,20 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, coreutils }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, installShellFiles, udev, coreutils }: rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.3.1-2"; + version = "0.4.1-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k="; + sha256 = "sha256-ZgtEmjk1HwoKkyuOiMWalK5RPb3ML8HM/wwz8OM9HoI="; }; - cargoSha256 = "sha256-NH33AMuwf4bOF9zZJlONVMYgrrYSBq5VQClYW/rbzsM="; + cargoSha256 = "sha256-CsPyY/NA2+Lecemuor2nHd6yzf2PvMK7NZyvY3vewpI="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ udev ]; postInstall = '' installShellCompletion \ diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index bb1b9213fde59..d478655eed1b3 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-yl4R/1flm2Lfvyh9PXlJcZ1VtnP8nBQC0i7zs4U+g7g="; + sha256 = "sha256-70fCyxiM4CiNuG4Lqr4Tq0FHak3wDcp8G93EKYj+0kc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 94af6d130b983..25f27bd5063a2 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.16.2-mo2"; + version = "6.16.4-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-o2TtkoKa4DQ6tM1GdKVEmkWoJvnvxQc514wwgsfTDnE="; + sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA="; }; meta = with lib; { diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 3b915cae5ffa6..88b5046d17973 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -27,7 +27,8 @@ let # Courtesy of sternenseemann and FRidh - mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + mesonFeatureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { pname = "yambar"; @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "yambar"; rev = version; - sha256 = "0d8n9hvmxj7759pfqssqcl9wvb986qsph8bnjsjm9bf97mflhy6d"; + hash = "sha256-zXhIXT3JrVSllnYheDU2KK3NE2VYa+xuKufIXjdMFjU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 012c18c19183b..7949676091529 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.1"; + version = "2.2.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-nO5omfUdWQcvWmYfoGBHRpGZ6ihEeB6hyvyWeWVizbY="; + sha256 = "sha256-gCnIEwnwlX7Wy9sjJVtKx8HhtPAoPMUOKvl71TQn6Ew="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 8bc0963338fb3..842cbe30309d2 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub , lib +, nixosTests }: buildGoModule rec { @@ -27,4 +28,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ratsclub ]; }; + + passthru.tests = { inherit (nixosTests) blocky; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 5cc9fb612a3e6..6fb29619ab9d9 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.35.101"; + version = "1.35.103"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "q5GL6R87b3iYLiM9oJQgCOVeXzyNFY6x8fQ9KsDN7gk="; + sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1da699bbe9879..d5af185348636 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { "version": "2021-12-07", @@ -12,16 +12,16 @@ } }, "chromedriver": { - "version": "98.0.4758.48", - "sha256_linux": "1nk3vki803b30mc7ww911l68jfxmpp6mddyq02a3f68893qa2mcf", - "sha256_darwin": "09m5vsqfn6qyn3faf2p0dldll6fracjg6z81xzpyp2bh9zp8vk82", - "sha256_darwin_aarch64": "04lnbm9wiaz8dlc4qigxakcwghhjc3wvahvl5j80k8agkbv7fdvi" + "version": "98.0.4758.102", + "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", + "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", + "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" } }, "beta": { - "version": "99.0.4844.27", - "sha256": "07srkycb92sajbxcjbwgjcj0xgb17k9i4b7cg50dvz3pwdvm7y8y", - "sha256bin64": "1a3a66kmcim3f8wvi19330m2iixxngsfiwv44g8zz51qk4rg4wx3", + "version": "99.0.4844.35", + "sha256": "085vsfp08y4vmv73z37ncynvax645qm302h883skx9xk4yyjkynj", + "sha256bin64": "18kys3f0zjkrp1x2vkcc9vx6vhj5yfrpb88lli7ql6q9b0ijjjn4", "deps": { "gn": { "version": "2022-01-10", @@ -32,9 +32,9 @@ } }, "dev": { - "version": "100.0.4878.0", - "sha256": "0ac8fdbh3f66wq3y1l4s1i906zriajff84hpx9df9cwavj6r9svr", - "sha256bin64": "1q37q02v6aaqkxwyavljga0h60cclklxj8adr1jc1fqs0irks8a8", + "version": "100.0.4892.0", + "sha256": "03f003prk0vqxac7l0sp3nfhh3adlrdx60dklm74v504ykdw84yn", + "sha256bin64": "00033b2iq3aw5pvgm5nbh99sz8mj98rj32h1m6iw2xxwqaij06qw", "deps": { "gn": { "version": "2022-01-21", @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "98.0.4758.80", - "sha256": "0wa1jhsw7qrym4x8wxmdvdvbilb8jdv0mizzib2342l61zi6cwn8", - "sha256bin64": "0p2bh45ffgfhyh18bxw8fz4691g25s44lxxj4igk8b0bn71v1pgi", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { "version": "2021-12-07", @@ -56,8 +56,8 @@ "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" }, "ungoogled-patches": { - "rev": "98.0.4758.80-1", - "sha256": "0a8y9yz6xyh025gk3dr0ndrdwmrslhd1ph2f8nivmqk61j7c2g8h" + "rev": "98.0.4758.102-1", + "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 5a38d9d8d7a09..7fa0ae18549f3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "98.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "780a8e746a4a638ab9cfb69b1dca27135cdf64809883551c0e79e0409487660a"; + sha256 = "d572a56bbdaf004ff33ca5ea1079680a2af9b5b8ba9ca3989b34ba6d5d34abbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "44b86759ab9a5bb675d9d05029cef6e0be17eecbe140ad1ce5d0fc554a8dcf36"; + sha256 = "ac544b28cf44236f1d1e46ee5e1b3484c97cf732bc857eeae3682b501ccd9867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e4d73a06f2a918395c0428c4190cc080dd03a29a74f1677f297b6bd65ad488b3"; + sha256 = "18eff485b959812f916f6925d4adf32a30e1fd3b82040db1ffb1c03aa9e76a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "256f2b6d21cccddcaed24b511f71ca4bafdfc08ce989ad1eef45ab9bc009611f"; + sha256 = "cb33eedbc186386dbe5bd96d294a202a3f4d43e72affcf62b2f5608580262902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bba26f8b77d27c03a969e08d8974ec9f7a85e0237ca3acacc884f945a9b18832"; + sha256 = "34461a0d3e89768cf951f7a1d12a61732a66b38cc7f4493b028b1c49f810e265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "da1c22e87189c991ce27929abe2172ccce6f4a25c44e836ee865550e259e6218"; + sha256 = "6a7084f81c269b572f4d8b19ac686a97187be217e1a8e1a6d993470f60374d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "183bce430aa7ed98b72eb4492c5a9cf76a2e9961069140f272e438a5d20debc3"; + sha256 = "85b951a4c3a9f73f74cf4374b142fe86306e26480461e665fee92d4d920fa716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "145c856566f9063ba861ade8220071623df793b279bf2a3821742f9e0023af74"; + sha256 = "03de393f231f1b54babb254a139e71a051861656f050f31605a8351f2a33507b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "dce9827d70a5a7d182316d7286bc6cb4b5442d65bb5c3573d04b235b4a18616a"; + sha256 = "ba3b9743502aeb38f510873854dd054ba21250394097f12b2f3ff8883c6c1e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0df80c30b78cde55015fab74763c7606f75eff72804166b5095eb321b51fa4da"; + sha256 = "56478d56ef1a6e4340262eff9f5f64925aa62bea4774e41cfe97069760dc3505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1df386c5001327bea3f5675acd52946dab3d0d8ff0bbcf65f8b291ac26a565d0"; + sha256 = "b76eb84e8c2282a7ca11cd3208aa4445b52ff24fd06e0f4a2445b326c71b42c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c271c6d047c4dee3ea806caec31e2719acaa55aaa608ad86283de45e22cd05f5"; + sha256 = "4f9325f1d1fbaa28a5be6599e2db4f55e69e5e10b0f11496e1c36e83c50ceced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "30a2deb4dd1bb82406731f71001950d01ffbb9aa7a24f333e8f322fb23032f6a"; + sha256 = "1f110c78565cace8c1def9c0343c0d4b2a0632d25a03fc0cda9462daa8292d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cbf31b80937ae4a425f4d5507a7f654958e7e93a6c12683c08982a3d14d2ba9a"; + sha256 = "843ef97f99c5d0396485e9821a0600a2f2a724ff76b147c7883c3b05c89c34ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "72c098b2512a40ce3437f7d329b46e648e4fd6e2d2b7ecdd1e3478b090cd50fc"; + sha256 = "52394ebc3694fefedf33a65626020bf78610bd8d8fd732605f254d0532f3e804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0c05717640e8ff2e0fb52a510dcf3a35db34b911cbc85d2721e7e7e6307f0083"; + sha256 = "5952065bc634b3a008798ac329172e68eafb9c18c84e99520465ffeadd36ebae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c29f815b19cc03e7d628fef8c86e4f06862e268b760e230cc7bdd04c2618a852"; + sha256 = "7346203ba006416b010c05ba217792caa53fe5472b1239450100d0d75b2be301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6968c6d591a3b43e169dca16628eb4675b8803b90aaa8f605ae35f2115a75d3e"; + sha256 = "272d56431cae04275648d25cb9b85c0d555cb839eed6bcd9bb8c088ba4983d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "47a8cac44c7d813f23ce263e698dad6dad44181c570055973879e57beeb82ee1"; + sha256 = "5ce9c6d56b286aacf049580ca971cc5737498f62b6a9c177aa7634bec8ad13e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "476fcbf047743ea61d6e68d37a1bf1203d239667faf98abf5192f15e1b13b927"; + sha256 = "2624a40add509da75dc22e8438147b7556fab463dd44793b918bd91826a5a3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26abc7c1e8aeef3e4898e1dcd120651dd30400a6da9a1c2af5ff02b1b406573d"; + sha256 = "bb91268d5bdd7ca82642363c33af05223375596c4b2d4cf51195d1478985ec5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "66b299656f71875f59287c8da5a3c2b0bca53fb69ca9b0f7a0402ad1eeb1aa87"; + sha256 = "5c9e84e4116e2d65f87a8959bf384b51e9e1edbaab165d506c9e8051813bc767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "37c37849f3d7125da14e3a71c8a9fa522b8756fea7e3e3f8a5792ef7c3285466"; + sha256 = "389b11d44e6b50684e309b89bbc7baca1e86a2be26c3809b490b77fc3ccdb48a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cd3ea6fbcbc947acbe1767be78a14fdce4c03b0b44d53e3670a0ffc5ba14dc68"; + sha256 = "fd1a3ec9000492ddd64eaa2fb60bcbbd2a7af8b4fccbe78690378eb9ac365c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f661d48a11f66fc326e86126aa5c0de37311042a454719cc609a1c7ff102e423"; + sha256 = "788018660eaf7b02a5e0279447e508863ebb75fed18299d4ae0279cb36f842a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "056f25729222d95316034f0365679ff449a58e4d77624687cf9417e10b52085f"; + sha256 = "3556d494d08f129aec339642a28dcae9f051cb0baef4344cf5bcec7326186f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "64da785531a3e2f4b8179f3e9b551723bcce4c1210e184a03c98ec3e2ff1e220"; + sha256 = "15a3d9d872d3e2e3ef2a795767b64a495f4b992aa72a80558d67b8f294d5b959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "34af4d1a91b7e09e80d2f89730851c508521d6518b0aa2d3ff1924a34f7efba6"; + sha256 = "9bcc96e62902977cb2f5f10fad4ada00c19a453d4c598787e92ce4e54e6adfdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a1b50e3ba15ae806ffd89ef22e12ee85ceda1eb17f458fb7e8abd6c4355a75d3"; + sha256 = "b0cbbc22406961bd076d0a8792e7a166280a52e29804129db8c39f5f24248fe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "90ec59ce7774bade28052f4f8b5861476e3fb52878e48c8909d250fb6b6e17ad"; + sha256 = "d82729e8551f3d4e9782d70c30e0aac3d1033acd57c0bb61c3073dfc7d1e8642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3f09ea9568982a451798dece61a8f19131c4c88e98e2c03b1808503051873e73"; + sha256 = "66de45bf96a23242566ef04ae6e402e08b35964e42c704e4f4350171f28e3b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a483b0aaf523fe404a6b3ec07611812a5160cf8a5c05b0fee1afa6838e1949a6"; + sha256 = "851ab51c00f3e59439dd7f482fa3361634600e5c2b63be5784472df912288b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "12e17583c8932cfa6622ff68490e29d9e09d6862e8443ee1cd1d72f21f6516a7"; + sha256 = "b1857154f9a49ac0acf8e99bf2491af4dd84cab2b1f1965acdd321311305c7a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac3809a3344ac239183a68551eebe5689c53c11c0a399ff4a94452a35ad86c81"; + sha256 = "59e4d31c6532096215b223f41a3a5e59c29db0e9007d8b26260997878223efe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9385c2bed2d3aa9b65651f396d9a2c6f8762dc4295319757f949fc9f04a6c717"; + sha256 = "56707c16711c7c90cadd66eaf3084498769827fdacf6fb73b4eca60185c1b2d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f65df6f4d93a39b5bbb1c4c7827eb094a632dff7255b78affc7cc9794a28d3fa"; + sha256 = "afd4b994549beb079ec0d04669824904d7f16e9ddd9cf323095ce32277d7865a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3cbbd914559e96205e665ad46cd9ba193428cd8d83df90c4fd4849cc11db13be"; + sha256 = "1e96751aeee49e229afc0715d2d1b93f216b159a716075b6481d59add59c8e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7b27f83190cdb84d2d9fca9bcb37bd1128086adfe772e676141fd9960c0de872"; + sha256 = "2950aed5bf345de03873a8a0ab35885aa766a88776213d5f58798235e8130094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0194000216bb517390d301166c37228e2128f3b15280cf21629fe13de5f536da"; + sha256 = "6f4afd656511c8cfbb933b8680ddee2bbf3ff584021193058e7eacabd152cf03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "24c92df984f7eff4f294e27324420b0350c4069acade0a304a3e433ea11fadd7"; + sha256 = "0b9cd7febe314aed67e85fba904b000dccd97d983e944a093699d80eb53134b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5a006adead9f8e647eaebbef8ca56a47116ad2fd1c308c4986aa81bf7618f815"; + sha256 = "6a122b779d99bc42ddbdd85e97649953185f472c97d352d4e0f0cf96198bcca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e8d87a8ad9033793e0c25c8954ddc4f405274468a572f46af494847481bedf11"; + sha256 = "551b20cc433c045a4e28628498548f6cc114998158386062be926238b674239d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47964a5caec7f8ef0546ecba49e0d995dc9f67947fbcaafaa02789bdaa75e6c2"; + sha256 = "15f1814fb99544f7b093ba6cf6de98be069696175d9ccd93db049b8e0a723a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "67f89985f60d21b04a9a20449d38d673c45e74e82a1d5762d82713c02d3e63b2"; + sha256 = "bc89304cd1f68d18de7d8711f334a14d972c35eb4a779e212ff470157b15525c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2716ce5bcfaac25456a144eeff6e6b173600d08016574812abbb315a4d001ca1"; + sha256 = "f7a85d9d1d529f245d456eab76ad26cecb6a1d58a5da15b5b6d20544af989772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c028cfa29f0ea60f284d749dc9818772c074efe3d295590a34a3d6a4548a8f7f"; + sha256 = "f5b6c4ea7c8817f9b8740aa0954c74c7cedf30e659bdeec4b9b468ac7430ae25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5bd24eff8a4d95f27ff8df44d014d007c943a54fd1b5689435a1ce14b7f61375"; + sha256 = "24d68a73da9e817f02233a4c39e1a6d56aa26d15b17a964de0d10cd65ff8f6aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0483ce90f8702febedb73674d3cc23348a4e7ef62445084430636f0c4c1fb287"; + sha256 = "86f7e09688943b242a83bda19b770f4720aa495c9f8503a79d22abb8a24793a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7b41cb2cd6ae22547d2c4d04dcadd5c4c05a4abf2b51d495baa749d4a2158b6"; + sha256 = "52cbbd83f54f4e93b08d874f7f68cdaa168bb663c10c4a3534918bfef4812793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f5a5a825787fef1f8c4f2a0f0c013e8d39bf1a08c4523d79069c5fb335c0e5a0"; + sha256 = "aeb7529d9a7dc88a23094589fd30c04f2d1366e5dae9a92bb16a7c9bbaf476ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64d8c649de837049c2f0f73736a74f141de5bf426e11d19f4e0a5553cba6412e"; + sha256 = "9cf3e5bf609bd86f7cea748df34279fb9f421e76a3e3935e33e5af1b3ba32f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "01ba137970e9b538bc09195dc3da66927b56fab6204bcab60a85e03055c80a0d"; + sha256 = "c6d6d9524aeafef73aed12d2757520903a53deff32ddf55873e038f1a1b3e37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3a6b4e12f88226b0f19dc066a0f11cadf5a47d87f38540cbcc9f34e82c54290e"; + sha256 = "c238bd3d49236ccc80d85b8ea9a5bfe95f7a93bdd9fc82f09dde2de314412027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ecb9e0e63eb778892ce15d5df03e50bca8948a6e8dc3369b030cb716b172789a"; + sha256 = "b34c10751ef34dbc41157711fc4f02c5c9d26104be971b1c9001704c2e695e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "31968f898a8916705c67e71bc5010cea11bb43e544f27febad644a624b32c773"; + sha256 = "859629828f358f3b7933f98292f3df0047fa012cfdbc4db652eea0fcebd944a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "105f4f83a1e0ed15e568a218d49fe5108462db67cda228e088cde3679dd48e04"; + sha256 = "ae70facbaecd4b11d8e39eb6b40615c63e37eb9020933b443326c3ec6849277a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "37932385223cebf7a3f59c362c2abfca321bfab0fd6e5e3da6daa0ec76257784"; + sha256 = "63b939612cb311aa31b9f2293e82cd0aafb1a857318db2f8cb022cd0d868324c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ae5c8fbc88f15edf60fa1830ca19d32ca3277194c0669717360659da5ad07b68"; + sha256 = "85c8edd159ad5b2843673a9beda883a349bebf1133ad64fef2685a61bbbb8d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "104cdce0099e51d71d3ae3b8fd4ec40a256d893450c8fc905035480be5d675d9"; + sha256 = "fa5d9116fbb25a8c1b816357de21aa8e376ee0983c12ae6c842c0a015071829e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d2e0055207f62681e4cc9c11ae1cd986179af1581af0252604762eed6637e726"; + sha256 = "e744ece030a07f84c9cbf8a952c5dc2ab8fc3cb3889405978f79665917ab62a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8b03198b1d6424a1cd024fe17ce62a99c8b1b8c41798b0e229f802752a3b4551"; + sha256 = "466d376a9f0caf60242aa0abb945b8899ac9d80080da3c4546c74d9e2e6c131c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5f5b132f3292cc0938e28f2c483a03b8ec76a95a306d3a928f2a2bde03f3af76"; + sha256 = "c3077f608d9a5f655b50a0a14c024f5f8bca2dd6ab75901915fc379ec5e31311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9ba3cbfd2061d15356ebee861bad6d78be0cb5f4ea0ad9a13170ecdad67981a7"; + sha256 = "de64870f7300f66ec653af11f4d38320c1b63f6ac2bcda3b7d21610ab83598e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "700d224adc519fad23798afe919538ae54d53cfad4a74974ecabdf254afcffba"; + sha256 = "91ecbb951fe4d987b226b40a9bb7efec4119cb43371fb57c98deecb538704ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a75fa004af0cef3548238264f7997ad60bcb46d415e3e91ff6e9b16bb86a4a9a"; + sha256 = "bcccecd3ae6b89c6972a24d41967d20b487d55da6d0d489de0e69da6d9e95c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "614d82dbc762f0ef2f565d95e5bff8d4212f8fa8174f294877e0ce155d75fb09"; + sha256 = "808f5583b067f74ed584804ea4a32ca86bab336f808944ee5877c7a964bc84d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a6b8f0c827443f32c25c478aa11981d714a57fbf752891c2f018fa9542820e6a"; + sha256 = "2bdd1003f0a77b0c2d3703fcf952aa82dc8e0e56801945810fbe2343ff45c4f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6227882b432684768b739058e7f1aa15e92157348e19b36053e70255172f0b04"; + sha256 = "c31423b965a44848021ab8b148ebef815451c706c0ed21e2272cc4d9a6404fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3b2590ff70bf7cf8998dda933506c86515ebdb81b031fb15f925b02d5cf88f04"; + sha256 = "ce8dac45e0643307e3664f529fd8f22a80e3089bb17593febd730bdd554920a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "09bbea80b952af6eb5358b2afbc785afbf04ee44a27b38f2f72dc6fa49417086"; + sha256 = "1dbcb8f8a7097cfc9d52ae1702bb29995f1585a0e817a0bfc587dfb0779cf975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f0ef3e5e72fcf72ff49a5b631bb9216363fb01440da41d939e4b653e84527694"; + sha256 = "3549823c524d86ef0b60174425c49c6fd91bfbd8e7f8dce371eea882d0e09fea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dfe183f6a40d50e3871f632ec79f397e302fd130c43af2c26c6b24acc114c4fb"; + sha256 = "67b85d1b5229e7dcc0207ece3fcee3e5b3b086086103ceecfe34c80333d4c2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c12fb2fb918a38a39655f3350676f290151e2fd6e44acff88379f3c4752743cd"; + sha256 = "b7ebf1834baed814479bc2471ebd1090fe9f662b80cf177542cb0cf118f82774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "14d1ad150edaa100c535c9b007fccd3bbfc0afe09d3035ada361c202ab31cbf8"; + sha256 = "bb19bcd207a6823c6ca304f13acbd7640aba4bb9fac14a4ce4fe5a3280823091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cd99ae37b4e8552cae7911c86f430900d8d21c96264dc2940c335cc050b8a62f"; + sha256 = "f22e4c6b8024e724dc2bf09bc1f7d66109551a07acf9c2c638165ecc6e9280fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0cf0c23c90f24ef417b460f57b566b87e06ad11df178ed3e7006a7a7a8acf7f7"; + sha256 = "7896e4fb06f0566f07069f724a0e1e96f9532eabf76108efa92738a92a6ae8d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "58bc7ea18c851d5a88c047bd41b836e9beab1f04289d0fc33e0b1d9fd7e55b3f"; + sha256 = "3ab3b8ccdbba37af17943df1d5f5b070a1c3826a55fbbba0c71a1a3f2342a3ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "13914c46edc3e5da87c394468cfe83f0811359b2d30d6572b1c3c9726af45c3b"; + sha256 = "4dd9bbca09dab4c57edc9a3def8fe768888f698e01186a5154a9b5fdcf68cda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "818fd12a70a50061c507c8e06d7118ea7d1062ac905f8b70d31010710df642f3"; + sha256 = "8db73e84467ef07a82f75224e36d4038fb29bb3d6246624cebab9c645a65d1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1d70241ed0cc861c79165a770a73b580496fbbbb6a2530701c02073c9995fc4f"; + sha256 = "eab61eb7a5d353ae33573be8eb37c141820e545945229ab9db248263b7033c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3b906867dc5a0ecf4dfb0e034c8e97a3fc39e5d0531ea483c8a408b32df860bc"; + sha256 = "41d282f7d6ebd9e0a084c4a4e8e7f6b59a9433feb4c006c5ada699a4e4d2e19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b23189c437535a4fad78bab37b81d95e3fe5774a8c3c4c6bd6d77d7f785d2e30"; + sha256 = "8213721fa3601bc529f5fc2a97f7f64adf544b994c607947e94e104d5ff5c96b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "08dde33689c92e2c23971b0aeec581ba420b502a118c45799e35d52087113055"; + sha256 = "f8ed04bae5dd80366ed92be6437b01887310d914b306b172e303da78a878df0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3a099e8247e4f15879233624489f4df971493bde2019f47a18da3523e0ba142c"; + sha256 = "a9dfbc40e42b55ae876cb44499ed2b245c184acc4299b358fe6844c6f80092e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "94497a259e974c3c13bf2a74a4a91180710b57402fa47bdead77cece66696b32"; + sha256 = "8f2f3fcfef222377dce579308736948dbfdf29e7a0aff42a8b553990238bbb4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "006458ee81bd21b2cd3acd5b7893e90cc97233a3507b2247355b183164771502"; + sha256 = "900de26055afc2ddf81d4480deab7711f0232ce034fde90f01e7314526866eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a1173235bd09193a5fb6081db6af934ac5cea619bcf612c244423cdfaef75861"; + sha256 = "f1b34ccfe1a28f7c3f9ccb1700ec91c2c8c0eab45b074dc38386818969c1d945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ce6a04ad52b0ab49fd4db6724fe43c1f054fec37fe2434536985642fba1999db"; + sha256 = "7458224a8dfcfa1480ea95a4dcf6dfdb62d1e9576838820855cb23baba23bb94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "10f31d9636f9124aefd213ecb06da9be7ddfe70e2413ce66a1c1f84407f33319"; + sha256 = "6441f1bd46807575c11b209a35b9f5003d418c7ea439ffa8c7abd18355635bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c83e8170ef55f271fb9c933505cf66d4e42eb8973d6e1751c903ecda3bc92cd6"; + sha256 = "c65364bcb6078efc0e856bac29ee758bceb016e838cf74723768de3872e57e71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "484905693e9e952a56627561f10ab429e7ddd2df5b534252f60aebe52ed41b95"; + sha256 = "3ae90a452b99a039e4d9590d92d4c58ce5684c6237c1d3bf7679ff3b422c99ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e17d15802c8d94770c6368aac7d46585483353053968c66f40f326dac00587d0"; + sha256 = "4dfffaf009936d7dfd6614c496fca8884076293122cae401255ef34304176bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e03b1c472787bf1ccf33568435b7873a4d6e8f43a0b82a01751995e8ccebda9d"; + sha256 = "7fb0f40583398617a3469c1a0ba5a83443857b872b9b6b0deeda957b3796ae02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1952bac0df8fb98273d0a4310f3141e928e6718eb1a91baed6d692088f041171"; + sha256 = "4b943e4439c8f07d3de7f9ac9e17b2af3a1d2a29bd4b917fd11664e1ea249e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4d3a70f4cff2d11dccfeabe15c30ed99b74bf5058ad8f8c795d9bfd2db1dc11c"; + sha256 = "08dd3aea42b2589fa141aab23d5f9c925d57cbf45619fc9b7b2d64ec13e29dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd1c33d8a1769f2d4efa39eeb248a7cb6e2993f4b3bee38884fd997d7f20e026"; + sha256 = "b1130919b88f96d866dd54938dfb63250df118a6861e8a0eb8b32943c027ca33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "623926088fa86ff736832cb35044d7d134ad1f4ff31666ba7dcbc31619c3a07d"; + sha256 = "9f1186860c19e4f6301ab0bdf39c2824038bb14b225dd8b8e43cca5b838ca92c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6276f0e417d45cad209e0f57ac0276f52854f5172f7829684e4c8a49c0e78fde"; + sha256 = "70e66f4edb9e6c39b404205094eed21e8df186571c581f67f8176c78d5a41098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0412368189b73bf54d5679c22271ca82f47c10ca1288431fdd16a42d51cbfb21"; + sha256 = "7a133f4f6ed1b67715ace63839dc2d4a1dd79537ff168177ad5a329d4c482292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "67060ebdf9d7ce14c45db9edd588f99fe0485971674f791691766127a656575e"; + sha256 = "b8b214903b2aca2b0e5d4de1f152e67c5a71ac6917903d92f2000629b51aae97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2c79a9307bfee1727a19cd212fed10ba02d31ef49bd68a51cf0ca0a7faccf2ea"; + sha256 = "884696456c121f511b0661bf9972492e01a23d3e106b00c219c598855df7557f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a6ce4fdcb3716e2f70fb83502fa9e9e90489ac58d26a25627eae7b8402a0562f"; + sha256 = "676ac6c717cc21496baa6135d18bc7cb625e58c3e12c261bdac2a99401c38ec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "21e4519d0403bf3e158eefe6c79d8283f2cc1e0875d91acdb995c0e83c56a9a9"; + sha256 = "c86f2615962a16d7766ae21598f82caf77f0cea341e0b931dc1b9ed90a9c2f02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0c1eaca5b928c2a1cc5a60a2dbbd624280ed2b55f10446bc886158e95af39199"; + sha256 = "14875cec0478392c2dc4c79de855f1c338e7737132f6a4522e65e02478072d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7716acc8417dbee838710d3efe670e081712ed3facb26bfa43864a574463ff0"; + sha256 = "9aa8bf0ada8766019bf9c6aaec64c005239c3d9d82c494e81ddede4f822b0bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a90e61e0b5a31ffb7cebe747e8a6512e68baba210f234913af1ab8e90c79206c"; + sha256 = "a822d9daaa748c6f64628dd7f4fa2cd0b8bdbf57a77710bab2cce990aa052874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e75ccfcac893ac7d54d8cf849044385ed0749de77dd53be7a1b1686949a4699d"; + sha256 = "209a83d4d7372b7f2ab578622c3e77110929bc4a1d572c2b3d084e5c2b183d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9c2286f7cf0d5052e44ac9aacf139e2c8abe9d212407960663819a8aa8436bd4"; + sha256 = "20258167e5f470435d01fea08faaa1854872d5bde35c3a48e4028e8a61e5e894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ceb98c5fb103e80488f8821027144b0d7124d0f76d360b6139308763a1ca33c4"; + sha256 = "948ed50f652aa1f0d16de7923b29d6c4ae1e9f87a16cf4d6e195a94e7c0bb196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f648e363da8ec8caa13ccfcc4d586efe0ac4e0b0d3574d295c95ac81dda937e0"; + sha256 = "65eb92ee9f63176db9efb700ce8b26c2f9d1d4a4ce2d66ce2b12bf0a083f0db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "06b61c45238b90f8bb838193fb5035dc63c48fba416f16b7ab9463597bb92ab2"; + sha256 = "ff3d52f5060ce6b69a52ab54baf53ff767a6a948fc5385b38452ff1ddd32d10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ae0ce800b1455aa4c607123ead63edf228a55f4bdac14c267746cbb640f60418"; + sha256 = "d8dedf187004a64a6484657230796066be8819be188b6c73edf23a2e516015aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1d7f47bdc98efaeda62dc2f3d1d16949a8cf3de96dcf87fdc30015ac7fdbbee5"; + sha256 = "5f6e10610a2f3431ea75f36b5abe3a79ae2a877fc912733be7b7ded63c2d0434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a24c3368e2f88f75f81af2e17050e41160d99b27720517cc34a7772533ddcc6"; + sha256 = "c6bfdb386e2dbef46666582b97057dc4d87da0a3da708f0834cbfb46f01553d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5282d6c566361c74d5fb8c8d0f992ba5e929f2183b3abb9d479d7f1d53470dbc"; + sha256 = "d657648c3bd243d005b7b8ae9b720c3dd14ebd7fab10a5aeda332abec34adae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f88988016fc2a8fa5543822d6fb1ad84c57f8f0d8ed2bafcc63552efb2361085"; + sha256 = "653c7ac40b697418ef9335b5d84b4791126a4d88499c7643b8691ec7f7f2674d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "252a9f2b5b99100abcf4ccaaad9982d48ebf903a7761d36e2aef766985fc0ec6"; + sha256 = "caf1f6164adc422f9b6d15998acace1644b3b7422cc049302151e3edf060c8c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8e67fef2d4e2cf87a2961c7deebd244a1dfc7863e8474510aa196d54e199b4bb"; + sha256 = "a500f80b351209b849689cea6eb558f039c2ccfa2f88544473c9e6b6592d5d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a687d4abfeece55bdc35bb000a802ac6a67bad8af6cdcf88802b7d42c486789a"; + sha256 = "4c3c78cdaa65537de0577889eaf2029981e57b70a079111f26a53cc28ed234c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "27819a8e87dbce94ca4bb2b3465153c6ab974c52bb81b2517fc685b2089548f2"; + sha256 = "5ad92e4c565807f377900c3c588b2e7090335259bb529b71af45b37b9a081067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "21cb440725cf0378021b4a6a858fa3d344b39292a61e4a774d065e9e41668e24"; + sha256 = "c5dd205aa822a311fcda06018ba79fec68ee8c2b05d5ecad1d2dcb103da87509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ed0bb4aef9a5ff6790bc36f3ec45bf140ff23343a36716bc59fbdf4cb31c0976"; + sha256 = "613140f6f288290d93a0a41811372a46debcf9de05dd1858dcc5a97e242bd657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "436ae41521b50068bb5fc9768936c4a4b77bb0a37f48ddb84cf8946a4a7ea76b"; + sha256 = "ab6cd6c4e09cf5dce87a5f072068b7c49c203296a5ce0c32fe41fad4d4fec495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "dc354dba3016dbe13ce744fcf654b292254c8fc0f53e55218952c6fbb961fcaa"; + sha256 = "93349da0b0a1529e8b5855519175f61e064445572b9acbdaac68695f7157ef14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "87bdfeab9856f13736ead5c3157d05a5d0b73c27a2ad0d7537bb63d994cf9703"; + sha256 = "e5d6800770146e6c1e4cc4d91202ca4749b6d922ee5965bd82a6acf7448f2677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6dd1f7fcf13e9c651d3359eadb1b8b2c13aca121e294ee5856f663a712438ebb"; + sha256 = "22aa961e8d40f0d4bface131a19ff0cc0f88b9f66bc9b63c3038ae2b878cadcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fa5e600d2cddd4c93596baa0bce310cdfee9eef12df808968972382bee32f57e"; + sha256 = "722ba0c78b51491d8943823e0aa972147c0504d7c65dd7c5eea29377abcfc571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1b277fc9646ea8d060c1bb554ca04e42b0099c70a44e697990ac4289712eb12d"; + sha256 = "96b12801ae70101cbf4620e1fbc8e4cc074e4f07017179586cbc5ab208fe9f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "370329076e609bcccdda5f472b334cb8dfe3df0e8eb696d22aadaa44f8b0b539"; + sha256 = "cc97cd08c428bc52616f6db25e9dd50f9162c29758d6c44160ebdfe745211d0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9b9e685fc94652195b00b5a959e48d81142b7589e0ac9d163c39f07cecadf27d"; + sha256 = "982fab751bf71de830c9f5866943962f3095e70c4918f65201f8f51c99070898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f4b851f9a39fcdfea9034edf0f4930632da04d9a3b949c65b682e30dac63cb45"; + sha256 = "c5e9739a2b8f60d578a8a1f22f947d25e8eb14049ffdf57a3948a50e34400156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e72943c2f034282b73aa136b272dc7e7e9d2bdda5b2c2db045029f05a0e8b14a"; + sha256 = "7441aeda63c2e90a26a342c80846a4ea0a48d4d4807aa2fe39337401d9002a54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e2451341887d6dc51f3aee8c8b9a7dc65277e3cc9df9e2fafacdf67da838e48a"; + sha256 = "83d26111f5d82644ba1601df382aa57da851f69284cc4fcb88d943a79fa5709d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "01a03a21f479475d224fa7559a5b4e98bf978f61f4e472a58b1d1d272cf5fb24"; + sha256 = "1c845264e89286cf8a5171f372930189455b3e2e0b959f8e271799c4bb00b074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b64c925beb57420c5c76c4c4ac78282beabe4a6ad7fee19bd6bd4a9af2153422"; + sha256 = "a8e7e5e6cc3da1aae7c016dcfd28bebf35b4f5ef9a4687fdc48175126dfd1043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "250ac76432b7312bc1173ee34a32d0e658c0ea658664eb296b7c5dc2c1fb6ca2"; + sha256 = "20b081e9f5443f247520f6b78283666c695c574fe3113384b81c8bc1b6e100c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bc3a716efd7cdb0538714ba3469a5303a9496b0b1f81d43a41b55434c047c991"; + sha256 = "6dab96866f64e882c8b7a42c6b66146b9c6f34e0934304dd192aed28692acd05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c6d2e017c5269064a5716d54f5df9f2e2dfe621f9f24e7d2a9dd3bfd6b47983e"; + sha256 = "a81691a57dc6d64c425254688baedbe16589887e99a88328efa391d7c22a7cd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0f3e2947b7e03ab0197af6817774a7e0bb11fd5dcf13df23ad3cb2899da49cba"; + sha256 = "e22bfd17a291bf7e890f80b054a9a608a8b7537a401c2fba0ea97bfda531a06a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "161d898a2d74fbb709fb3d19c7444c9892e035c2876f66384c920ae3f76e21f0"; + sha256 = "ff107e3b42e93ccea47c0f4b6fac05fec1904333e1173cfd193028b1c7a02ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8bf24778507063352156caa82fdbaadfde5c840f2637196d87cd314ee89a3833"; + sha256 = "50f460b541ae13cd78699642e0853bd198d9c2604c74e1894b716a7226a82b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77f1a913c4e2973593edf6982eaa767185ba4b8ae91c16b967e8f3c7e82d72df"; + sha256 = "13acea425da7fe917fec2f7daeea24f7705c6af770f02918097cf795dca4f4f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f4ae877d906e7427703df3f219c0c95abffdb995328a80de3b069cbc5eba4a42"; + sha256 = "f0ca828539b50b41c478b1c48ad96c3db25bf2dcc3eef5924e55b477b01a7339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0d3371fe5359ec1d23dc58e00151ee81838c18a8e9fb665d48c3276ffa34809d"; + sha256 = "93b756eefb43ec5ccb8c2da88804ceff1388db4cee07cdc1e4d9e745b5b8c971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7194d571e3cd92afbb8e19c5ecfe15e0c0ed4af28961008efeaf5e475ed8c1a9"; + sha256 = "5b4a364a9e288e9b83b0c99ffba35ebfeb37984e0d1b4fbdb9003f5eeb490bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "79a5a4d97a106dafb9ff6ede0e853dbbf24aafbc3f654f5b8244ba2a09ac6ff9"; + sha256 = "5b6438b6e2d27ed1e5b3139b707610f21b977b3080b83e5cec1375482124895a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fbc2bd2dc236706d1e6599d32a6aef5b4dea0b2dbac4a0d59854205dc66c6958"; + sha256 = "882246ace511dc8b8daf9370d134002cca9c470c2420c7110325813c86ef17a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5d1b79b6be89b593f79982460bc10d160f8914c4544a802045562547b59ba364"; + sha256 = "d49c6a19ab9538bb731ea4b0bf272dd35aca39bac41cba5e440d9aa3b61497fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c55511e3e8546d31230e8735a85e9c2745d3358567e424324bbc850c8f9399b2"; + sha256 = "da3e2b86437ccebe811b1b0f7c79d8a875a9f682596cafc3a30d216b584d3412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "009a89d79b2020f8e86a9d61b21b5751afd3aae053ce0c037b3cf303f528cec0"; + sha256 = "7a6889b3e6859ae3af55a5df7c7d13d7b52be3a8b0643ff9b14b7ebd436cf2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "06b51518cb8a3ef97c084f1cafaab34a8175b7efab66e16d3f4f1f7d72aa9df4"; + sha256 = "1a7942f57ed945628815b3ee536b892acec11a7d4a5c7ecb31bfb6c61fd05996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "560b8a7cc248639361ba08996a477d2ef7eab0482f41bba67f0371c841ca490e"; + sha256 = "7eb32c26f0e4551abe340567558644a41c101edea66042eeffef299b35f53959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "cc0a12c6e2feab652d08d28a27b79a9481209f4c3869372b37f1cc5e27ff8e70"; + sha256 = "608e5e80d8e5bd48e327f1b827835ae0ddb2dcfb2921d33c1e9bb895da695641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "25541e2722cdf1621dc42ad529447c31c0e9e8ccf7300f87d89f2e1f91240fd9"; + sha256 = "9b9eb2dea61ac0dd76252321caa2afaa98a3c0b64faf3d1f354e9b9cf02b1761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cde1314a8135543aa98a9c28c083e3f57700be9990ba2ef780f6dce4a8de6dd3"; + sha256 = "58217c4383dcd7720c7362839c9326c93e8cdf0982fefc4844b2c6ba66ea0360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f85d1f85763fac8e748662d1b493cd06dbdac37960785cee0e8946daab10fae6"; + sha256 = "89f99e044b69d89219974772d385f5d86b64c9f12ba1ac9a2790dd61ccfd44b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "34ff1895eac6fda351b210ae65b2edbf837ca8a5a5592caa33750ccdf529c6bb"; + sha256 = "303ebd0555d448182167b9bff79f72dd7fa247c1fd259c3af0d1ee3f0f4e339f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9769e7039a980ae239d242fd6ed4438e7b90e1fd91f7d9ceafd52e8183bde1a5"; + sha256 = "f89d9021207399c9ba56db03add2ed8e10fca3b8273f2cc4ef79814730af9cde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1217469bc4707454ece2ccb422e99e85724845760a4a78205753c07354a2d6aa"; + sha256 = "12d5492f712b993df46a2083fd2d3958da8d5bcde7e11ef83482b3d6c0c0e5ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e70d4bb799117c0343a17f57adc733dac1cdbacf30dcfe0ebc195da3de091408"; + sha256 = "26937f627cd4c14bc354c9e39378e56ef06ea18519f5b6344ca6ebcbe1ffbe1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "91bff99d4326c16466ae3c4d1646f14cc8d341cf93c71db6dec117ae24dda154"; + sha256 = "2de70b33a112c662a158493a14e05ca45904a0ba9ca71d2416ba59ce81bf4192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4efb3b03955ab8cae4925704fef1a1d1ebc20c3bbdbb9332d1be31c2aa0f16a9"; + sha256 = "dd3b9ec61dca822106c3b88df842f0380a75c1262bef82be1aef6040df308e1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9c01453ebeaa772eb1ad092400ff6da05d6a36d901fe4f9ca9d98bf4c41d2d40"; + sha256 = "997a5202f5da86b665595b7f0a4c793527428c1d78c60831ac6b52961ee466bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "697bf0266fd4cb19e42619054795bacf4e9a065dfd976086b074be47038f86ac"; + sha256 = "80577c41032e229cba1c2130ef66a428daa0ce238a12f15e1815460c02f0fa93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7314cfcd476f18054775d03d96787afd4572437c507b0387fe3104e272e66f32"; + sha256 = "15d92dd24481329ca8f742bd71ffa6a5dd20a4c6362dde813f4dcba663da65c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3fc8dc069fb41aca43581f3551a485f4659a760a275beac5087f479eba0b4605"; + sha256 = "59d49f04138c120b6f9e4ea8d9b902f90dad86fcc16ff82af47bc198635f5747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "22ea3193fbdddec8deb897ad5551fd94ceb659cd8493a04db51525c29ffae0c5"; + sha256 = "3b82478ace0de50b1e9e60715da1e90f97e6e938577c75d2be44d313354291cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2f3dad5c917a28b41fc1ca3365316a281c6e6560283d2002364c2bddad5d7a52"; + sha256 = "62eeb120929b980e1b0c30a38054a84e821b3895f73be938274f52cb19791038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6334e79bb84d78fad334d9298c8104472ce7297c17d80f28144cf0751c42ac80"; + sha256 = "a5a304bc7671a16ce9e41158ad34ac7e49406740d22decddab2c5a004a76a8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8fa05c175f271723e107ecce6d2a7d6b8e5afef5578ead1d6c8ece920d4b0a91"; + sha256 = "ed8e69b18fa20ff70effd6417d3e457ce4e820907bf550d9f8aca5ab135e12a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7b6751f8883c439f1fefa3b1c220093299f1dbd27b8a49c467113e8200849a72"; + sha256 = "c5d3904f8f09309b0c75f80676f156261dd63bc37817283bc21f577c99c900f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "81dced560a8048a4113c3a99ef72137174de6bff64a0ef4f0bd669f3d7f6d89f"; + sha256 = "e7b96b422b949121511e4cb289958c9efa96f0d0e3808e20a97aa03b4c441529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "692746c7919b64f23bc92c00a7e7ba60f54152430887b608b84bcc105a436a33"; + sha256 = "6333056941db9f5ae7679c3aa4213570f1add3f60fbf67729a97b7210788744b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "52f4b321e3e149fa0317d610f85b4637b464c79b1b2046ceb9dfe2f4e56b6c6f"; + sha256 = "05c050f50704b62324aa699856c3a6cb57e2d5bce783f9e39861a3cb92c7eeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3297b5b0d67381d1b7f9c4f76b767c6a5f76388d473afe5e9bf0df94a7bce0d9"; + sha256 = "6519d91cf5798d4b14ea3743ab4b1ce547031b346926b8504c16aaad61a9f023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bc1eae9950eb6bc6a79fd185835aaf7b3c9394c7d19bfb78348a1f4987315636"; + sha256 = "7abbf189b2229f911a0aec5fc294ac0efd9e7ac9d657aae08e7f867cd0128179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fdef69d9e24c00616b177dba71e2c5db29f8c945cdba4c3dfbb39753b1f01a72"; + sha256 = "b02a4906ca96a545af361f5aa29437d3d4c873c3ca29db4ebb36fa2128b3a540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7225b70db5b568634792f18f0f6ddca4ab94e00b225942c6a4f5c4741ac9858c"; + sha256 = "b1cf1ce7d68359b1d18059434c0aa13ef9871a82cd3c3e81fe5bb9c3ed7249df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2c7f228dadbb2b3ecd424ab2e80a532e17e861f92095e5de5ded2006e79e9dc6"; + sha256 = "6eb2146f30a6e4b73f5d5ccff0b6a9483753ec135cafb9d16ee7d693de26f9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "63fec6dfd214dbce4b344ed347eeda9adb489707e06e6a4e1ad6fa828e0da7ff"; + sha256 = "ac7c65f8569531fecb469e37ae8728fe42ef0ab7d542be4051cef398c2db0fe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8d584d48c4e35bd7ff1438c7a80e0b353bb4871ba946119c36f1fb3bd135518c"; + sha256 = "acce4ec2bbf346fa76c5d40a8bf3ee3696484b8de4e57135678a3a60ca5c3857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d5e7514a67a288e755d7ae30f2dd680e2138e50666fa15c1b710d0a454a51730"; + sha256 = "7260ac1017a5b4452b5aec0de30894c6619c5f480aa6f1df67a9e876ac83fcde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1557cd8173d79820d852d99c0cbb07249c2bf17bb778670e437c4d408329fbc3"; + sha256 = "b9327040072808ef614944b659304ce14c6aeceac82afcfd45454d610ec9d019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2001ea5bb925d5a1e845844d03c441c2cea9a61b042df518d16e484a3a7901ba"; + sha256 = "a4c5d9b87878d269be2b6314c1347093e04c8d21300344e3435288da0e325cea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c9994fe1e9212281fc007ba8f6b703856693deccbc083e17dc94b6da8ed29a72"; + sha256 = "4d0f8b73c3cc034604330787a4d8fcc914eaf4cf7a3187041bf924b6a450d62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8c6b207b23fe66c7506da96df7de25270218ce9ca61bbedd693fc6f69c970d53"; + sha256 = "c152c0e843a69e6c099995707d838b1540b58b9c74f42241926ff2415321c63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c9c7cd8c6195588bfbe1c812425f94e7b2727fa0ab73e247b543cf85ea09b171"; + sha256 = "da96cd06713a231bfeb10a1c077586579aef855ffeab88de13e9508cceef0661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9b7688be959e16f4ed652ddef4cde0bd5b3df391b8c43c33b6234ae5ba404987"; + sha256 = "b7789d13580a7149f7c3c03a234d40e56f95782654e0c7b24078d95106a316e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "470596584e9bbf2795624b5baf878955229472450fa7178c9e4612408452b170"; + sha256 = "1c6fc47bf87316ccb5cb767d0a42aa685cc2d75a923138803897d0aee0035c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "814e5c7e9609b6ae72d2c4c0e012d503394ee6c669e777a0e3b4e4dcb4c7612d"; + sha256 = "647f29a9cffaf16abdf8be253503fee7df5b54cfe90e311a7d1f978bfe53243f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2113a0313ed3d675bf1adecd574bd0112fa5c03d23f670e522928adea6c97265"; + sha256 = "2451a832ef04df012d6114c6a9bb6f99a2dfd673f4d5a1ae5fd2b048fda3ea2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4e759986facde4229324402963e0442d1592147c8f4bdfdcec5ec067e2d0b123"; + sha256 = "c8b0f6dce66303ff77c33d33516f41070ad470d04ea7a159d8a2407e072b4617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c77990635980e56d3856b3793f186a61aaa6da43ee0e0970e7ab06953596f85e"; + sha256 = "fd08bf4e07e05535c39469307bf423f64d16df910e3dbe29f608818eaf63b5b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b4a725703b13e230f84c3a5aa1b9532a7755888a2bf7516b5a0c3a79f70f1ff0"; + sha256 = "b1b07960637d5bcc3c540ecd3ea91c9aae6d602506416093afeb68ffc9a84e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fed127eedb2d7bf82977c9aa3311e40eca083b7fdd6a7e58f44b315e209c3267"; + sha256 = "b21137ca94f8426338635c2173be59474f07fe7d6eae7bdbd062311a5593dc3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d29db983e9791aea1dba8f483cf9399ca032fe081e6e8cbb08d9fac3d644c582"; + sha256 = "652c5ce25e695ccf5cb8145f1c71660bf39e6bd9b2a951f468cd1d1967811f2b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 29a506dd1b03f..8df80ab526a62 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -190,6 +190,8 @@ stdenv.mkDerivation { ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; + passthru.applicationName = "firefox"; + passthru.libName = "firefox-bin-${version}"; passthru.execdir = "/bin"; passthru.ffmpegSupport = true; passthru.gssSupport = true; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index eab96830a8de2..c3d034cd5a1ed 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "98.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "dd41bff1f1401eb376a3ab26154a42cdc35e409cdde24435737d753b15435fa6"; + sha256 = "75ed4180a84010f7bb509f9f8107e303c6243008071f0ab925313aab0e4dea60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "963103d54c26d76abeebbc86480836408f8eb7eeee96178ce53d6fc269029603"; + sha256 = "b4c380c4d73ecb913a1ffcf0dc0d3dd771240f1188204f728464df8a65671013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "51862a663ea34d9bb1ae78bcf7846f6148dd8004cbdc6ed49c1252590262afe8"; + sha256 = "247918ac04cdef6ad1452f1d7cb0754f48c70cdffc2e20a3187901c72a023f30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "24857b772fc0a7b018c0ceb51913b1a76df59ef3a95fd41f464e1c51b5201e6a"; + sha256 = "68514334b54f4a626d7eb37f563bb39f418d6be4b980c7d3d31f417153d51482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "44c45ef6d101d0bf6f57d663ae6943a7d3bce248eb8feb35dacde292b2c3fcf1"; + sha256 = "cf6a2ade0caaed45038a1237d4881c2e07867d1ba283432e7464ffee5c84258d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c196437bfc3aa231859ebdd2f335eea4991c4eae6bd3cf9c64f4eb195704b1e3"; + sha256 = "5c481ca36bb79dbfa5f4e6b83c76a0746b6f4f3fb69200642315a9226ec04809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a1d1eb29a51a84c2c779bd2090a7a064d1b7d290e0389672351821d414fdd35d"; + sha256 = "676169af51ba1089aeeedc1c57fc19bf383fbeff03df5b13ef401b63ec9aa249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1f78b12ceb1951ca0e354ee04ff6a7893fc7596480b9df1c9eb443800778e033"; + sha256 = "5e030aeb833b356b145c8ee624ec18facd95c16dbed374d1f2e90c4c14427404"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b010759c37cafaa3e296b2b71ab19d2850ed62043c3a04e80b21c4d9e9acd235"; + sha256 = "7211a76921bb81307bb14bb57c5e062fde21de58fa61ef4f676652cc2c5d365f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5d58e3ad0cf8de459d68b60653af865bc1e11a1b69a6decca9e630675405885c"; + sha256 = "a2a6dcaba8188b205207bbf815b899a8413a494af1e87060b1da73cda1a8ca0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3f1ce059e17f6a14cad30ef2609cffe61bc3495bef3ada1a2941bfd8bbc440f"; + sha256 = "fd0bfad035287c35a809c1fbeff9b00e78f6c5a067e8b301c30b76ef37922dc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e06cf1c020f3f65e99c4816b054c9f79da55f892dde27d8acde17ebc24fbc840"; + sha256 = "ab4d58c4640a4b0e65d824e62a898aa19674d37929c1748a27e4aed8e5be0e97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0f9644f78246459e2d7b0c8c1dabc5c33d5d20d2c6d517cee20fb540db501cd6"; + sha256 = "0429ac4f1050234a28ac1cb3fea8eeef0a763e4c316154e6f02452fde434d968"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9b78dc607de8f66352a778c05186806b0fed9afa8474fc4f2f9346c4298d0be6"; + sha256 = "c69d5c22998d097213fc0016a344c967064193e81fdf45b2bfd5f1687883690d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "cdc96bf52e2d9d463e1caca4eb567ec723311678233db59d1cb57a2e7e16c593"; + sha256 = "7d06915a6b86c9bc8bf408fabbb2db73f56c3f0dc3a81d7c11324b564bde3d51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "91c833ce44c24d3fa7b90bab56d0994c930649ae39403c6888a85c2e22fda7c8"; + sha256 = "3e7ea4aebf641697f182c1ed5cd8848a4aac239f1fd7082f5deaf7911ca99f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e8602e1cf72f9b98dceb23694eaeef70a82bf2704cefb4dfa9db380a31eda03d"; + sha256 = "b151987307e07fdc86ee14a9c0487c3be73b954d28c5beffd9b00ee05740da15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4d7ab6dfbc168e1edcf7b06b9da65e88b805cde7adc14519e2139fc811188b24"; + sha256 = "433edd8dc45eee166d14d1340453637985f8e606d635ebffed09f20c93cf851e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e0288172d3e7fd5f9d8631cb36a7f69118aed0b3daea8ca6d4bda0eee53a2353"; + sha256 = "46b731e6ebac3d2e729e69a2d671b5980f6a2d8ccf83c1e6828feab93bff73ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "eccb1283cee2fa9d6b35ed0cf30f789f422094cf2fb17966b9a406026bfea2d5"; + sha256 = "a6f5e1ce2b6333468a250c1a28bdcb7e44539315ecaf3da09091f7cf3c08f3db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7769bc1d977fec4e0b5362fdfeb0b0f52bab1d0b12b012c90ff2b096209bc7c4"; + sha256 = "bc56c9b18f7d8ecbbdb6f3d4b56607bcf9355156174d537e0e85d41f32876be4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "71e3b186ceb1333f4b95429e63abb1c0807a7f1df2c0e8da26b5af866ad077b7"; + sha256 = "35b574db65cd0f4511d745892690dd2e64fa4c0ca1eeb2be56ad2259b45f48c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cb4602feead2f7e7b407e83594ad2edd9de856d334a7f9cfd392a7764adfbbc2"; + sha256 = "2968f69125d5a203c2edb96bdb9a922d26064c7f903d5d1b9d7f5d0f7a4aef8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "36ad536374a186e2d9ff4c2894749ae43c512555ce2fcd5f67b0ee76949a764f"; + sha256 = "7f5abde625cf25801bede74f74cdc1413c3dee3a4288eaf75d5e967ce133a88a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f4c854834fe8bffc682f8c29ee674771f70f78d28173cff3beaab13ae637c54"; + sha256 = "1626c5996088df57740cd8907d61210c8081bb0a2a1b19d8bc9129c14fbd6dfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3381fa208df76553b85a53cfbd4ced059cfccaea1a8e246a5d0d1c54efed8e8f"; + sha256 = "5bed3b64b239ded8424a27b01a8456248e317b8e2b8ee92ef50c9462574189b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e98d88c0e6350e477404ef14fc7348ee79f25fc9e31ed2031c93b79298fc37fa"; + sha256 = "cf79cade9876dede8e6a4886875181d153169ca4f8ae5bfa9958c48f2abdcdf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "26b84f335c5ba6238d69a7537686141188226859d17b0a64c71a1ca0ac9e9d70"; + sha256 = "544ec72d7f304ba702c134d1325f6589e30354d3d4b03d641451bc2f560446cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9371d5111ee591ea4179c4932e03d1686b4f8555c5b6b1dc110382b43dc046f8"; + sha256 = "5a5775bc02aa61edf7d218ffc9506e70ca2dfb781f0abf5e4aabc288328deb1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "56336434a3be39e71459a3ae990f3dbf826fc53ddd33410b0208e4104fb9948a"; + sha256 = "27bdd41a21e159e19bc9ef1464f1f76ac48126decd2942b4a18d4ea0777db743"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "75105b2ec1f269e044332dfd1736edf0919141d3ce7ab979da06ac6a47c361f8"; + sha256 = "7e3d58ae913c919aab4f716308a9fdc6cfb590538b0dd0b90aad3dc099caead9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "86439e96051f460ac42154274401cf4f50102f89590e67e78024a7e0928a2dcd"; + sha256 = "553b4b1025749f374f82acac4e529799d9e555754e63ae4a8bdf016ac8ed620e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e94714ca233a274a0229bfd6c9e5daceaecd2cab30b8314464b766ac79c1fc2f"; + sha256 = "7514590c9dc0d9181ae439a637640ee1dee40e00e9283008a54ac3a07ec8256a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4b88a49838eb6f479feccbdf3109e3ae7ffb1215a433233d0200fe8713475344"; + sha256 = "ffd7579cdb4e6c8f5e1e66b26e3b064362292d93776313b9ded9da4a3b764cb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "216868ae9bf52b914063b154015efb07ca384f5a722064ce9ce2ef2191722c80"; + sha256 = "1f8457a73eb013abd48669f4cf1e109d307f307881e1d9b46ba9aafb09ecaebb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "38fb2079928d7fbe4e8181a14f7c7d955d41fd14f0c73f0122d91c9eb1ef7929"; + sha256 = "6e9798462e2c2c0c50927276595c42539880cee4f58d00808cdfc5113aba9399"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bd70c4241e3e8233458b7ff6bc2893de43e5917284222146a585fce47f785a5c"; + sha256 = "95f41bc7fb4c6fa19851827e0712bc8d7c9344eddc3c341172478fea583265ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "edac88def8dbbcff4cb4b5c33ab77f48d6b96a8ee1765649913028cd92d4b4a1"; + sha256 = "b785913074c6d311380b382b63d57c2eae45dffee759d1aa0cd2d0c12f736e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1dcb25e73b9dd759cba339bd24b769c279c9eac1a4d2b47338ceac82d9e45bb2"; + sha256 = "1b7b37e1569244fdb6a11fa1d8d371d01756150bf376662b2b0246a4f08bfb37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "122331ecadf4b63319988f781c819f11f905d685f4a549cb08454a9d8478029e"; + sha256 = "8623a915fcc694e5c8295bc1b95b4c6a37aacd0aed505f91239a2ab48fba8d72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "45f8c33eff249c9373dcf558648475b171be65db5fefa873f7553ba1ce77f2d3"; + sha256 = "52cf134be5f9981534a93d454cd7a893fd605026ad814a7257ba0e59f4cbbe1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9480b304d5c9ec6a10dfd480484dbd01dc41ea1cacee4b05b962d4a5bced4427"; + sha256 = "e06f6fc47a98f4564a65d236f8c322e5eaaedb98d049171dfa1fafaaec8bb690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a287cf31defa7923a7004451fb2cf72018ee507cfc167a67899624f7b8375d97"; + sha256 = "a93e7425c0cbcd7579fb4de0a7ece495d77c01eb2ce2a11a9413bc6a8baae3a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "792b12bc891d6d6b4e0c14f745641f54e9c50ecc10222ee679a206a4348d0c9c"; + sha256 = "66b42537cbd4d2338fd6a07b86c52c44f1210124f4c3572518c5bf7f0be217a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "958a2569663fed2f45205ddb744e4c1a62210b678bae94e2717e8d4a66161788"; + sha256 = "637e898fc7bec9727fa489498abf1e6989a32e5f8b92340d0f645aa1150885c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0bd1b2ab4b063faab90a1c2158d9d0d0fc96f7fc81389f06190af39c9247dc21"; + sha256 = "b1b6b24039321e322f0b7d1fd2c59de13029aa56017e48e5211c18838744e9e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "09523f090a020e658e14eaeaafe65a6db0793d389c8dbf0671f9f6d3b291482a"; + sha256 = "5ad069400e47bae81e7e8581e81763905b3334ca5146672317e2986fde7fbfbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "39460a0d21b63c39c5aed3467a2177441e23f15222abbc44535b96ca2ac869db"; + sha256 = "0c80a2786e149afb12de10a49584d6017980e3b52fa1c411d9db289ee537290f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7dc87ec09c0fc046a42c583c6ec84d5116ae71ccce466abdfdf8d88578d4fbf2"; + sha256 = "39ebabcb230336731e5be1d4024add0d639b3ef0c9d9d94a9b59b5bcf00c6263"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bbc73998584297e0eed998927c574eec7d81aa37530be11e0b68d1b89fdf31fb"; + sha256 = "8646c156daf2b9e76f1cc93bda605186c8041114bcafa8b67aa27c767297a830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6d4c0748a49fe3b14ea9906088ca99e1865002af3bd3fbf1121a67409018a51e"; + sha256 = "ac9284b3b994f9e3505808cc94391e04e62fc70a75a7ec4919dec56b79a63f84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "595cb5d60786e691078ae1aa8e76ede002f2895fbfac3d9519467f382ddbbbf4"; + sha256 = "3627584688564c9fbaab025f1fc97eb988dc8b5c4eed58bd55f3fa1cb08bcd12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "59b28149d3724582a5b4c0b4898bda5818d762020eccc4f40d4054cc6752fc62"; + sha256 = "b0a8e54764b3f0d947894d0daf2a5031d43a65e19fd3bfcda7f0499ff065441b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "13278da244a1cf7342235d75eaca237402432e73835d944dc9d5bdb9c5e967d7"; + sha256 = "b6cc1c4cbe1cae43a45f5fe1b2ea1ca6c3d0de7cf2d085b7e5536232c9213bf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "de8d8b310cb4b90e40d15e3a991810eee5f7d5418ce1d2b8ae1490c040c9b2f5"; + sha256 = "069f7428b290da1db567a21ae0a5dc54a0cea3ab0012248658d3a273c9b45abb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8f400d8effab470e0823ccfa2fe1ba9f49422faebc576d9775a8194957b4d97a"; + sha256 = "a7ba3abc8eaa5348b47b287b98961506e87c40740c25b88e0da611153e95f992"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "de78ebc094faedbb79b8b3c050dddd8d89cded9d7f5b8cacf96a8ae0741ed5f0"; + sha256 = "ec46b6e6f2c852272dc5247053a55797468ba911dad70d4b1d927465ddd6ba5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7b46ed0c449eabbed031a6c944c725e20eff8560adaf579afc386728a6aa078b"; + sha256 = "c401224b42efadc03055787bc20df523cfbde82b65d1b885a0ef6ff23bed9a21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2d51003f43ec3ee6a4891f65d9b1c248bae86da174c997d5cd47b779c403ac3a"; + sha256 = "323f765f5db4ceb5dcd167ccb4c997bfe820498aa2249a1fa2557285a1f2ad5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "18a3afd1e3799ae4af17ca288b3ca2811437d752851e3043b6b2d506db2e1c95"; + sha256 = "053e095300c9c1ccb3d8fff574aff799c40215482cb977087255d69dabf9362e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "62acd5a8e0eefed468022331f217cebb7e59e629ca8b26010cdd345fcfd3d50a"; + sha256 = "946d5de91994de14941bbd9a4a1ded228b97eb76d503c8aeb164d1a718758257"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4e0ee6d697fafe9b855f3112ce745bab71b53c383a181b94dece0a66589604e7"; + sha256 = "ed084fcb7285e047548c0969914bc43fa3572cbbb5faae91dc85688e2de77a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1a6ae8edf5732a766c584bc89b7d51b97ad491abccf59cc649db8f250908ea0e"; + sha256 = "58fcdd5fc46f80aef8a736dab07ffce340175ef07845a3c09da0f7056b30df3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f9a53290d295b9be23338bb7b2e6427f75e048f04d0614451a8a23352c286264"; + sha256 = "3049e29781a51f1e9c1f5da7ffccdcc52b71ffd5e7e068a17b364d7b71b91982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "99261f267895a39fd7ddd376c87fe1a0dafd1c18467e5fefe17419c9a1ae058f"; + sha256 = "10c4764716f879429754d9665f439c2b23dab89c9a1d159ed229569b987ccb26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4c3d5200221d7d7bea5e9263329dc216bf74d9f2c822e1b626f8c051262aafaf"; + sha256 = "a46fbe8f8058d9280d28412bac9e3172d9554f0da6c5f5bfc97258e15bb1a5b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "16a4857eda94f8f561fe482f9e21ea53c8a84404d1cf7d3c01ed62a6215aa95f"; + sha256 = "a99eadaf1d78c5afab26f951f3ee69d49326bac0db27132ac931651a2fa7eb39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "12171700aab404bf48914952564a0bf862c816eff294885dd441ca5f68a48bb7"; + sha256 = "b7da10f47cc22661606c3e2d7ce1885a4b6a5aea42ef7e17ec80766d9c5d92fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "636950ca09f5a406581c1605370c85c610a6f53bd2e8adb4987e4ed7dabfed7c"; + sha256 = "653bc3cbcc3145ed8b93f3835486f2756c51318c74c8ce3006fec19420b771e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c7ba5162bbd16ad181d19ea42d34d6182c9972b208c98a009b301bb27c865357"; + sha256 = "efc1573dd48edebe52a4ef241132715db0a41b75db7e857f3abd0631fc2e5d02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e0cf100f60f73cb96c4ef942240375034c792036608e646a0412fb18179b4316"; + sha256 = "a856f24cfdc51898dcad5e2ccd9f9bb406622d33daaf03362fbabfa11893b413"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4e2c43ff8dd482691190cdbee40cce73540f066b777e3c345acbb4b1622eb166"; + sha256 = "1cdfb66a7616eefe00025f70f1e5fd317890a141e5495066971fc53e3102106d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "de92cff3604a82952e49e04777a098cbe7e0fb991a5253e90c66df68f02a598e"; + sha256 = "c8a127fd0bc4edb0eaad1b06e32e050ffe1df11ef657e05d89de3ec97f8fe607"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a88e3919ea3c8c29b1050e7dec608e62d986411fd4ae3fa8dd38ba55f9dab1f3"; + sha256 = "6c4f66d3b22cf226ff9fbfd05e0ce463d80044bccf8228721b5b8cc5476e8d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e8a37f0ed391cd8b7a5bda1b4a492a5fa0201e06521c3c4863df8536c4c2da0a"; + sha256 = "08d7eab6ce8f18abde13feab2ceaabcc3e23652730a3ee7dc98d8c9234043b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "284a8064fb0a41aff769af21194fa2359a951dbe2134d6415d40a41d4a5636f0"; + sha256 = "e6fa1e2b5b3d0ce7586fba3c0d2f9c34514c767bae4a5066052df2bfb511907d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "01ac969a91b8d778ed08bb2f58faac842c1c28dda40ce8c0b90b40575658ace9"; + sha256 = "2c6e9d6804839a525925ad29adfafdda06ecdac1ccf034a2afbcffd5d13dfa66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4348f3da5b2b6ac1fb2fe370d2a4c820933c5100baf3c529fcde1814e32f1fc0"; + sha256 = "f3172fa7c4655496565322f717f176d908ad60d97c99692a92bfb948186d17a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e55e104417153e939c20be42e6307dc36fec843e9170441a3bd6f7d205111f5e"; + sha256 = "78f88185772cf164bf548d134b00d602cc9cbfe88a5b29e9c4a0c93f3de74efc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "73be90dd466c418f0f1e7cd231234823c9aec4b37c73d419c272d5f0c6549408"; + sha256 = "15f31bf52e10de228b50be002deddc1cc89ee6a882def6420d1055f021f75b6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e310eb44e199a44f5c6dc938c5278e0cf5a57b0eca9afe93947caf124499a512"; + sha256 = "b4412fe101e6de2ca6f66d818823e48e337f06490645bd58455c6e4f9aa6723d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a878f821fe66613200a69619d26bebeb5abd6e7a512f687dfd939ea7b055117d"; + sha256 = "420aaf8816745afabe98906716a8b23d0e0f84de677538a102ebc290c0f57154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a485ef9d3785f4dc8c9ce88287f597c550a489901b8c48ca9f760d8984c6c385"; + sha256 = "573aedef6185562efcb03d11e0fe2c19f28f16d593f598b529eab5c80648d91f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0ecc83a16278aefd627e50e317ad426d8bfe7b68f4633941e6bdbb20e0f1e043"; + sha256 = "13a4fb70bf63f3f99321998e6e01a1eebe745eeefb33848b345c2020c0e8befd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "0de3848f27c6be45f54429cd9679b19a661b79e857eac8c4852b511857a25395"; + sha256 = "8daa190aa592e6e11fefed3558c3f91cbcee630e20c3a452ff88d333b483885b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ebff08a86bfdb646c02add5e9226cc3f09e096d684247c1c67b9ca6faa48f33c"; + sha256 = "21cff7fb1234defe7732e4e933e24cacfe27b782c37c447f079662ddb6a58d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8221220edc9041f76a493feb7ac3199d93590c2a4145fc1d7e62e961188b3f3e"; + sha256 = "4f9fb449f2524d47994fa17e8a561b8706f48b36566cf36c39b590a26b04ec55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6f0b612c589ea43323dc8534111808cc1588dcc8dbda09cd4c8326ee513af2c4"; + sha256 = "f9fedd16f2ddf56c8be38579b29ae2c09b4e62228674decb88475be72eed93a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d21cb5dcbb5a6a290d83f96ab8fd171254f54cc8586b0513689d30fa059a7555"; + sha256 = "b62e425beec561b02a273e2a432eec4e857683ad83295376e902852245ee7b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3cf9572b76b5bc627130e27105ce39bc51e55ba0446b4ea867593d7c36b546dc"; + sha256 = "ce56109695065dbbc78251d436d490bccc895a1a668c3507d6231f71a1046ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "269d9c9b50acc393ca9daf4f19404cf63e2e792028c26c03afb992f67628bd3e"; + sha256 = "38451517de283d29f3147b41b1438c99a74eecc3fe56c042637344585bb4d8e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c1d304b0b4a7b5c463c07ccb982b16a0265cb1fc114ade7bc4b39f8e9158f5a3"; + sha256 = "ab9d0993bf83de703245b62fac86453c091ca46f2b0bb3e96c8cd1be30fba295"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "17ccb256c21e7f7a0851a980952cd5cb006a9d29176b40f420b0002017748da4"; + sha256 = "8d5d39a0c363817c4d728c6d6d9cf215d136e60ea989a0578cf76930f5caac5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1ecd6d4a20e74d1b3116602a4661b6ea1d1e70f786c88e1452a61230125d4ca0"; + sha256 = "e1b4738410bec169f0947c2d6df5048c3c1ca51f632a2a94233be51963bb0947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "681857e16b6767b0d66e8d51423b360cfeb8d107839ad52cbeecf1e7003d66ec"; + sha256 = "b950e0e6fbb707f4c0dd70b491b100f890255077ab756af92d419e0d0518cf27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3122fcb6638c00f489c6540c3cca4312dbdc5de5cc16351746e83c68d02a45ac"; + sha256 = "e01cb86ff2b60435d5717dca42e522c5a4824c09486067574cedf8de09d98064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5e4be58a4891d7b1363d57fcb9ad67e5d1379401cc3df49a5f9ea4fdf71495fa"; + sha256 = "e388cf188ed66903c46c0694aac5725ae1f2015ba3faba4645277d6456719721"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e904a8e65e8637d01376a08908bba94f437f952eba13a68b81b0a40936044e14"; + sha256 = "b6cdace1499535a36e4573914b49a2c3e4ce9cffbad250438bbaab78f3dbe4fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f5e383bd0268098f82791079324eb1457298d95431d497adbd6023f12c762932"; + sha256 = "d269fe06dfb496fdb6b9ce50d7ea4c9064e8070bbc2a47e6e6641aa79a13e772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ae99c4ccebc0b938ebf2c20758a815fdeebae0b81715db79d8385d6a649bb6c9"; + sha256 = "0c6a0ddb0937c59ff5b88d09ef291e685cb29f8435b4fb6227eb0c12b82d20b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ef7ab3d8b6b51d22f0f30b836024212332aec6989684b9a22a4f045662da6080"; + sha256 = "efd0afc4e2ce06b094a2c1fb005c246bf8dad02fa9b8e2a0037e6f88f0fccb19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3728cabcbb46393796b5b948daeb5821b70ae29a8571fb5295faa40d9a8e592"; + sha256 = "29ef8698f0026dedf638fa32a2ed32d0014e131f41500969d271ca62c38f5cc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ecfcfa573fe215d94e48933bfb276f6dbd573c92a062f4f3ec1ed83ef0da83a7"; + sha256 = "244697199ae0e2895f242c64bd6f23d641deb124950ded7a0c0e8d1e18017636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "37558cf0fdf41c728b2a22fc2b8142af011ef7beeb924e08de2400f29b2dede7"; + sha256 = "77bf85d57fb887f5f1e0073daf09807286e2e5d835ecd9400f698dcf0108a949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "29a156bac1d7ffe10d05690fa3a82820cf246450ef1a77697e4f7f346c9eda13"; + sha256 = "6e18fb3773dea1a99c9ea383868a9db07e2bf2a0ba30b9acd283107a3b557b17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "631e34ca2499d6767a1fdc7b944f08841bdcd9e3c248f1e4f0572465797e819c"; + sha256 = "1be4cc0e4a2b9c4cd00813cade9b09db97f3cec3087d103c0204cfb64bceee12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3500810a58a0cd5192982fc5536902e377458589faf0e8c978425ac2fffb19ee"; + sha256 = "c18cf7a7dd09718fd59457e8eb7153229061e4962e29abde5e83add456e2f086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "979342ef754af3751a5466a5d54b40291f87dc8f084173330b2e337aec84c516"; + sha256 = "d6ac7e4e279ce4858f77cf3613c05b4d6dc0ac0be4cfd66aa880b5761f9dbd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "55fe1b0bdac8f8dc37acf3159ccbef78e4054c499ac8df550b215826eeeeec6d"; + sha256 = "b785f4a680031be8ab963a66df4d61dbc54510fcd400d7e061c54e4bff554dd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ff090da1c4a6d6dfb12d1750dfbf1f37fe57e2f5f93250d30851da215f6daefc"; + sha256 = "69ccaf431b505db72245a8a6bce287dff88993055cfa3bdafbb31ef9783598bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "67027d0efa86c8fea2d27821a99a30e3878a9c478d9f26af3ecfcbdce336f896"; + sha256 = "d779e8ca6fcf77cd4c5e0edb4883d0d28dcba2eba456de9cd4216d96e7aedb03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e7c2dd2447f157a2541540ea24d0732dfa0dd84b116824d87d7bae53a572883e"; + sha256 = "dcedaaaaf1d9acac61fdedaf893d288052df18a925f8853722934ef54e92a71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bd7dc68d840a6a53a525a8a1229e0abca8aa2af14bee6c5f7198d877f3ecab1c"; + sha256 = "b761e7d712a9ad951a00ee73f36eb5a764faa1285ce22af168e4dbe1516edfbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a21599535668ffe96f3adb56801aa3c8b5aef40ce2998fde430e34cbb4898e0"; + sha256 = "f640b0ffc029f473c3638ec8e08884997533d087cc8590a35458571403b5396d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5f47de337347f65ba478c48c373d12befcde1b86b99102feb0c921d149541d2a"; + sha256 = "0e56091cf2787215884df9c1dc0e2c208021fa99088d0dce18324b18b0b57aa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4f11bf8857f65091d43835c4c1d16097189e184e72abd2dde6807e8b22370f8e"; + sha256 = "39d1c2ee79f1434f263ff804122d9dc20744c8c050513c95c75d7c424a5325c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6b426096f9a652e1eca190320fb485c5573c94d7f7558dc70f58b6c49508e5bb"; + sha256 = "09544d8f51134e5f74c5d90b98844e49ee5b0be7ed5c63e2fa9753a08cfd2600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f374d64f64529238f867b76e7e894065a32b75b2d669787f1f7285f23ffb653a"; + sha256 = "c76d10c0f9036b33e5e0048fafa7b4d8571af5e27f25d7dc92c336ffac2726da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0806aa2abdc643eed084e7764acae24ee7da7e01c8482b35de5af0cbd809b9e0"; + sha256 = "c85152d5ba80dc5a843312da61aed21834257bede5019b1042353a7955ef0e35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b41a39b046956ba4971c4ef163d9da6f7ea6b70f2dd419fdc278995bdc300723"; + sha256 = "52696aed9eaf8be1994c88ed50925cc32f8139aa92ed9f9e1ed91d8c01468e44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8869e2fadeeca2c22c7732f22cd9709d8da9b435b6e4f9c9d384f67405f0fc76"; + sha256 = "e60a2d3079cb76ce879cda5d9c67ca33938d501c3ceb517fd69b58e6f932bf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3d339e3dcfe1ff4273d0a35f1177f580c8158b6457add582cc23f67c00676e56"; + sha256 = "0f27a6f422d03c65879233a22cf469cf287d24d7c250dcea2bf8d845af303bd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ed129dc3258a62a6e1f02b881d78b2d6348b95b99c2011005644ba484968e3f9"; + sha256 = "639027a3d48570d8bc98965802f9b7661d545ece751ad1d734e7e303f8649962"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0691ef7be86c09cc92fbebc431668d1eee722ed85179a068ab3c548cb6f50058"; + sha256 = "44f2a552486e6f22b111e793d0e69a67e635929f02f6f3da814dd2daf22210c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "86629f77d8092ccc4ddfbbfd2613535e1fb3a76e70c10fab46081a87cecaffd8"; + sha256 = "02e56e76df00d39b0a8fd68038a9e8c956ceb512867d453f47209cdb9ce65597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5225e99833460c3098057602b82be9e0e52f2b00c060c29c1ca7310e2dec8384"; + sha256 = "2386378b0917c770b419ea6561823ab0cfebe36c28a36e7747c47fe68201f95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0d97b86b2b6834ae518820e83a0f4af5318f3eb8848ca69ad4e3cf2dbbc56e6c"; + sha256 = "382c77faf5501c3f03c626b1a8c99bbbd0d60cff39ab1b0ed33c7a3903866d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d44a9db9a6638a6c69c7b4ffba024d5b5028407533eeab387c2c442f73078d47"; + sha256 = "9db254a521cb2185c82522121ba5f7d75a819298abb3c301b6a8b06007d242da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "df47ebeaf3e3eccfa2b483e46ffc4f7106299d62337923964249c2a7ee070a4d"; + sha256 = "16576d6924c772e5d05285a8a9367e3cfbe407f26f96c499fd829529bfd3db4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4be5b5876f032e09d87c90efb9da8f168f722b46f71adc0ec036c4a1840a2795"; + sha256 = "e26dd072353546dab184c4fd527525bb23201a8ed05c3c2bb672cf5a3da2e776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8ecb3ec4e9387647d3361345a420574887c74ca8bd38f723bea6d8ba4b2f4c81"; + sha256 = "e785cc2e7c9abefcf9b4114f778def4789635e1bd0f354082ba1040435d9c4f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "15483453905eb6aff243af3c536e6d73a88dcaeee4363e829c30fa3e2e9bcf1b"; + sha256 = "7debe05c2c0128f6a125c627b26e441547d4da485ab263c5b5190cf5cc04b3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "991445513ebb294c2bc8e5833e7631b791cbcc72ccd501ee883665b3b0b62ba1"; + sha256 = "6da5b56b5df3fda1f8ac8f35ed80a0150e66809ab4ae18af8e114a7e45bd10a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "036e8d167fc43d940d19ac8b90f4e136f264f16fe7d012fb1827b10dd47d8442"; + sha256 = "e145c6ec469038e9cc2e195770fd5eb467bc3859c465d9c570df06e1af0d9532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "056ee174fe2a43aa714abe4e59521d2f040fc326cd9d4d36b8ab2676fefba24f"; + sha256 = "d95b7f7aad0d343bdfd8814f38ea59ebc277ea85426fb447173b0a1b4efd9a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6f30edc15658ae9395037751fab17c115391f22d4e2560945cbee436344aae92"; + sha256 = "def309ff0f7916df41f34ffe9ec2260a0738da4a2657020641d6d03ee2faed93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d3cab8f98f1011b94c8b887db82ee3b64051f03879f83594113a0534fb7a730a"; + sha256 = "1dfb7e8a36039e5bb434f1273cf9356a3826444f0f6b058897d16d4b9b0d8676"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "969d9e3ddd308b96fe6475b04e0eaab162aa89f98daa9f921b52a2602e95c93e"; + sha256 = "1c3e77637bba527e9a229665fc4a4921f0b26e05c14e5257a0b28507db34f08d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "874a5cacf1f6025889a4fc0961b8c26f78a56b403e76af8e84cd6bc54de3455b"; + sha256 = "d54c2e3377e75dea8400d9b5486259f9be1158e44f520439912052bc2097624a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4d369daaffdaf1a28d940f98f3f3d4c3936c5ccb3f913c3c1f0233b4ee448da5"; + sha256 = "a91f89a416dc77cda507aa9a1bea653f48249f55ba4655489a4376ea92cf066c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f5138a6569f4c8779c90462b3165fb7bb2351d48e9a81daa88d909e475eef2df"; + sha256 = "ce38b5bc0b04a1bd86e2f5cf345c25718103d347803eb72d46f1cb90553695be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f410a1786eda2f9b7bc27e30c438f4e0a090b436b871c0614f6fd871f4eaa2fd"; + sha256 = "201ec9e0bb4058d7183024545af8eefe0cd3505fe557b2d541d8a7330c2797fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "60aa12adff74ff46ef37141293acc39b4592d61512c9db0a3745a8a41858ce67"; + sha256 = "997a9884e4669e6e883703934e4d747f784f38fb374ee43c7d30f82b9462bb2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2187efe8640a541ab3b9c11583d09c977cf3af44c280887b03c5f4ed05239439"; + sha256 = "fb97cbf935b6ae92c8c17be640820e4be73fed59d385bdeb2435ac2253c66651"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1d3a3f28c0a99d56dccd1fc354a56cc1374f4f87a76760b410b616d0128f83fd"; + sha256 = "d999259f970084c684cf543460efc6faa3677eb839c67e9743af24232d81ecc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b2e0853123208160486936e98ba978a7d509d8d4e0500c89bbe522ea69a4ff67"; + sha256 = "d9bcf799f9d744ba94197900e2032cbc42e4eb3f5ee2d429ede4e2ca47c45d63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "43e9ca38b6ef601d7834b2b951b4a14394a6442d0da1d5045b83a5ccbf7bad40"; + sha256 = "69e55dfe9e542f9c4e0cdcd75e24c346ac565012b2214ad99534ff643d5b1a9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ef20972394355ce52307056b94af6dea64a3f6b1cf1887b3796505baf4645fde"; + sha256 = "b10c9af0a38a7cc456d7392dbb4a01a964e68fcaf963868011ba104a01c10f59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ec106d9e5ebf26c698106c0b751a54b1af77959a39ef47ef124433a3b610f146"; + sha256 = "114df4baff98d81d046a069b6a3271f3cd385cafff9681bb1bdd988a4b806eb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "19b20479c0df3f63a0d516bfa4521f0c7cb81e7fb9873ad801a6f662bc7558ab"; + sha256 = "79cbe62f30dc117fb656db52ba61895dc830f2f53b8f02edb69809a8fdfe4722"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "200b9ec8da001ef900fa77ba7954ad67f68504e29ddc78a389847f076d9812db"; + sha256 = "babe5ff8170ac703bc95db0c9b54e6c05c12e198dcdd42f0fce9eb2b2a366606"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8400fb463705221d80015a7b69388478f851231618bd3be0d9fffcc6b35783ec"; + sha256 = "a4e3648681178444d8527539523fcd177741ca74a11cf608ae7cfe9608ff46d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4fee1c00876e71f6d8fe8194ac48dc56bb8ca6da2e5ad41488e1a99e3c65a32c"; + sha256 = "42dd57a33216a86ccfaf915dbc2513b6ff9441ff5820cf51b0a97bdaecf1c00c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c7aaaffd7539351180240837e1930b8303b1eb9d199a1937940f80041aca1632"; + sha256 = "8b296ec5f02e7135209f83c53bb4d18c652336a4068b17db99b10dc9d3500744"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f54d11032e4b929e0d283223744aec809c46d66a875dfa9e07fc2a9237c5edbc"; + sha256 = "85829c8e7d52e7e5879d52897ffee0763f3aa03b754647a4d4c0e2d59cfad230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c7e1da38ea4886454f252c656bc1fd9809cbbdbf06b159cc40674e9e03ce0275"; + sha256 = "89f0205a14d7b97c635382d3e2ea045103eda9df9f0b7184e7655626b34e39f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5177db2a4e0ca4bbdbd9d7e3fe5aa5785f995df15df4ac4213bc22c2f9380a59"; + sha256 = "f9f88f5d24d5edcd157a030b482c50175bda9a9d4d95499b668227438045b6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0e5d27dbb6e1ed3bf87a60bf62bc90beeb1c503fcc545b4a22767fda0e8e695c"; + sha256 = "7da0fd946c235948ce659947e53f389955e12a10251d2ad564ba6808e13aee76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "54250e1742ebd3cd0db36ac68f5790fcb803a4b63d77293905727922379c84f5"; + sha256 = "9ffa05fc839c67e5c709b6203627b75b7bf7765e5e52e7151561ae0ff36d43f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "887c2cf008099abfd6cae59203f660e71618ad63d8492f0f1de072debab84450"; + sha256 = "ff45d74bd695b8677ba76ab1cf6a7726ac08d7ea0c6ed6f705dfedc536df8112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c34caded0c323906ff15538694b37e3c91a00c731d7f4017434027882f160086"; + sha256 = "9494973f7facf05b5636bce50a39151596b827a3444ce80a601c66e55b488af0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f66ebec1bc3783cef6c57436a3f9764b52942f2466195fea8e5435275a276411"; + sha256 = "ef0b115274304dd0925d643903f15ac7d6c26281ad5ec57c6b73a0a0beb97486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6ac73b95d650bd7f8454345a041d7f9a294aed2cf249d09ab726eff5c6df0036"; + sha256 = "79c7211ec24d7855f890cd83a65411302f0ad4296ed19fecb86969e62ab6c01a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9f436cf3504f2629cbec87051539e00782c9942aeef4a03fc4fd44000dfd1b93"; + sha256 = "b4fd3ba21a5c906cdeab13d4db78c4d8c43dae758211d8edb6570d49561b9f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8759bcafc09fd00beda7f9795b49675d2dcc153d96020198c9c4117c30fe9c0c"; + sha256 = "cfbfaffe54246e4ced8a35edd67b5e28567d9d61ed4fe867f11fc479864e8a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2c5fc7af589d06e2bda4de52b6a079b4c8ac9287b71b8d86a6462dd63f64f62c"; + sha256 = "74487e82d428166a870b0593ea7be3de9b912132542ff98bd3276e1b9091fc21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0f96f8938af715461ab1267713d57beeafbca389aa291931c1712cfee375dcac"; + sha256 = "004d5e020a627f95572f2c52bcdbd0ef52b66134c5ad64328c810ba2a910cfba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1a8f36abd3b638cb4aa82e66e4dcbb13a56c0fe967ae3187686217ffac0c37f0"; + sha256 = "4102b176aa98362b3ea6bca76bc5ad3fee3849b833f192d55c02ec72bbd7fcd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "01b349d1656b2cc480e22d1a1a4eb376ae3b0be65a4b64d1cfb95e29b8e3a7c0"; + sha256 = "acc2990be46dde74e93acc0e20d5c59acd2ec9b0ca2d3db1bc641eba9e17dd6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4db2f4df874ebd5914ac143c9963e108d45c9822474b43d32b7a417d9a0c14ec"; + sha256 = "c1a286c4369f13a6df8dbbeb9ef60dea11d36d38e1403d8e9bb8387fac2226d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "fb4f87a2f1c735fc19da371872990a4dcc76ceee2a0f6776e55b06780795589f"; + sha256 = "35805803b8487ed6f28bf8cf6ffba764c479cf0eb11bd418ae2613831ede598a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a9292aa129c8dc538014481865f046b8dbd069138a4ef73743137ad609656174"; + sha256 = "deb2e23159d458e4e2b030678075d793a0d68e87fad38473267e7e7d57939715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4da6f323d2cddfd0a6f85f61c75cae777668cfe4a88a9fae3ed6297702604e35"; + sha256 = "bb0c6227d2903080645a7c7ed0665db6922beda6438d7b82060d890b9ace2a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "44eddd02a18b8e419d44bae127a4f37eda740f63fb7524891f3a435a6430f64b"; + sha256 = "b06680a771d8a347c25b65a56cf76bbfa1294fc8c7a2a303bf92175aec1e952e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "aabcfc84e1a06d901e29b571628905871248a3148fdfa9ebe1b26995db92fb81"; + sha256 = "0519564a5e34f3c9c9ae9605f520da542bd69f20f9410c47739e30ed290ac5f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8a8b0fe064719cfb088ac61e412c7b1f2d6d66ea523d7f6742efbb54cf53f0d2"; + sha256 = "8a5d4685384eaec411a278f92aa2c09f667df430cb65920dbf4f2a22ab749b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0bba256df30a3deeeaf5edb946fa535b762cdb42232f8e15f3d1ce49743c121f"; + sha256 = "6083bdf468dae23a0cd69506e04615f7312dfce6ee0fad744432f316001b23b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5ed15767967d579d6809fdc0fae86f0f42b9f8ec2e024bd40aa151147528ccec"; + sha256 = "42ae9e4a00b8a939a934505e5b4898dfc5edf2ef7c63451784770ae8e942dc3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5e6f78700f74229fb3dfea3b408a5ac78f18892c6ec407bd85017467a5687ba6"; + sha256 = "2d808b21afc4b1af9ea72880acac4c017566e74d7a6635d0a3e9302159961f2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5eb1de045ee119d67e0251be6223f7efb3fd26d8cebc5f372f4513d0928c8a51"; + sha256 = "799099d98be61d2ef50988e4a0dcc910a3d089c8b1b156c340bc6f306f0c05bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "78b467f1ceda9ef4d181d5549855241ed37381dc08d4e282bdfdf0db3b0625a3"; + sha256 = "0627104342fa014aa267b4874d88592aad131b8b71ae9da4864233217dac9fcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a708c94b51ee31a40532970d59b2d570c87aedeed24454aace5f6870eaccfa5f"; + sha256 = "cf22010a41298f31839c61c749b7f643f92b792050d62060305284d77fc21b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0095fd3dc0eb4eb46c55ae3b2ccc65bea69127aed00d6fac446fb9c9274f4302"; + sha256 = "588fed1f0dc77c8d5a18ddb33d04c5570efe80adf3e96895b1b0243e82e92535"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c8f052d0275c803da20f62172976b44357861ccd8599d9d70eba9a2c96594824"; + sha256 = "6d10537d9268c509fed6bfd86eb53351b772ea2ba96c0f386d589765b0f1153c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "efad15e6aeb3ad1287cc3d0e3d0daa389faa7f348a002cb5c7f52f812eda8c33"; + sha256 = "4ececc1167184b3a531f8176f4282b34b2f5e2c98f329af7dc67ac5be5efefe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dfff091b8e2f6b19842335da51f4cc7107401268b91c1bee55bb473ab5f245bc"; + sha256 = "2860a9bf015972a38b1a15bfb532b87c65e2edb7b9ea8ed2db8ee6ab03d4e281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "35f3b8459096105e29d87645ebfba3a93fb23412ac7fcc30357f2ebbce658f2a"; + sha256 = "97134e6fc0b07c910f8a2ca263943724e3f5790d62b4f0d2fc697c3d5a15a6ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3727440d1c3fac9b5761e3f79e46658dfeb5bee2f3ed17ec78697d869be7a7c0"; + sha256 = "5b38cc44c7d8aa425e70903f192f2ccf8cf4dbcd40952d0014a6f16c81ec66fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "91808cdc62ff8f8670d3c22acb6c203832471ade8e24fd606a2c00312fc39d7d"; + sha256 = "e5e7db1ca4c8bff1623bd2b78b1d66617510419a893f324af8092de1a9476a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "947f2cb2572e17d04263e5ebebd897a6900d22dbc85196826e316706a8622aa6"; + sha256 = "357410778b50cd6da76d178dbc88efe9bdf01e71895699e1616ef4dff253aae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d5baa22518ee5f189f780d159aef432591c7d4855cce7f1dc4c67d48c69d5780"; + sha256 = "f38359d87aa018b4bd8fee63829a04e7d552c928b945f74c3f2e0ec21524ea03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "25b19eac0ad6491c7285633ad61dab8f8d2833ba011b7aaa8dd1a2d0eca2b6da"; + sha256 = "b23c4436a5fe3edb954c2ddc16ff16756d672a89afed91e0753b6f9c7018e9d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ad284426be9590e9a118c5f151c478d15e6d964beb46312fe7172347783e9162"; + sha256 = "7156717a71e9fcc8d98eb0fd544b5a3bcd8ade7e805e7a2806b3b3ac363e2402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ee90ff4921848363791e0486fc8810d892bf07c448c576bc4c0ea09a6bea8e55"; + sha256 = "5e5b2764b860bf45e5cc738c1d6ce989a6f85b226ebd4ab59d236295ef596a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9cc4ec8d6ac780a0fa8ad01b5b16438a0bcb290da79691e7dbf993033bd919f0"; + sha256 = "74fbfe561438450fc28539c6d88e16e89abcfabcb025dc57aef87bb2aa64bee0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6018bca3d3963b3b6dbed521ae068d15f659b6779240e8ed1f9c3c66ec75b932"; + sha256 = "12467aa41392d7429a91d01e35894fe5bf3d18cfc4091e349490f063e4b69247"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index c5998084a534e..25ae29459f03a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "97.0"; + version = "97.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ach/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ach/firefox-97.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1d02f86f1e903f97e36a90e89af2190c905e2c15bd78e252d4e52f77b347c7d4"; + sha256 = "a10737964c66f46a15ca60c29575a837340e9b967c849809717c7009c3a01c20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/af/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/af/firefox-97.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f82635fa7e2835fbdd998e0a0132c83c5831f5d4969ac8c2840a0b690ccba805"; + sha256 = "a6ef82107f918234c84da51b49bc2018910e855ac4e7e5cc3a0e71f3583140b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/an/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/an/firefox-97.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "cc817e42258c09944108bea46553ebea9859c99884b157b322f78f2550f9018b"; + sha256 = "34f5a0461707feffce732749958f508efd729ecedd8567dbe1387bde5e335a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ar/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ar/firefox-97.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "87b782af877baebae09aa2d0e0ab399b3ad9a9d6d8aa63ac8519fc7767f7cc60"; + sha256 = "5e126bcfa03c79e9ad777d76389a23e109dd852fc98698efc714d37125656f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ast/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ast/firefox-97.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f8889f0a843da8c681701e559bca94ce9bb6db446387cc142e2c4547115b5811"; + sha256 = "931ae804e75fa4b039eb373a38b2f6fa8dffb852e418789d559d9a9c0612c54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/az/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/az/firefox-97.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "bab0951865aa8f62b6aa2b92437fc861caa4c6f2757848835d6523e0677e3bc4"; + sha256 = "549dda8a1049d074887f187689e73c38b814c1f1896752320f2a03f566bad2c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/be/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/be/firefox-97.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "fd6d94270bf1333d2f12229bcf843a43a9b1d9775bc9fa71ce6260d924176310"; + sha256 = "06b0f7aabf8ed42ee6f021bc37abb44029586f5ddd2673f885f73f94c64032c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bg/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bg/firefox-97.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "95a576e8624745e94087aeb51718cb9ef55a0ed3258e06a8f0341ea6b1e993d8"; + sha256 = "72f5e07d24a2810659fc7d5c9a43214f427286f9a0096d602be0edbdb31d529c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bn/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bn/firefox-97.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a27340668dde133d2526607cd67f5216c62b22ba9f46c943ada18b979d8fd010"; + sha256 = "9f3d0376edd2c74b527190a5d53f0d2a36c371484fe4fff1f91c1d03b0a2dabd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/br/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/br/firefox-97.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2f66ff56c261d8b30614937fd7c1ccb3a89474b5cafe9573dab180279b3c18c6"; + sha256 = "befbc0e991718afb4dc5362fa9aaae52a0e60fcac158a666a2b7a7b41eeaf834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/bs/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bs/firefox-97.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3fa9bcaf628cdfe067449e79abe378ef44fca46fcb43ab9a14fa73f75b817f1"; + sha256 = "a4d41ac7495d4d5311d5e03224a1c75a03fa059b6638666fc0622674ebfc6248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ca-valencia/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca-valencia/firefox-97.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "3339e4a2859893368534b9390ef1475d115a4ba1058dcc44dacbb7da80e0fef3"; + sha256 = "2ff1b0f0035374f323fe2bfbacd321394fb040599ed064627f60d24c78571394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ca/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca/firefox-97.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1c2e354248e8bf969ad026a472e6820dd125df35f23b9663aa65090a71af4398"; + sha256 = "6f979602867721179454d2f6286cbecbf0a14aa0d42ba68ff7d7ca751f15a341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cak/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cak/firefox-97.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "580c7fb31030d000bf9f1c807690a4df6d67a37a41c88a2b70d8aee10ed37b59"; + sha256 = "dd8bc5188874f0b5b300a03a7ded9fe059ddf9c9f69112429233f2905a5b329f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cs/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cs/firefox-97.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3be967c8cb22ae11587a48e0e2592097c486a9dfc2b5eb252442d7302cb04d6f"; + sha256 = "8daef8ab21ad86b68999e052114b17b52d44e64e85b8879b690717c4017aa983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/cy/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cy/firefox-97.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "cc1c93fff75ea41e45020ed81d8d68a5663effe695993b7fc34d34c76f1b0d00"; + sha256 = "758d098d80d37b2bf15dcc3b16ad7289439166a3c7321bf815c555d96531589e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/da/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/da/firefox-97.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "34d7952beb7d5dad269df9664faabb43ff94475ef5acb3f4bc726be5f92c4d10"; + sha256 = "6fab3975b94d94809c734ee95cb26d9bcf24af71234a1bc3b8c4db0b97355405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/de/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/de/firefox-97.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "475f14c65678178ef0581003a0a04c2fa3f8904f0261946387dd114a8c03d679"; + sha256 = "1b776d58ce3b1d21580f725b065b164a6fc23e5b17d70025830286922f5c1455"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/dsb/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/dsb/firefox-97.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d20671dedcf007a2d3e2be65bea9a13b98fa33c4cb34181a1996cb1629dc0de2"; + sha256 = "9b9c082e7fe273635b1095e6caebf8645abf3aadcfbc26e098616095d64b2f6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/el/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/el/firefox-97.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "92daba146e93c9dd378208f85fb530d241f4e9fbaebc10670ba67f3e707e8c5b"; + sha256 = "475676b56b462193d6dd50932893b039e6826d247abf2d46a421415bd19a6c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-CA/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-CA/firefox-97.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b7f9aeb6ecd2f0053f2df7e4e7a168b7ac425fb7c91435446d554042b55f38c0"; + sha256 = "8c50ad38302dbae2d6737f6a03bc6127c850101c5f17c8a15b85d157b6b39ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-GB/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-GB/firefox-97.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "99f3af63a1ac4f16a0fbb714d42592881e0b20714c04cbdfe4ba51d1ead81213"; + sha256 = "e48d9aa35fe906f6e6d99eeffbef212730c15a3b9d5a7090dcf99e3e47eda9ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/en-US/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-US/firefox-97.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3d0f74790fe6ff5e38324222ab0c47e10edb31970ed67c6dd7a1c84e7017d1a5"; + sha256 = "a63d28ae61926c0d7447f57d4e6fb514401d560abb50ce787bb6bd0e9b7b820f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/eo/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eo/firefox-97.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0ecc3d02a07c48076549ad9420c0ac9cf692470705ca390051ee5bc2a15af026"; + sha256 = "94394906bbe63f6dd414aa6b0739dc30082128e0e342fd408d33ab99cb01b9f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-AR/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-AR/firefox-97.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7a4a3f330fb00c9e1083d65ded0006e44bbfc2b75f16acb93f49c257f3bf4243"; + sha256 = "9738031b89b434127af39f20609b31ba767a004dc0ccf5d56b965165ab91fb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-CL/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-CL/firefox-97.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "4a2c44c4def2502a5606d4951d6436ff38de02a678a2c3385d0bb2ac60612d1e"; + sha256 = "ceb4fd38b2b81b16f2faa95995b11e760dad4e710cf4435e6d311245bd6cb483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-ES/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-ES/firefox-97.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "31b3c7ca8f3f9bf46fcf6a3cf33b1182cbc3cecd09f4e1741ed9a3e1257c2eff"; + sha256 = "37f94ded6c285c01300ee014f1a55d955a70b980647b8ffd5a0709dc9df34378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/es-MX/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-MX/firefox-97.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c9a2e2ed18dd3b08828cb08e1da038bd887429543e55ce4597a802169445240e"; + sha256 = "b989f57bc1439e3204c912321df33626a9947691e76cb8bd22fb5bdcd77a86a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/et/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/et/firefox-97.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5b929209e539d57d94ff0ce3e2bfd4da41ab06e60fe050e7351a09b91e08ee10"; + sha256 = "757190b1a6de3cb7d44c005f9b23f745fb67f0c247956007f3ac269d494019cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/eu/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eu/firefox-97.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "285dac2db38f2cec56b1bb5c81790dac85f6097de2262038fafdca42680246fe"; + sha256 = "092f0378fdfa3fe44f19fc71543609a8b96a9add6f41324d24edf7aa7b446d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fa/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fa/firefox-97.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "fec85a746389ca7ee1e11d1e4b23f24fc31b4c72fd9628ca2772bdd544ff7f45"; + sha256 = "c1d003bdd9f21d6751de57b1e4d8b1057082f48260a94a732e3a3ae180ca186f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ff/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ff/firefox-97.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "819c604b071e0f95cc3209d6ce0d6e733e4f15dc93a9154aa9b0a63c2b3c3af5"; + sha256 = "af04da4c9528145e7b14bdc5283a41422704c0302675703a84a4bc2b42f8139e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fi/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fi/firefox-97.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "92e242fd2ea40389d0710ce798d795df9509fc0e0bbd93ec69ac29df93609e66"; + sha256 = "e3f7285b7d3666155863bd7d89bb7cf87008b755d34a7b5b04ec63425f7ed6c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fr/firefox-97.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "44e95b2045e407f08be367f17573520ceadbb1198d16f0fc2c200d265f904c56"; + sha256 = "9fa04d611d74ba0688ad7ad7441759015724e61d7303eb211b7f7404603eb1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/fy-NL/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fy-NL/firefox-97.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "abdc4e3bcf9e1d8b0aac777adc55ceb52cfca92e27523f22614b2347b6209ae4"; + sha256 = "0d017580e4847f644d8b4b8d8e90aba0a92f3b3aa436b9de68f176f7f3b00cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ga-IE/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ga-IE/firefox-97.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "699866a4b21d6c0015a0a65b937f784e4d66a24f0560f00b73c75b68ceaa2fb0"; + sha256 = "73c602f8b41a5aefaa04646065197fbcad2e196c94b1d1537a019ebe33590a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gd/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gd/firefox-97.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ad7a9847468cf3dd84f106b712ed9ff3824a9bcd8e15032fc371843b5357eb5f"; + sha256 = "c1c9a41012983133bdd743e0afda81d7c752b04ac2cf73a7c4daa662d9db91c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gl/firefox-97.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "efa8b59f8b7c7a3638adfcd31095dff88ba24016b8891f7cc496e9f286259559"; + sha256 = "8ca8b2e7a3549e1df2aebd86bc5192d6ba0b14c2581802f1ca06342ffb771ac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gn/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gn/firefox-97.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "e850bd2e1940f755c7eaa1c517972e2d2e7ae2bdf5fc75142fda1c7aad05e0b0"; + sha256 = "10acfa3beecacbfaae592dbce92e72dc220cd27503334e28d3108846ec012e00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/gu-IN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gu-IN/firefox-97.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d74495e5369db197e614d99aefd2b26ab858511017b44c18da668d0a16a69a7d"; + sha256 = "d2ea8b9386be163260d4ee0940dd80c4fa88d235cef7470fe9859fb18b5360f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/he/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/he/firefox-97.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c9889e3356e2a7cd99519f97c9f7053f2b1ccaafa48a3462cd4bb3192f174e43"; + sha256 = "6dd00a7a9518868ce35e92e22951fba8e45690ad19afc297c82ec5d43690cbb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hi-IN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hi-IN/firefox-97.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "3d02c2af702972412cc6923c426fd7235c7dafbf3a95f2a0703abc002813ef88"; + sha256 = "fb583c15e2f5dba0c8c19c197f4e4f83c8e59ebcf568d3f52936bbbd4733830c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hr/firefox-97.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ac6eef6986bfea61aced2183eb592b2ff1d033e4ec60dbbfc4e2301947b3d40c"; + sha256 = "07d6ded87285b2192f3668cbdc74b6571e708bab6d77964aa8665f1940722ff4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hsb/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hsb/firefox-97.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "719e01cec8be4d16b6bef69d45bbe838a4ca8c3b84a1340c88de48511970379e"; + sha256 = "fcbd4351ef9a4c3ea3bc290bf17679f900e73339b63d10ccfa2c554c09497bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hu/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hu/firefox-97.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3774aee9afd211b50605ab76a213d36ba6692ff695fdb464ccd116dcb0a64d4c"; + sha256 = "1fade975a0ab75308b281b556c6980e81fc6a4c540746142534401e73323d9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/hy-AM/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hy-AM/firefox-97.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d27c4148627a2f32bf4ee900e50b8f96805deaead292b4ccc33259c8fdabf626"; + sha256 = "ac7d7124aad964783b65d9d7de037005fde865a7922cf22b9e07f44f36830032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ia/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ia/firefox-97.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d1bd6d3f5c78a3ec6e7caf25cd5befe1e35125aa2456431cb0487d968375798a"; + sha256 = "cda3d476e07f15cbdce88225d0b7fe785841d56327c63a53920dccff9ec8bb4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/id/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/id/firefox-97.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "325af486e9faaa9202d013dcd9a6fd4e0b04237ccd54a132b79480475033e936"; + sha256 = "3bcd1f707740b56e345c34dcb24453d33d9761eafeb9b3590d5e74e4558b5f33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/is/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/is/firefox-97.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "2b980ba98d7edcb737bb47d3eced8fde9a3285e43e345a52fe0d375343e841e5"; + sha256 = "027f46db78d1796fa3ddbb3ec0f823e0a9e3677ca1f7e49eb1b9299be91c74a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/it/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/it/firefox-97.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b7f9c12f31e7306592a2640582b327c12f250f3237aed83848d37be0dc6a2647"; + sha256 = "7332a7566fb4f8748df9afdeaf5aa4634dab42cf63f52cc41cec13215820afa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ja/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ja/firefox-97.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "7d535b695a0adf5a6068c33c03f0ab589fb00e33192fe855eca3953b94dd7a27"; + sha256 = "c485ee96c2e6e0f0a508c99b2189595289f3858464ca2c48301ae78bbc59b299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ka/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ka/firefox-97.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e712558a74a73600cb751b583be37294f7b23053b560bef3ba8468baf8614cd4"; + sha256 = "cd5b723c422e01d70856dd851337d719170585146029119f1490feec1d8ee188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kab/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kab/firefox-97.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f46c4c90bf3a3da559e7c4cadc9bd6fea92dba6635058bf82a276b1483640951"; + sha256 = "df540b3e9207f174cc6a280813d09c23abea18c1af540b9bc7e1330a4920be9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kk/firefox-97.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "379a45ae1b5f6fa2a039ab2bfdd342d40c5cc6ae556bd6f7ab54b79964533948"; + sha256 = "1d6ae6bdfe89de470aebfff046d0ddd12dc85f4c7b9ad8931b8bdb9da7917906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/km/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/km/firefox-97.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d619c47406d024691e63657e11dfb34624c01f120470f1acbffc2b39ab6f95a8"; + sha256 = "1a5fb9460b33db9f32000c96ccdcbbe1d2fc3fa177b2cfaece1dabc514e3467c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/kn/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kn/firefox-97.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c058146a99dd06e71c61e780a232efca883e181b237ba03d0bc70942181109e2"; + sha256 = "3c5766b4c29c699309cc8191fb1aab01852db29467c38ef529704c54d9087689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ko/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ko/firefox-97.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f9d5f7d11c8ac517fc7f19b7d1c3dbf325a224c3a8993c6a91879e0aca05c3ba"; + sha256 = "08d9a5999a9b10fdaf9a386c9da99ec040200f2f19286cd7ff8e26de95955f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lij/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lij/firefox-97.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2d450a105ff42bd396df813438085b88cf6a4fbd7c59af05be482a0e316e03df"; + sha256 = "925ea94387cf5f07b053ca5b25dc2a50b0ad9f6372509e91116fb6d20675204e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lt/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lt/firefox-97.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ecd64fb4eaa169e36a36e039563ecc5de9cf97f655fffce496373dadd5e4b49a"; + sha256 = "f062e05e6fb52a42f813428be5be582dbb24b46f3379aa0975451bd029134c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/lv/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lv/firefox-97.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a0fcb7699d6b76165b7274b2316c192dbd933ed39349148882a682c8d354497f"; + sha256 = "ca08ec6516a07aef0404716b0111df6941b9b167173079397a013f93db23e8a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/mk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mk/firefox-97.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "850f5589b9d4951738ed1d32bf14270191bfc34f7278243c42c7a745ee893e62"; + sha256 = "3ddc7afca0f7030fd667f345ace3105eef1126332d18f20c7221596704eb1196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/mr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mr/firefox-97.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "bc13f72cde29dd1ba5e770b929376572a9cdd4a755fce685b44e34af757f240f"; + sha256 = "684d22d5841abcf6c107106966568e6f7476d15e1dac80447721836c4a20a71b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ms/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ms/firefox-97.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bbb9fb8ae7548ffe1e1d982925d7b3933fbcded03c5bc31df606282c4d4f538f"; + sha256 = "9630d0e0b4466593a59efaa383d6fd0e9c08887959e0b851f03aeadb5c64d43a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/my/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/my/firefox-97.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "05f5c5eca3d02480ec61b42ec92bd71c9d27a1e843439f527fa57ba7dc5762ab"; + sha256 = "2bcab7bd7e35474466c3b587991cd8a62a18a30c14ea489d9c28932e1813db5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nb-NO/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nb-NO/firefox-97.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "715a82164dd577d36100bb28859efa1468e7213993e622eb97a44c4423c5829a"; + sha256 = "d6c4f2ce45109e37ca35c0fab316fc31b849f256f4745858dddf519b27fd8e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ne-NP/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ne-NP/firefox-97.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d7c55ac4e78309718caf4b1e911999f6d4a1558b885f9831747d4fbd3bffba55"; + sha256 = "ef96102307ab270615166a9feaddf0ae047d2c8a18d85015be7f388d00ad3cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nl/firefox-97.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6b539b2486aa1deff4b99828a319285ce73277c93bd863777f88b4a906b83c76"; + sha256 = "4ea9eccaa1c7d354cdc199b33fedb6a7ed07400f331d33357c69ca7c2c654dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/nn-NO/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nn-NO/firefox-97.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "42777f881c86b597f7c39cef1651d65aabdae9d616d8a115a0a993867adba92f"; + sha256 = "59045e5cccac7dbc125e3fa3f8c9bff7b5d8b8b0e8f1e696f5bcd633bf9353e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/oc/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/oc/firefox-97.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "76ad8b28abea06743e7e70a463ca39c6eae94dd406d7db27428246d190266aaf"; + sha256 = "cdc9c76871be181f86871c55bd6819de9539bdcb11450cf3bac419f4bd44185c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pa-IN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pa-IN/firefox-97.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8f30e7f2835c6421e41da2558d30448911d1eb4b84d4d9b076833d70450030b3"; + sha256 = "aad979dbe94c225b4255ff6b7b78097f8a60ecb14570517eddcd7cbbc553a9bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pl/firefox-97.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "107b879c5c34608f1c5aca1cfc3c0722be2df4c1573a0bbc8cf0968742c11cf1"; + sha256 = "1f1be85fe26c4a55171f7114052ba679c405e731b3db7934ee2ac35323f095c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pt-BR/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-BR/firefox-97.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "83f52f48d55efa4b52ffead877ba7fcf69823d136a307d2d84640edf586c4108"; + sha256 = "588698a09d7320027027ace6196f6430aefe315cc9aae745f75568a062d6de6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/pt-PT/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-PT/firefox-97.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "523f082daad8c56e258eb053ba0d2383cbd36a8924b01b57cc2efdaa85292d3a"; + sha256 = "4cf0b84bbb4a5945ea787ca0f3d4da56a12073797dd603be29e408772a70860e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/rm/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/rm/firefox-97.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "798bdf60c52b331edbae3ed77734e1204696ba18c08b509b9465a999a7707484"; + sha256 = "b267cb45b84b114c266551c4863bfb22db9ff4725c0b6b9d39616e0b01f71e86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ro/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ro/firefox-97.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "811d95d5ecfa02e2f315ac1c6065251d9b7e7f862748a9466b3464c02687088f"; + sha256 = "26a6ba053a270db85fe008f72c23b905072a84c27815131d1a3af90fba0f3518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ru/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ru/firefox-97.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "dd9060448a645c7395d2abb75b1b6c0d33399ef7fc4ee7fa2474e4de4e5cd5ec"; + sha256 = "caea6755305f8f077fc82895343c01a7e1eac0e1cc70faaa1915bb88cba01344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sco/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sco/firefox-97.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "27f119009eae212234ce78dc77d66e99505c1a7058658b5cfd4952f5bd5b7732"; + sha256 = "eb249baafdf9d54b61e923bf3f23d2f462d5026f4b81bacfadd713bd569d3255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/si/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/si/firefox-97.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "73f37697e72ebc8ee72583ab2061f10dedd09a7c91dfcd00f051f9d372e10700"; + sha256 = "44a98bc22309035b432c3f01c5f87d469df3f2bee44c26f54f507f10b7098908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sk/firefox-97.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9aeb7a0a38defc38e7483c1fb6e939421cab6704dc69dd882b7dbf2c413af246"; + sha256 = "a81e8f814a2816ad95414c6e43acf55d88e4ce0757de14ab163f6b622fc49d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sl/firefox-97.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ff2020d595daf151fcf1d8c20614b848b8dac981f7ad9b9b11497fd3adb94a94"; + sha256 = "a2b9f1dd69a9a3fd4b5198280462d06b49d5c63fd101865707cac6aa6fc9581c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/son/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/son/firefox-97.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "eb758e0772b33a955f0a69e673dc53c419e83b29e7003b90161555567bd0c9c6"; + sha256 = "0033fcff083aa29a738799cb9bb3d32eeeafaaa3a1d41c422048c89000a9968a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sq/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sq/firefox-97.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8cfcd1863bb79e537547f296f08c6e34b441d110e0d360678aecb43564eaada7"; + sha256 = "3614b46f72a142655f58c0577345a772350ead46af9060cd20e8918f517c7cf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sr/firefox-97.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "84246cd93b2762e06af5aee56139484b70bb37dc10d8077c58323bca88ca86a0"; + sha256 = "034dceafc44b83ca9d493f98645bd0ae45fd513f55f20f0de85752679e39c570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/sv-SE/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sv-SE/firefox-97.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b57f4a6ea4e8011c1fdf448d67afca9a028f76c9a08e399919937aaf3cd1bf84"; + sha256 = "aff9dc0399629aef20dff6eed5ecc7664cc8c83b53614b2cd011db6089262a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/szl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/szl/firefox-97.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "71f1b134dc8b363856596e4c0b398641702d37811e84008c9efe36b3722e8633"; + sha256 = "9b6242e30b948507978f96180ec6d7d5921e32657f41fbe211a7c254cb11777b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ta/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ta/firefox-97.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "25cc66d29ad3e85be20a620c40426d0afe65df22f75001ecffec733122006841"; + sha256 = "368a48fe15bc7ed6359cbbba817b47a99a583cc3ce91d2d98f0387d3a9880a95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/te/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/te/firefox-97.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "15dc00d56d31699e3d7089b82ad9e585be5a857b7b2e1056b678b2ecf9c50994"; + sha256 = "dfeadd822000e10c0214d05c75203a6e9c98c4bf20d65377c35ee8d485a2707e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/th/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/th/firefox-97.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "16629550b5eafbe3ad4c9137d3e89225050918dfca55bc898aa001084e1882bb"; + sha256 = "f1932432028ef648897e64bf033bb3e8984100052ea52a9840d000272f9d5eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/tl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tl/firefox-97.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ad4ecfe3d7c103090d8642101543b6e2970fdefb3923afd28ac4f1602c926b3e"; + sha256 = "9436d48c6b56c7b765a4ab6ce20bc12f3e5241691edb3b1517fe27a3a1fab6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/tr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tr/firefox-97.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5d8b1b1dd0ae04869be672f098ceb1ddd3b70be40fd5c09d52006120a434f3f9"; + sha256 = "bf0d0808d6d5f880bf382e9d440013855a6fda82275cc628833fb8cb694e4f6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/trs/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/trs/firefox-97.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f64a6a311034b7d02737bc1ed5aac991286a42463554c10eb96795cd1a5d169d"; + sha256 = "546416fc106774a28b2234e31d5d9850ed4708a2e5be4a4231deb28f4544512a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/uk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uk/firefox-97.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b0e98a5ddb7ec8bce8dd456c6587733ac6bde6f8058cfcd735f10751d4b95d92"; + sha256 = "5395cb322632fc68ef84241a75786db589863709344d5dfa9cbb650bc94c8f6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/ur/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ur/firefox-97.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d6fdbc3111b040a8b4880d81e22aa76abfe45ff05d551950324ffcbff2cb8eef"; + sha256 = "d8dcdc4d95646392582904a29946f652e670bf276dd1b156e5b28477f4369e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/uz/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uz/firefox-97.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4d806ff1b92ce4ec56f49d0ec474c5bcf01bbfb2aa46ce3ed3eb3297658cf185"; + sha256 = "7b1b8b9e9efd430ea5191d3e30c2b28ef28f9fad9779a4d65d1bd653c575986a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/vi/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/vi/firefox-97.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0ee797028b2464417fef119de35e78895e0c14d43c8344e3bb5332e71958fa76"; + sha256 = "6ccc1efad3f2a57b365195afbda665548d82d141f5143beb04691d995e0ad1ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/xh/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/xh/firefox-97.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6c3acd60b0124f23403160c3194e3c1624d16c7c4450c2eeae929ba562e138c8"; + sha256 = "4099f3357f74bc5443ad59ef72bb1d1881b1d96965628544f72eb3bf72a02a36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/zh-CN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-CN/firefox-97.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "22606e4647d267ec369382ecca328e2022becaf6600449da482cc3d402fd60f3"; + sha256 = "9588d9eee65b7389c91ac43782f455169889742b2996bce8306fa07075f1c4b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-x86_64/zh-TW/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-TW/firefox-97.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7046246516f83e6747706e164f75b03ea5358c9ef262a2eebe9091eb67037791"; + sha256 = "d4f9228777a8af5e68616865fcdbf522cd73d69164ca0936098bbf0534911413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ach/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ach/firefox-97.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8f2b6c27b89643661fb6c457daea22403787d9255da83f57cc1ece1c133ff6f7"; + sha256 = "bb0e66383954377252fe15d1e3b251ff0e7ff518fa8d817f4f26b18449e8525b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/af/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/af/firefox-97.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f0066a19fe65b6d4a32e202a09bd2e454d5265e424543235ce4dd5c440c6f492"; + sha256 = "5d73dbd6f2cd49f79e99538ba0b4247c8c29c92ce3417e6ddc23b89df59d4ba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/an/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/an/firefox-97.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7aeb5226c869c2ba438ba62a49e0a1b5dbaca2c4b7a427794ad2603e522024b5"; + sha256 = "43b1ccf184fee070ec1a279914eda6b25ab15f294468b524e4c2a5e975e7c818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ar/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ar/firefox-97.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6e8d27e6ce8051e918e0ce29976aa048d58a38b31fe6ade18965881bdb07268d"; + sha256 = "6ef2f6bf6fac15b194a08aaec137adfe59ac7a8e1e06eacf88328dc1c917c994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ast/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ast/firefox-97.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e1814ef2b6f314fc46693e822a8bb7f6340bdda8af9a48d2534aa8a385e1646e"; + sha256 = "01aa7a8ea0263ba32f0c398918b184cb0d9f588df4330b16e37a8f3fb1efb165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/az/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/az/firefox-97.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "14d3bcd5251620d59764c9c905c56f8332174ff1bbe78087cdb73e1803edf3cc"; + sha256 = "3605a671f1752f0ba3499720095b66a7d058b5a0aeec3f864d87d7027121c970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/be/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/be/firefox-97.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "903eaf9f4ebe60d69605da083733cca327b25fa9842c9c9384600b4a4b6d6fbe"; + sha256 = "9ecdd7986a2b2b0c28ec11eab24130e4d35c8dc96e9fd95bebd0fd2e724e38ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bg/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bg/firefox-97.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e71e1fab1a87d4346e5f8a90b8f674eb10af292a5bf640a94cb7d765d6217b46"; + sha256 = "c66c13d707aa0f52154061dd6d59407acd1bf5b1a29284da8821c2abbb2b02fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bn/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bn/firefox-97.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f815f71dc8a1f288c7fc62978b8bfba1e53323459f99de0ac931d9f6c266e641"; + sha256 = "bab8e1f9004caab4f2a4ba0dbfa22ce10957b5c2a4adf52049d64953200cc052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/br/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/br/firefox-97.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4443dcd0d1e1fbaa7f52884734bdf2378caeeece0e2f62f36b56eb6aea8b73bc"; + sha256 = "07f177e9396567d4f0852c68b2080a04ac2f00c38c3cb0c1bc0fc4fcb3b629f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/bs/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bs/firefox-97.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0d02992545c745b95c341204585b0163ce32938a7112903f7878c91196c883ba"; + sha256 = "e9fd1dfce60b27dd8037c144810379a2526c4d270d9c2bb2536a74df8be7a586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ca-valencia/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca-valencia/firefox-97.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "bcd25813e25d30f4d6e3cfc999c02c014f2d6335e52ff4c46226540bdc0c720c"; + sha256 = "f6ae71d70746a7c56ad416543cff9ceb4298dfe30d1bce4d72ea695131ebad95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ca/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca/firefox-97.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "dc5874fe3c9e9fb01cda7e7dfcf93ce3c9de2e8a65b7443e231e193ef4debb14"; + sha256 = "7b12613954b0e6b81ed7fb1fcca7099dc4500a72cec7333dd8de6a7deca28820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cak/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cak/firefox-97.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "979008d2f21b0cdeb877841e66dd6013c32d8eb00a7bfe95fc3343d66bd3eff8"; + sha256 = "b18f916d3eec4121c7a854ca2ba2ccf5baecf53d7a173578e19c3c3c50aed076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cs/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cs/firefox-97.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "27a831c18f74e449a624905c18485989391b4e8769f1ac2646e2567a6cccc91f"; + sha256 = "56afa0af38d7ec85b938a961363b781d4980ccfeec9945f0971be201a21b1cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/cy/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cy/firefox-97.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a6cb71d9eb5d19a00818faf353b7f454e38316fadb242150948fb9ab485133ab"; + sha256 = "f82d0db8338a0eb4cf5f180f4982c5c7db7db4b9fb953ec496aa2e9961966091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/da/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/da/firefox-97.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2224b753fc1e9355ebffcf381adce940e1e517e33e11098d3a8e92ea36216eb7"; + sha256 = "fe7def9df91782a3adbdf02a4deac85ab07caa4f378f695e2253e0eccde3ab34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/de/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/de/firefox-97.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "aa7f041d58eedb41b7460574d736cbed6bd990dc68de6687f143e9a2cd450ce1"; + sha256 = "1fba10e324128c2d30b9a9a0489f1f065bda575afc7dbe0c6625ece2b96b4bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/dsb/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/dsb/firefox-97.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7d14ef8d451e8274c3a03af9111c3d1f09cc83fad57ee0a6f84366428bed417e"; + sha256 = "3e43d5c0d27290b023c7e53a48aad5894474d9a33a544a20cca4893fe4dd3267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/el/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/el/firefox-97.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "bebc24fd34af4d3a7d5820a0df0a2753956a82034603c4a71441b8cb66b99066"; + sha256 = "71864f8294844e051674f20d49b78f3b129ae10f7ae93c4bdc4e194ca6a586d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-CA/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-CA/firefox-97.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "f39a52a27af7b68f683df373a35b29848fa990fb6fc251a511f0525061e6f930"; + sha256 = "845713d2c18c1bc029509590e6156edb2166dd7bfc8e5a8cb9e6092143bb8193"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-GB/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-GB/firefox-97.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "858e86a232cf23be1ca2c6aff1954d28782f8e893c096d8263e486b92a6498f2"; + sha256 = "b5b2f7d607be95cccfc6dbc12298333e5f261a9cb27650dff946ea4246e87df8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/en-US/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-US/firefox-97.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7df5164de2eea1c32657c6ba813664a15ba5a198ac1a19c32ab494f9fab1d39c"; + sha256 = "c736080050a9715077a004add55dcb3dcb3be891d5870939709096bc81195eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/eo/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eo/firefox-97.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c48804fe31c7ec37676fe2f875b61faa992aa2dc1ff67bb5b3033b790e927d79"; + sha256 = "38f135a137826862f9319b88edd9ba0e41a7c57f7de3603ca23d5c6101b2cdc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-AR/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-AR/firefox-97.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4aef2060aca1d24a2ae0ad8e6f9029ab0cc1296bc2efc53ce4f28073f6b15757"; + sha256 = "63856d08aab14fec8b28aa6ad6f765aa43d5bf52cd1da5e48aa3c111e13be60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-CL/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-CL/firefox-97.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5423bbcea8a0454202c099fb66a39eba4a274d2062f45464783c9a8aee5c2305"; + sha256 = "0bffa72431868aa53835a67b18a257e7b3083da778182b13f723f68a38478910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-ES/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-ES/firefox-97.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cbc1dcbcf7c2e3602507826e9d2e299f213855c5e7aa1968cdc2fd19a1fee872"; + sha256 = "11adfe391791b2e17114c72d984db96586c70102d43563f907c371cd85c89b03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/es-MX/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-MX/firefox-97.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9225ef8b083b8b7fb91cd142ec204a53d74ef49518db6f9f5eb98851ecf52def"; + sha256 = "6b9360899c575c665e156dbb8a3f20b396bebb742f14eab9957f30f1dc2f644e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/et/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/et/firefox-97.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "32d4dbf6ab64e7a54fed85c6ff58d514e43b4427a30e5009f157a21bf21997d8"; + sha256 = "3fff6be4dd8d62163cbffee59d2d4811944f89b452a57192b3444515dd510bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/eu/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eu/firefox-97.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "576696120b4dfc64174a0a208506482dfb24cf45bc4794c4d4255796539b85d4"; + sha256 = "1fb5ce8792f92d810f170746c61133d1835513dc644c6db88f1a4a6d81906815"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fa/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fa/firefox-97.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "96b394c28bc77fd4d650196b75e266c70774af5a4f6f49c813cdbd5d0ad6de9e"; + sha256 = "a69afe063a18b4f95fef028c584a46de1246fec45137e394e4b4a6f711be84c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ff/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ff/firefox-97.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "d9aa3dac84c96163bf3c2a4370d7cf1a27045b8c506df3da2c8751bde80e1a44"; + sha256 = "f1c3797c11b975d7a2feeb03d20cadd89396659c3661f7604853d9912a5b6faa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fi/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fi/firefox-97.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "594e1b265abd354aabd180af2e9099f5d22eaab05d66dbd7511468dee0fb31df"; + sha256 = "d8c628c73ff53c5883a8396bde4bb9b931e1dc7ac44637e9774b3d5d3ecf6b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fr/firefox-97.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "542441111026dca84050e6ecec1007dce9910d41d8f961a2dc6a4ed49a7aba6b"; + sha256 = "85dbf4270eced53b4020d7a269a9d9ed4e55fa7251672b9c32feb96d6336b110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/fy-NL/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fy-NL/firefox-97.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "40ea9e076c5df6c81a4c19960a2c96f83a8174817db33aff882d4c121e58d8de"; + sha256 = "30da6a888702ba5060e461539ed51390014c79b55c1358e6a8b76c80c335199c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ga-IE/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ga-IE/firefox-97.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b7839aeae2734ac52fad253311e255a5e5d203ae117730bb9bd8a414489f300a"; + sha256 = "3c1a33c4d7b3e3161f2b07ff95adbc466a2e9d718227d786ee6007318730c1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gd/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gd/firefox-97.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "86820d66c8f6e7a03f4a73b564d0f94bd70477a4e5d74b27f7cfc23f70d0b559"; + sha256 = "0ffce6d8f9e2d0d1b84c2c9b2ecc49a1861f88356c5b37d75522d537364f5208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gl/firefox-97.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "4c121697d38f717cbf66d48bf9af5d65d67e2e3458ad17ac72266b522e89c6c1"; + sha256 = "31fb23e14aa007cb6ea74b5ccd124d51a1d2c19cb6003d693afff07e83640666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gn/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gn/firefox-97.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "71a823797c386c3b50e4034bcd404197f40af00128eedc614638bda51a7bdeca"; + sha256 = "042b2c8e5652f2f9e1e3cb01a4308cec100680d45acaa37babcf33b8bef5512f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/gu-IN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gu-IN/firefox-97.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "498a2222df5fc34e2565b76a797723d8e01a7569c168fb549fe07cb6b1d20c2d"; + sha256 = "5052d0c6a28b1c83e1c38b771f62f3c973089ccbfd048d0e089c8a637a80d218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/he/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/he/firefox-97.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7b86815403bda8e156ad2d461391b81f869222ce93ead4bf40fadb2c687dc850"; + sha256 = "06a78cb3435dc6f8dabff279ad1c69f6f4d44c5a8e56d04d38dbfb046ad42fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hi-IN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hi-IN/firefox-97.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "068b26208c44b2c5fe46c29e5a1c4e98ee1eb81f335cde5935575e05088fd18a"; + sha256 = "340d637d0de3df62ab79e69b3465a154a80e47a4dfe2b48cd949874457955cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hr/firefox-97.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "876985390499fb65e29c91ae1410c41959d9baef96cf0857baf4988e7ac2e94f"; + sha256 = "526fa7a1bf5e3e3b32f2fa61b8d28617873aba9bf1bacc5e13533b0621df993a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hsb/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hsb/firefox-97.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d366bf448d82abda3cf1728fb4bd57489010fef0885e5f0d4eb5c8d371e004ca"; + sha256 = "4443703e0b590e66dc4d295b1262d61f91cebb0a59ef6c246348a4e411663398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hu/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hu/firefox-97.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5b080f77d0990a026a73bdc298ab1bfc3e1bbc07714646e3ebf0c064104b58f9"; + sha256 = "b2b1be8b090734f1069f7bd78294072bab28920312aa34125d02213a030bc9b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/hy-AM/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hy-AM/firefox-97.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "86a9c6285a87ecb3f41f4c894f4b27f28975daf487cab8600e18c6a7f8446919"; + sha256 = "a81e4add5314774f19fb514b539bdd7e12b907a4faf8b606c13f7dac8461e3b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ia/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ia/firefox-97.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fdba1012d16a7b4fe98cabc7527a7c912f81383e09d7f3d195248b52072a3040"; + sha256 = "a1ead289cc491600b89d63f96081b21e5f8172936023e42b5d949c0d5aea2bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/id/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/id/firefox-97.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "0cde2aeae0bc24841d8487880d80b0842c3d738d110c6235a2b09b03df366e74"; + sha256 = "f56eaa86629a013f60c7af973a844abca72cb7ad236e02479bda9d1aeeb02b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/is/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/is/firefox-97.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "76dccb349d505794a13863960d432f1362c1d24df25e0152e710aa661760d95c"; + sha256 = "0d762f8c70bafdc9d8155572ff71ebbb0dfd9d83388298196a87ad130f8527a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/it/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/it/firefox-97.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b8f85fdafff993e12e02cc9fda1c79e38c06a1cff6c04a75edfcf227e2e4b6f5"; + sha256 = "54a79040a115b67cea2b912fd905d8acee05e737702c778628fd10282b27364e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ja/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ja/firefox-97.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "2880b426221b983e92248e7e1a58e7b5940c6a782d6f6abe8679b3dce09b675b"; + sha256 = "e92f3cf4d7f2f0e26280d814d6bf26f14fc2f5d8923451cbb6075607ba4d95c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ka/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ka/firefox-97.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d2dd3f4061dce484eb40c4f7d8a3101bbf4e838e657c4cf3b7fd31efe5ac1556"; + sha256 = "ff89c8ecc80897ec8acea68de166ae6f626f181fc7f0c1d30ac5208c4a221eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kab/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kab/firefox-97.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c49cd9e7a5786fcd2d123bef197c1361b07644244e869bc038dd2ca1022da089"; + sha256 = "bdcc2807c9ac16d6df6e1f35e2648f7e1776dd117edc1731d24192eaee5f9661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kk/firefox-97.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "466dbe14d44fcc547d5bba6d8475f908af0cc8fc5a788edcc9ea314b74e01aae"; + sha256 = "535bb672a95a37550779c84ecb5eaf98f151a30123b2b7a099b7940e8bede683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/km/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/km/firefox-97.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "67499ddaf97d90f07cbb8e7bec337287346d964630a73e99a192be94ac38f19d"; + sha256 = "3e60008c56da46e0897c326a843871d63fe0e534487f4a94f2e398ea6c5377f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/kn/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kn/firefox-97.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1c661152b25860acd10d6ca039107957ce8811b448c88c55df0627436ef35955"; + sha256 = "90d8c47a1cd42b7bd4f9e2c04ec6bfa701fc978a6ea680fc5e48bfd4fa6a727f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ko/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ko/firefox-97.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d43000c9c03f855e2d3b061d085c4c1dddce06b511145370cacb0e11e272382e"; + sha256 = "d62427eafe143f3d2aaa1eba6969358316b8c76c7fe926d8fc5985dddc588e7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lij/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lij/firefox-97.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "d330473b0a20100c9fcfbbb6488dbf367a21816683a1b21b861a729defbbcfc2"; + sha256 = "0db93d63e67c7f1bae536d425dd1789b0c0d1737fd23e8d0aa0c7b66f4c958a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lt/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lt/firefox-97.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0d89e5bb389c6d4ab91965141d5f16bc6e34b1cf2a7022e4d97db135501b3cce"; + sha256 = "ae3cfea73e03c61afdea361c4b23408f7c894197c4ef370286a653d35e0eb406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/lv/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lv/firefox-97.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "754b82aa04425353fb85a02fcfaa02a47f6f2e5218af4e814970c91282c77e82"; + sha256 = "6bb0a946109cb8316a1d3b412602b590caf4f6a22fc7659fc43d79c0f921acab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/mk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mk/firefox-97.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e554245a73bca28a816c1f4605164554a8a2680fb098aee3020c972c1e535541"; + sha256 = "6e36851e9c7b14e8c180ac9b715b245ec627fd2c73dbb4adc31219247696f658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/mr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mr/firefox-97.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e3a0daf03fe745268e08a82b53a94c192dbf499d9f7fc556f835552a2002bf63"; + sha256 = "68678735aa1fa850cc30445e71fc2589f32d3845238a781c96d62164b00a1da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ms/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ms/firefox-97.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "dca49aebc098103f212a16ab135de42aa3a7eae98cf3775c9d3c8e48d27816e3"; + sha256 = "0dc9802f1ea0bfa4e2916dd4a7b02b7aaa5cac0238aa4bae62bad4eebd49939b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/my/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/my/firefox-97.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "471986bf5b5aa0f63c9953a465cb2ce527699f497ed720defe80aef8b7dbe249"; + sha256 = "c3fdec85d214fa4f85b502647f9f0f50e0d473820e69a4f4f8d5d24fe58e6cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nb-NO/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nb-NO/firefox-97.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d184e4b06acca71983b6a075c5d4d70a5419162a96ba5ef612b9a7e9727759ec"; + sha256 = "48947dd10062ebef8e9095a1938dbb0b5e24689ffd5f835080512612e93f2efd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ne-NP/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ne-NP/firefox-97.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "7a8ebb648a0aac4c7d101e99da6a396ed5f3bb7688b59cee94f67aa6f627d4aa"; + sha256 = "8952004bde5d731fe48ddde9bced409e5d2c46d25157542f3c72568b87a9be8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nl/firefox-97.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6f24663da51d9c38b1e66e0064a161630da5f0a9e8a5920f63b76ef96d7d6a93"; + sha256 = "f2c7c1348dabee858c89b8aaf37e5cfcf0cd867f4e9b0587285aef13aa302a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/nn-NO/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nn-NO/firefox-97.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9f02fb57edac62277fd649f5da56d14eb52940581adbcf6b970883cb020ad0c2"; + sha256 = "bd05d1b619c77fbb502080f4862cbb715e628c814d8c35720998ec43d6c4920a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/oc/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/oc/firefox-97.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "766c5f0ea370fc0c2fa3c39096a9bb1d0f1b71c6c0a410f34bdbd21469d932db"; + sha256 = "6092e57f1d6bcaed08e5d1acdd15d9fda0430f1c0073a48fc38f8a73578f1fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pa-IN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pa-IN/firefox-97.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d5f44b2116490596780d4af5e14f815e40e344a1b29cae556957a0b537aaa8cc"; + sha256 = "51bc6d1b738c12eedd1b35f829b51ceb157c65a25241e911e10c13289b92a5b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pl/firefox-97.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5dab218cd9efe307e844913218769eb845b6abe4153191dad34b8f9853a2fd73"; + sha256 = "f286860bd5912b91fa62494837da2c335c4a4a484a164b4b999022c2813d5c28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pt-BR/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-BR/firefox-97.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "20d3a3f3f3e037780de788f858d3c9c4d778219a9158cbb1496ba968e9f50b32"; + sha256 = "a1f48ba9c56f2c54899d14b1292cbb4e517482ba0552bf17ace7dd6b517eef4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/pt-PT/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-PT/firefox-97.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a97777d502c304541d1fb2c177198dc41d46e66052008f0adaa97141b4fb81c0"; + sha256 = "6d91ff36f186ef11ba70d604443b7e818f608dd6d667f49a7892c1a69e64bdbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/rm/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/rm/firefox-97.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b008b8767060459644fe8a1221b6b02710393d8074d685dc60f188424c6272fd"; + sha256 = "cc190575af60d5a09266b2296796978f7a37dd07b2709523b84b88499729e546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ro/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ro/firefox-97.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9716c8abba493f6f2f627276aeeb0e7a434301bf59142a0ec90a35f0d683df89"; + sha256 = "4193936ca7e10f01b91ab990ba0b7aa354c344a7749356bb9b30d251d46b84bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ru/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ru/firefox-97.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8cb413a6ca340356c9ba3500e6e683d7d6e807b56e44651f69252e82d31f2484"; + sha256 = "f85ad1700117a99b8657d9fd9061935b77acfc4a0d7c8b3caa8d7c0ddf142a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sco/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sco/firefox-97.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a6df0b4240863b6a41f8a10d3d73577e0391cb98fecc82b544ea33099cff2d15"; + sha256 = "23d16650132fe30c6fb90797f744d09f21f16a0673821cc0c59392a9d2adbfab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/si/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/si/firefox-97.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bc7bbe3c418d78afca0ab5f1907ee6d95e7e1488101e2adea56e4efc3ee53584"; + sha256 = "44ec177853f6d3d72ce141ebfc25508df4c63c8b37265df4dfcac8b48799b007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sk/firefox-97.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "56f7be236c7d0135e6d3a9fe2e7d173c7f7c9c95dd46f170ed616dba8d1c4edc"; + sha256 = "4a31daac61e0ac3a729c5299dc5d14046bb2cadec61aad443fa4391a0cc99b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sl/firefox-97.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "eb4c4c11ef6f853d88447a96381093ac37130728ef131a6ec7f74a84803298df"; + sha256 = "8ca7306d8e68d9943ae3dbeffe3da88682c4c22fa9974142b9f609c4c62b06f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/son/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/son/firefox-97.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "49cad9188901a1fda74afab30dbc430c465c2a8f91b03499d5bf55f361ec9c97"; + sha256 = "9c5c17a9f85814779f88f320030bc6d935cac0b5b51ec9524283553c36c751c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sq/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sq/firefox-97.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "c2080aa59871af97b1ebba2e25f32fc0ab88cf5c407c43f63406dcc3c2fa5087"; + sha256 = "2c40123f37130de16e47175472086e5774598b5e6090de4d88e67512bf982c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sr/firefox-97.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "e4c0723595f741bc306a066b96c11f8c125c1e7cf2c70998548a8b77375fa8ad"; + sha256 = "2ab762afa95e0d0baa3650e35612f4f56f9d4ddd2baa34f615e9fb7bf95353e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/sv-SE/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sv-SE/firefox-97.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "665d95546dbcf38e91102a559ad7063052b8554f5f8799c127231b93d0d75744"; + sha256 = "ea00b75128a67638d67ca83ce9f5e15f4afe9eda1903e90cd6f27820117fcac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/szl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/szl/firefox-97.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "f85aca1b01a2ae08915c893d25ce6243c405fe3e32f18cc28e111451cae006b7"; + sha256 = "88ac139760b68702f33ad02889dacbd31d3c31140f3dff763dcbf6f9e7f6adf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ta/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ta/firefox-97.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3d263a4ab9991f25cdc130f42f8bf37212f06fd614966cec0f42a9e5e3585a1a"; + sha256 = "3828cc9dea353d7fb259fd57396ddd59b316fb323caa6b8b47f485a6aad8e1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/te/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/te/firefox-97.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "59ad98ba6c2b4f9eab95c200ca36d884fc7b7d99e0c121fc7bd8867a2a1cad05"; + sha256 = "1dba53e1907eac8f76759b2fe0a5499c31c733dcd627193916e6d4ebab27c625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/th/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/th/firefox-97.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c1f73e025dad87d5314093abbeabef1e0107dd4f29c3a8cec2f7ab1c01d8a0e8"; + sha256 = "461a11d1a033cf9ef113f0d362484696b29ba6d52e7e14ec4a3015ce55767f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/tl/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tl/firefox-97.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a71fcb2727d70e02bb2d50e1284b4c783d227c2da3940c918c7e7eaa2cebbbda"; + sha256 = "572f60b9222c9a008ea23eb0f9c184fff17af4393e887cf2db871a7f86f74b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/tr/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tr/firefox-97.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "597a37f249f46ec9bedc4605afb5c13b213c4eee1d1544a1f74a645446d92e1e"; + sha256 = "bcc59684f7e6c6efa6df66fb2eacec8b1a59f0aa42f8bea86a7e0fd6a29916a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/trs/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/trs/firefox-97.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f6a93b3835aabe44781fb73985193d6c704202cefdcc2823ea77cb13df8844ff"; + sha256 = "d97ea9fcc6ec94e168ddfe219f08fc202013e1cbfdf35e34749569e54f6ae65a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/uk/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uk/firefox-97.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ba11ca8bf215bf0190b273374228db3019baa6db85a5acb372dbe550d94148fa"; + sha256 = "49078902f54f5e0ffbaa93a7a797a7795a1baeb5cb57942afd3c6df38b68683a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/ur/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ur/firefox-97.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "61e9becb283fdd38961bc79629e332946fc449d40b37163d46303de9dab2eb26"; + sha256 = "7df5518a9e0f8a82b61bba992bbdb4c3ceb935768d057ffa3602036a921b1754"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/uz/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uz/firefox-97.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9e47cd99a5a5309c7b388a4e17e0101558bfdd397ad0caee82902e8d56d652e0"; + sha256 = "6a36b93b799cbaca9a7f5765723c63a1e42c1645bad6ca2e3ee8dad8d64f3c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/vi/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/vi/firefox-97.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e2fb08af58be123b81edf9d7ec0dd532388fb81a7cf9a2952012b5758f5329f8"; + sha256 = "da081f083f64ebe61465848358ac018ca4417104ec94911d39f4ea87a858d49e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/xh/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/xh/firefox-97.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "cc19114d522b0e9bf00dd2293e80643919229262afb01316e95e34f4fc18dbca"; + sha256 = "3dd0234d0ae5739290f7236264500c3ead31b6afa9b00cfbf8405e1ca13d1a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/zh-CN/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-CN/firefox-97.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "11c608bb9511dc12e8c55d31fbf322a2524aec99ce90fea35a5d83d7282976d0"; + sha256 = "9e21e6ea94ad72b890c1eca95da2e1ed3f5c3b61ac56216092a7393c072048e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/97.0/linux-i686/zh-TW/firefox-97.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-TW/firefox-97.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6a0268efa615f9559d258cfc05f113d54700d81c5ca0546054c10b9879d76d2d"; + sha256 = "e8eefb56597f20a92c839a7e4ccfabfa009de100505982a72c8088a64ecca879"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index c1cb916762ee0..bcedf9d22d874 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "97.0-2", + "packageVersion": "97.0.1-1", "source": { - "rev": "97.0-2", - "sha256": "00fb7xr6hrcyh3s7g52fs6f7a1iggpibj0xafblnl7118fh73g25" + "rev": "97.0.1-1", + "sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j" }, "firefox": { - "version": "97.0", - "sha512": "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186" + "version": "97.0.1", + "sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c" } } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e3f3e15d7c37f..7a5c91130f4d3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - version = "97.0"; + version = "97.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a913695a42cb06ee9bda2a20e65cc573e40ca93e9f75b7ee0a43ebd1935b371e7e80d5fc8d5f126ad0712ab848635a8624bbeed43807e5c179537aa32c884186"; + sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5e88de35655ab..b428687025d12 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -42,7 +42,7 @@ let # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} , extraPoliciesFiles ? [] - , libName ? "firefox" # Important for tor package or the like + , libName ? browser.libName or "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -152,24 +152,7 @@ let # # ############################# - # TODO: remove this after the next release (21.03) - configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; - - in if configPlugins != [] then throw pluginsError else - (stdenv.mkDerivation { + in stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -219,8 +202,8 @@ let find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do - cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" + find . -type f \( -name "${applicationName}" -o -name "${applicationName}-bin" \) -print0 | while read -d $'\0' f; do + cp -P --no-preserve=mode,ownership --remove-destination "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done @@ -369,5 +352,5 @@ let hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }); + }; in lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 781163050944a..fbd0df2fd3ad7 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-MJJeHnwfXouBygRT/wFWFMRHxQVf/3k2c7vp/tkD5co="; + sha256 = "sha256-FuaN9iUxR5Y6SnNmuegmNJXn1BYKgcobquTL3thuByM="; }; packageJSON = ./package.json; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 631f4c6a583dc..954ce2292ec17 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.2.0"; + version = "2022.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-yo4Tu9wSxGdUAr2436lAlaP2U+5m/J4+oNQd/UQk3a0="; + hash = "sha256-y9TduC6Fa1p3UFvSeW9n42AUD63dp/LEagiv3xlT/4U="; }; vendorSha256 = null; @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)"; homepage = "https://www.cloudflare.com/products/tunnel"; - license = licenses.unfree; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bbigras enorris thoughtpolice ]; }; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 2d7eeb47f76b7..2cf5d35f653d3 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -2,8 +2,6 @@ , stdenv , buildGoModule , fetchFromGitHub -, makeWrapper -, kubectl }: buildGoModule rec { @@ -40,13 +38,6 @@ buildGoModule rec { "-X github.com/alexellis/arkade/cmd.Version=${version}" ]; - buildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/arkade" \ - --prefix PATH : ${lib.makeBinPath [ kubectl ]} - ''; - meta = with lib; { homepage = "https://github.com/alexellis/arkade"; description = "Open Source Kubernetes Marketplace"; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index d425ca11fd881..a629de63729ef 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.15"; + version = "6.4.16"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3JPnXOpjHjBZMdOtggjSns4cKc7uffJS1RkTAKGxAVI="; + sha256 = "sha256-yjW0XlMXa1MyNIud3uGm7RNj47B4Bp3DK9tvBrfqkoA="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 91567254557e9..91d8655fe6d20 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EgIs5/0Nk4AtOCK7I+Lt50cqOGzvEegzV0Fb8Tv3bAg="; + sha256 = "sha256-nE2mrFALJCGxUce8anJ3ErUO8575GgR6pupG06rRCCM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 05c985d9d97a1..b14c98b4453da 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-bgc9M7shcgL1gQ9klUP0JIY4UeraO1oLsLEdG5tOLpY="; + sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk="; }; - vendorSha256 = "sha256-T2a5FBjISXprgMA6ye2xwAFLE62Qb3AUQVjpGtnduU0="; + vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 02ed9b96f5466..3d36a32101847 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-6eVFyGVvOUr5RA5jeavKcLJedv4jOGXAg3aa4N3cNx8="; + sha256 = "sha256-f0e2jdiIMfakG97LqJCP5Jk41D93a6wxaChN7WwY5oA="; }; - vendorSha256 = "sha256-ie7XRu+2+NmhMNtJEL2OgZH6wuTPJX9O2+cZBnI04JA="; + vendorSha256 = "sha256-gukwJp+qLbNJlBL5SemrVD6mExPnX0+19tbw/b4SJ8s="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kconf/default.nix b/pkgs/applications/networking/cluster/kconf/default.nix index 683a91ffee852..e549c8f09fb0d 100644 --- a/pkgs/applications/networking/cluster/kconf/default.nix +++ b/pkgs/applications/networking/cluster/kconf/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "kconf"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "particledecay"; repo = "kconf"; rev = "v${version}"; - sha256 = "NlTpHQFOJJcIt/xMT3fvdrlxANyg//wtYMmXzEtaFXo="; + sha256 = "sha256-V+B1vqI/MLASqEy6DZiB71h7EkUfrxVKIMxriRK6pyY="; }; - vendorSha256 = "2d4o87wE9QZltk2YOHc20XVYF8n0EOrDf5mJ6i6EB0c="; + vendorSha256 = "sha256-Fq3V3vYaofB0TWt3t7uW1Dd7MlwMvh8RaRVpdq9XZh4="; + + ldflags = [ + "-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}" + ]; meta = with lib; { description = "An opinionated command line tool for managing multiple kubeconfigs"; diff --git a/pkgs/applications/networking/cluster/krane/default.nix b/pkgs/applications/networking/cluster/krane/default.nix index 6d325d6f592e6..cc9d19fd8152b 100644 --- a/pkgs/applications/networking/cluster/krane/default.nix +++ b/pkgs/applications/networking/cluster/krane/default.nix @@ -1,7 +1,5 @@ { lib , bundlerApp -, makeWrapper -, kubectl , bundlerUpdateScript }: @@ -10,13 +8,6 @@ bundlerApp { gemdir = ./.; exes = [ "krane" ]; - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram "$out/bin/krane" \ - --prefix PATH : ${lib.makeBinPath [ kubectl ]} - ''; - passthru.updateScript = bundlerUpdateScript "krane"; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 6ef24ded1a678..c1383e8688d12 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos="; + sha256 = "sha256-6/+S1aj2qoUPz+6+8Z4Z5dpfyOi/DnrLLUpPgBn/OxU="; }; - vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo="; + vendorSha256 = "sha256-0Zi62FmX4rFl3os2ehtussSSUPJtxLq7622CEdeKZCs="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 0e4dc8f560fd6..0da63fae4215c 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "5.2.2"; + version = "5.3.0"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-yOrxEY2UpupVmbDSAhgruTUOhNVAGCpSJsvzDEFFccw="; + sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5d056907264d5..5e78cc9b72bd9 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-doctor"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "emirozer"; repo = pname; rev = version; - sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz"; + sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; - vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55"; + vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index ee6a241a2304c..8bfa519dee36d 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b5LbA2qEsEA7J0djEMhDeBY9iV1cvGVtxTlmneQGKYY="; + sha256 = "sha256-hRLju3nVLy0eDgqGeReHaF8p7oOlpo1T0IbLq4h/uwg="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 2b9ca9df0494b..e08a3b46d1561 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-IgV1ULxwL17ECsm7MdRfQERcEVy9cEft2L7fHP3XCKo="; + sha256 = "sha256-uij5daVHKIfxx+8UTmU/HKSbf/RTRFuO8mCQdsC80qI="; }; - vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; + vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 4e945e4564099..32130ee96d288 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.7.11"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc"; + sha256 = "sha256-K94cGU+cFHOrAGXjHQFFFJYhZi9zNfdlGy5eb2DkcV8="; }; vendorSha256 = "sha256-95rteSEMOBQnAw0QKuj5Yyi8n3xXGl0Tm97WiyTGxVw="; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index adad3ae679d75..7a708c5e061d0 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.23.3"; + version = "1.23.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-Ccf+9mwDv1Fs0+xN8yDkUjh4A3aGox7rBGesyYtkUDs="; + sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index bcbc8439c2f22..9a3a5f3a3d5fc 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s116SwgOj5xzfoz/iw17xubEKzPUx912QHk1+C6YhE8="; + sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs="; }; - vendorSha256 = "sha256-VvK4pHmV1WkIzQDHiFVzjurigP3F4xYl0DJCnImSx3s="; + vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index a03f69a9fc0a7..2475dd0f1d940 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.12.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "1gdks7pzaqrsdihh2m3v597x0dw2qww95jlznj0h112jgicanimj"; + sha256 = "sha256-5Tu838086qgIa2fqda2xi7vn4JbkENVJH4XU3NwW7Ic="; }; - vendorSha256 = "sha256-dGmd6tCUKoK4uwhB5kXGOpXemtLn0VssabDE4iQWEAw="; + vendorSha256 = "sha256-caRBgkuHQ38r6OsKQCJ2pxAe8s6mc4g/QCIsCEXvY3M="; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite @@ -22,9 +22,10 @@ buildGoModule rec { runHook preInstall mkdir -p $out/bin install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl - install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra + install -Dm755 "$GOPATH/bin/authorization" -T $out/bin/tctl-authorization-plugin install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server - install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql + install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool + install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool runHook postInstall ''; @@ -35,9 +36,9 @@ buildGoModule rec { meta = with lib; { description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; - downloadPage = "https://github.com/temporalio/temporal"; homepage = "https://temporal.io"; + changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ titanous ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 07302ddc1ef3f..3954a143e5b8e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -191,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.5"; - sha256 = "sha256-zIerP8v6ovIx+xwLsSmMFH41l140W9IwQMvomb/pk8E="; - vendorSha256 = "sha256-4ctuErxZIaESfIkS7BXI+eQcdatXE/1p20P9f890twM="; + version = "1.1.6"; + sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; + vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 96a53e21551ff..4a78f01a1cae8 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7"; }; - vendorSha256 = "1yl9lmqvw70a6z0c85vkzvdzyzqjizfa1rahfw8gb175fax1f0sz"; + vendorSha256 = "0v4xk1ia6zhh4h2rgpinfl0hs300lk84vabm35mjahch7kmvfhvb"; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 30966deb0caf5..73506867a32d6 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.65"; + version = "1.2.67"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-uQO8zJ3+eAu/F5vmaGCd2qqwK8GRlensqypRlK6CXSk="; + sha256 = "sha256-SCSj+spANhbrdhj204fsvshkDi0fKmt8jbc11UHJARw="; }; - vendorSha256 = "sha256-dRevwdLiSsM2zzNQ913ytXf2XxZOfLWAUiJjk04mY28="; + vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 0ffa9e1023bdb..d5e73f833c3a7 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.57.0"; + version = "3.58.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-gr9scHfKEwElSTVrRjlS8STuBIdvIeS6cgrMmBHImcc="; + sha256 = "sha256-0P5/cuAfd0K6oGRmgYsYbo6R//Ytbuey8OiEtrM4XYg="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index bb2576cdf5f89..3e992899e43e7 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,17 +13,19 @@ , pcre , qrencode , icu +, gspell +, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good }: stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c="; + sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q="; }; nativeBuildInputs = [ @@ -56,6 +58,13 @@ stdenv.mkDerivation rec { icu libsignal-protocol-c librsvg + gspell + srtp + libnice + gnutls + gstreamer + gst-plugins-base + gst-plugins-good ] ++ lib.optionals (!stdenv.isDarwin) [ xorg.libxcb xorg.libpthreadstubs diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3cc1f033d7661..4f19fd924e763 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { - stable = "0.0.16"; + stable = "0.0.17"; ptb = "0.0.27"; canary = "0.0.133"; } else { @@ -21,7 +21,7 @@ let stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; + sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil"; }; ptb = fetchurl { url = diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix new file mode 100644 index 0000000000000..e567f18fe7b1e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitLab +, flutter +, olm +}: + +flutter.mkFlutterApp rec { + pname = "fluffychat"; + version = "1.2.0"; + + vendorHash = "sha256-Qg0IlajbIl8e3BkKgn4O+mbZGvhfqr7XwllBLJQAA/I="; + + src = fetchFromGitLab { + owner = "famedly"; + repo = "fluffychat"; + rev = "v${version}"; + hash = "sha256-PJH3jMQc6u9R6Snn+9rNN8t+8kt6l3Xt7zKPbpqj13E="; + }; + + buildInputs = [ + olm + ]; + + meta = with lib; { + description = "Chat with your friends (matrix client)"; + homepage = "https://fluffychat.im/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix new file mode 100644 index 0000000000000..6430ebdd22fc7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, protobuf +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "gurk-rs"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "boxdot"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4="; + }; + + cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY="; + buildInputs = [ protobuf ]; + + PROTOC = "${protobuf}/bin/protoc"; + + meta = with lib; { + description = "Signal Messenger client for terminal"; + homepage = "https://github.com/boxdot/gurk-rs"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 5be6e02117889..3e0ba8bb5e8f1 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -8,11 +8,11 @@ }: rec { - version = "20211213.2.37be4c3"; + version = "20211223.2.37be4c3"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - sha256 = "08abswvxwsxh6b0smb4l4cmymsbfiy7473b2sgvghj55w603prsc"; + sha256 = "1zw9azwmxr4991nq5kl527lbwlj7psrissgvrkl1kxxbfbdncbhh"; stripRoot = false; extraPostFetch = '' diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index b6706d6478687..6de6922913fc9 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index c998f869d1ea2..9126a587dc7ae 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -5,10 +5,10 @@ appimageTools.wrapType2 rec { pname = "session-desktop-appimage"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "PNjUslqLcSxkRSXFpesBr2sfre4wetZWfUQTjywdClU="; + sha256 = "iMJk7/Q3Kh2KwLs0m+DAPVv471iPZcsIs4+YCSbmeIo="; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 5da0536b37947..931e9f93d0845 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220107"; + version = "20220218"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-sB8/xQgSORtwupcwSejKUhHoz04exdYS0ymefw9wXDQ="; + sha256 = "sha256-6fwkhqXM6T0WCC1Y+GCmyLwStqhBTUAzDDsBTd5XlSE="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index c76393d69f51e..9aac3db3594c9 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.3"; + version = "3.42.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RGKeagIojsEApm/VlBOgaLa5zWJL7TJVqimhZuom0LY="; + sha256 = "+oprem1GsinbXfIv3nZCVFIjV/4b7NexjlNt/piJCmU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 8b4ce7032ca98..af05bfe884c32 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "052k6kiw6yglgcbs1liynh4hf5ac56ychpivrbw85jh3dpq9fig8"; + sha256 = "1ddbhwsycfpf430k52l5gggywd09h10hwcwzpydam43c5ga30vdp"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index aa46529bdbace..184804a878886 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,9 +2,11 @@ , pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo +, notmuch , pythonPackages , emacs , ruby +, testVersion , which, dtach, openssl, bash, gdb, man , withEmacs ? true , withRuby ? true @@ -12,18 +14,13 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.34.3"; + version = "0.35"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "sha256-P+kQSDv9gVpcO5UOImp7yoFWBT/TLXrR6xoKijrK6Ig="; + sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"; }; - patches = [ - # https://nmbug.notmuchmail.org/nmweb/show/87o84iza9r.fsf%40starbuck.i-did-not-set--mail-host-address--so-tickle-me - ./test-fix-support-for-gpgsm-in-gnupg-2.3.patch - ]; - nativeBuildInputs = [ pkg-config doxygen # (optional) api docs @@ -100,6 +97,7 @@ stdenv.mkDerivation rec { passthru = { pythonSourceRoot = "notmuch-${version}/bindings/python"; + tests.version = testVersion { package = notmuch; }; inherit version; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch b/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch deleted file mode 100644 index 91c77df70109b..0000000000000 --- a/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a642ad542e3d3f34e949c5c66923ca8a6e6cbbd8 Mon Sep 17 00:00:00 2001 -From: Stig Palmquist <stig@stig.io> -Date: Tue, 11 Jan 2022 13:23:13 +0100 -Subject: [PATCH] test: fix support for gpgsm in gnupg 2.3 - -gpgsm --list-keys output changed the label for fingerprints from -"fingerprint: " to "sha[12] fpr: " breaking tests with gnupg 2.3. this -adds support for both. ---- - test/test-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test-lib.sh b/test/test-lib.sh -index 6bc0b723..3de608f9 100644 ---- a/test/test-lib.sh -+++ b/test/test-lib.sh -@@ -145,7 +145,7 @@ add_gpgsm_home () { - mkdir -p -m 0700 "$GNUPGHOME" - gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \ - --disable-dirmngr --import >"$GNUPGHOME"/import.log 2>&1 3<<<'' <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12 -- fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p') -+ fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*\(fingerprint\|sha1 fpr\): //p') - echo "$fpr S relax" >> "$GNUPGHOME/trustlist.txt" - gpgsm --quiet --batch --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/ca.crt - echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$GNUPGHOME/trustlist.txt" --- -2.34.1 - diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 494f371016c68..eb708962e010e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.5.1"; + version = "91.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/af/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "90a7b62161c8e4bd0dfcb0c69995e80b1733b86513d5786559eefd0ee19ca6ec"; + sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ar/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f7167cdff08c42f0a067e8631f8ae85ea12f301a7d49ba8919fa90cdf5ac1aaf"; + sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ast/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "74ffcdac8a170ba700d2c58066c66143129a7f21f8123c174dfd598240f2271d"; + sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/be/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "aabe3dce7ddcfcaad6212549f7ce709c6832c01aa7cfaa15fad82d75259fa8ee"; + sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/bg/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f0fa8e63643e1a44ab6997caf148812e749004a450825b0b77f1ac0cc52c6ec3"; + sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/br/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8391eb495214140878bba1f658cb1dbab4a93187f32bb99e65613b09db70269c"; + sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ca/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "82b1498ee1745b087b58f44ca57f1d355b61aa42ec2787302e6a59dfb5391a3e"; + sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cak/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "52761eec2ef3327ea5f435bfcb73dd4a5c378e78d57f9849283460ed39318af8"; + sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cs/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "406bff52470379be7d6b8315909067e1a1f7623a7d4415a23b6f53ea4f896064"; + sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/cy/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4fa869d8592709da2ddba8657424475377aea9617ad411abb25c8ae8e55612fe"; + sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/da/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1ed471dab670fe7ba58ccb4fe39bec2f3ee6625a6713c3b1f3fe9703e0a703cf"; + sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/de/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "16b6e291489f37699587b62cafb3caa3e09ae21b160c9739afb35ae450dcffbc"; + sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/dsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3872f1263a7ba9f6a31f1fcd26440ab3ec231efca678cd75459bd71a4b0637f9"; + sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/el/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "aaab178dc1f6d9f1818f63b98091113546bdf36e823efc0c252979b570406ef0"; + sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-CA/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d2e98a42a5de6793f34725f989b645a0531dfca95e014e58bcb951fd5a4f9681"; + sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-GB/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4459fb379c2299be6915a5a54ad6963dbd80dd5a9838baf1d2edcf63ef0354bd"; + sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/en-US/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a88c57cb36623d18a53c1940ccfa5874c222b6a2e44aab7760ccd6c70518f748"; + sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-AR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "979514cb958a4626d07379099c3fc77ed4208cecd3b0af9c059a04064e60df43"; + sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/es-ES/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "745d0865606c238512e01e414305f83664b1395ff9d02b36f9df37b1bcca0e2f"; + sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/et/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1a009c0ec4ad94819de0eb006c6f0919080271e8d5c6c5b324c6624657ef8440"; + sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/eu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3beab0dd08c2089dabf99d246d9a06bb0339b88945e012fadc53a9420b105eb7"; + sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d0006d6b5a2fdeb69171452c9eee4f7e54d18cf0a42bbccc056144af127109c8"; + sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4345711b2199bd5f0cc89e34cd7a65bb22290268c872c990fb32ee49c174d58e"; + sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/fy-NL/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "7f90afe3e04e1a7db5236d12d2133c3552e0d6744262f5107522dc1b88b9d26d"; + sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ga-IE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ecf987ec7a479fcd1aeec4a680fe7b785f3273914be7bc5ea34a1160024bca30"; + sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gd/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e688777e2ca5a0964bdb295c17de71f0b3e7ce8ed3a81a027cb58d65f0b13843"; + sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/gl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b7e37320a6f29312851d814713522c0edaf3ad10bb6096e08e60ad9d6eae3c34"; + sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/he/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9e317e22ca0e8e6d809437efee263fb3e0b6418696282f8670b7f8f92ec6c56a"; + sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "51f6eec36a08b766bc9567ae7dbac5b015890c0792dd4a37f9654345bd34f9be"; + sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1f91258f84978b313d2ced008ef0e760e5e425dde3116d1e6adfd7d87895a043"; + sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d5665c6b1415493f18085c1606b12e4ff52f02ac9d932f5e14c6794685b7c68e"; + sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/hy-AM/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2100b04070066d8ce65d7bb3bf25d4f3dcdec4c14dce3f9c5455923de84e6c84"; + sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/id/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7e9e2f1d5ee6db5f72a46a5345c6d4bd4e6cfa76c2637609dab0e415b93e1975"; + sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/is/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "089acd20ab3894dc04ecec3cb85317d40ff9f86a2fef381429f06a70b92f4785"; + sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/it/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "22efeb3bdf740d1b0dfe1850589403758fea11b443ad6099c630e7cab866fbe8"; + sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ja/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5e950fb7dae9573d877b783eb12f36cb801f0299fe360e2538aab9a86ffb5911"; + sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ka/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24cb7fb080728903c118a31e56a7d1e02e554b2a03ca272ee0e8f14d58e1b1cd"; + sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kab/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0bfd4b98c2659b7541cdaf2fe4be33f71463d6eaeb14b5722f2916abe82411d0"; + sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/kk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "62d530819b0bc304416db7e470a8856afb8d41813165a8b3ebc417957d5447fd"; + sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ko/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f081bbe2756b4ea78dbbe1a18377eb64ac729329a5bf2c97489dfb03ab1c2949"; + sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lt/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "26f2cca527fee03e4b7747dceaa0ce1ee0c3f6efb2adc670ec6c1f19d2118d3b"; + sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/lv/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f39fb8ddd6e246643750c5f23fa1d5993437c78f4062acc4c3db22d8b1dc3b56"; + sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ms/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07835a7669f3595f20d7d41db4e799c968d30166f0db764d47b2fb1a8d8e6f0a"; + sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nb-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2dda693d9dcd5602cdde27d54871cf5b2b06afceaa0133a77632637a81a4bd69"; + sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "05a884da304dd5c8692ced6b5d974f14e1b0007ae683f3511285b7432828b71c"; + sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/nn-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8250f8d18feb596ed758b07933d590d7f3de016c5ce08eedb6024a4d116acb63"; + sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pa-IN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5a510109f30fed267a61d8586714e2554b74866de8b1948c80a39ad7db42e460"; + sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d3fad496d1aac376fe9557ba039a916a7527a1a120e102724fd35c469adeb8eb"; + sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-BR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "bfd0685dae994a75a284220358b1ebf4d0a71d151b2b674215b5d1c4566784de"; + sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/pt-PT/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d4cded9e8e065c312573931b4e60a5a62a154763fdf859a5fc53d120209520f9"; + sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/rm/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5761e7778adc41e69351c49db232792096a3d69994f79ce556cd4dbb1a356530"; + sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ro/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "63bd9a8c5035d8964e609159d301ca52e68fef0f136ad378a8016fd1dc7a1ea4"; + sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/ru/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a0d3731c3a6f207e8549d3d5e2e143c0b4620eda6902e9636d8c37558a78d09e"; + sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "22635dd9abad4690c52932afd8b9b8cdad03270ef87c18ae3061308c62932064"; + sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e2c395a8483115801b34c8de7a34bea1ce219e1cd0012c7d27af4b11e11577f8"; + sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sq/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "aeb72ddfb97fa6fad9f4295f00bd01eccc78f919c34b899925383d7877d10454"; + sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ce9b6671b7d138bbad4ccb4a2dd660d8f2ba452f5f331dc8b630005e4a64ff91"; + sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/sv-SE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "59bdd6acf2aecdddb2f31a0e6305ac5eb59d8d8c3ffd6fbaded92d97a8deff4f"; + sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/th/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "62c76e4291580ec271f36737cb6dd621c6e30ddf02a070b008d312afed0cc727"; + sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/tr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4c59cb186ea76ee79b123d29e3cc8a9c75e58a5f8c46e3b71a7a0b1937d99e42"; + sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "19df95c2001aee2a6ed00df011caaa5be03062a559619971897640511848856f"; + sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/uz/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d773684ed49309e642436b40012b52980286fd07c508d8a9ee92c6210063fa13"; + sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/vi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8bda4d3c6a9ceda51fcccfeadb9942c595acffb8a14823a59523468871332651"; + sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-CN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4ffa3da9d6c9f45fa90527621af47e67e1c76f09c325a1176be2f14f52ea9362"; + sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-x86_64/zh-TW/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e3c053b3835566481e1207cc1da3922ce4949c0215553bc2dce5a62715a7a919"; + sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/af/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f131f7266ae90708a4f5a544d5b6b656488e676e79e91e998ac4dacd969effe4"; + sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ar/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8dbb28b438d1f72d314b32ad8b884829a9bda3bb3a8d4a677e3abcb0f7edc005"; + sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ast/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0c1dfbb7b8d001e28ba6fb5648af5d993b3a89e19381cb9bdee898ea7134ec64"; + sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/be/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dc4888c238652ff13e66ada3d21e129f3bc01f663dec38bed1f200426c5ec8af"; + sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/bg/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77c370a1f1e9e0683baf5a6a6abe937f198be08cf6ed3a6f29c59c3be64080ff"; + sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/br/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "bce47698480a1c38d5b0d397c3e69c3c5ac99a0937885abbd633284614daea6a"; + sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ca/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bf288be4f977ebaffcd2e16c691a3223924fec7f39ec3e7368fb9b88f9c1156b"; + sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cak/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "fcfb6268df5aba758dcefae6e6c0469648d56663789d32175a8e52068d48aaf8"; + sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cs/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "529b31c7cd03b0c199a8acab13dfb684db5c2bd9fa10f96e8da748bcaa5e0a04"; + sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/cy/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c4b22b81608421ff5c6ce74ea7b145a6ad09ae506ae25af9ad93ac0434ad1734"; + sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/da/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "cf28d1a77ac2acf26fc314628fe21e5c9ddfcbe85a76d28070d15d78a6b73360"; + sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/de/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a752cd04414a80ed92e42bf95b6460714b500e1d466d5663a64c9dcc7a678e66"; + sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/dsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "31ef88cc4cc2892fd501df71a751aa3c3ee8acc61fdb437897172de8e75de9c2"; + sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/el/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5edf4e1008b3d8d19d623a8f3cf2d8fb1f7a1030de9db686bfb8c09c61e740d2"; + sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-CA/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "60e91f33b0b5e75e4a18f1fac688e4c249be77874103d1a44ad2cbd1188afc6d"; + sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-GB/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b08d2650702304409b19967d5ff6883881d37577c8e3ed0d545e36e81306cc96"; + sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/en-US/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "347dfd3d8bf993e2fdc7c844c8b1a94925ab637acad9e07a1616f8657e8574b3"; + sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-AR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e2c23ea75312f53201e02079063c946ae76fd11acb75cafed8d643ad49e5d484"; + sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/es-ES/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "205d541dc22a3961b1aaaafd617743d1a25b52ee5bdf8b9add6ca56fbcd6861e"; + sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/et/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4967717f2b6c21d9868e4fdb812e999f3002bb197b3a111a479d97fabc70d2c2"; + sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/eu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ea5ad491a38b4fd3b78f0741b7545ea7a9d11c3cd82f992fe7b6f38acd4f1a36"; + sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "45884d2b6d7af2a2f9f4195d5ddc9eadbd34a0d6cae039193b4eba4da49e3909"; + sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "1d2153eb9e903a37e03596e11d2bc0a869260421ac07b3787d05a163c9c5b32d"; + sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/fy-NL/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6ad87450cbb8a98fbd55d7399ef73f5668c1f8e288cb6d36b426fc8c373837bd"; + sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ga-IE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4b268107debcde5a45fc69c5ce4881b0bc8b9809a2cfcf877fe655339ec5890d"; + sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gd/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3a6f0b431d5301a9cdf1499b186580bfbf468aad4e7123175a9defa04e68e6ac"; + sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/gl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e79001ca8b96cc9c5cb1a9ada3362e5365b68c05b4324ff2d36e1421faee691a"; + sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/he/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d246a1b5a9d03e656392df6fdd4a6dda9e035551d0498519fbf53d44ec033a34"; + sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f3d4604bea32362a4ee9ca41d3ef98e910ff448b32e37d0c59dc33d92366ab1f"; + sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hsb/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8ca969121ab8fc69dc598415a7d5ece9fd86e51c3b90f48f9c51d01157a3a14e"; + sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hu/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8b76452c8aa27409237d592fa386f8fa257bf44151e77f5cbf990b1c7580689f"; + sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/hy-AM/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7855e8b013d16365fcbf883646ac83f8c094b3efc4ab9c6ada1eccf211c53d2e"; + sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/id/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b41b74af5f85a56e0ffe6345f78f39190b22a867110ef043f24300f68e845324"; + sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/is/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "963c23e640536d88fc486b654e69584587cdc39d2acff9f64372faf7fd73f8db"; + sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/it/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4835f22538eaf2da8913d79ae575c7401fcc7fb3b7c0d21d386906c055ed7912"; + sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ja/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "edd3a047d63172f5f42fa31b4b89a8d07c6d9eccb3d53d19f4f7ad8cc1cea539"; + sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ka/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "06b55cb6215cece0d95827eeb196bd5f1255d348a7d906a0515667a71050ef85"; + sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kab/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "36de72132e0311c4428182c5795249e37042f1eb05d1c05aeff9f1e46b602656"; + sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/kk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "e3462a463f867b4645bc77739e275deae77bf64068a6ddd1522ac281cfbfbd3d"; + sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ko/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "e90f011e920958ea853dd426f57a1e5cb0593ce117d5a9e19a90c6df69d729c9"; + sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lt/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4e3eaffa505b5f8a37b0534a754ab89c2f7b4dc65ead78ca266d4fa8cb5aa841"; + sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/lv/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0dd8c818bd60cd6e67df751933c0aeb89bf10fa64235edc639955c86a0e51168"; + sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ms/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b0b9f303014a1b90a52ec39f36f2e2029562ef70fcc9b77c0f7048558f1ad7bf"; + sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nb-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "89f787643d5d2451a0f7095f69805d4c0d0e05c62fbe0468c78b6bcc9dfc0dcd"; + sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "9ebf8a5cd8df953078dc634ac17325c8e0fdd01cce3dbb8561fb29e8b8a4e6cd"; + sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/nn-NO/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ec702407e9dfd14de776a5409413b8ddf3c32cf6aa17e8a37ba349e8fa7ba1db"; + sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pa-IN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f26de0a71646669f07ba23c8e181700b1569ce41049f62215c19ca746a4ca38d"; + sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d497057a71cfe867f53a5dadf3b1b8fdf30db8470cbfedd416b39acef3d61163"; + sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-BR/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "90367905fe8dd83f9c6acb093e9ba6583124171037755ef2f3a6771c94e1cb44"; + sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/pt-PT/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b611af59f7f88efa10aef43f8ac464b5c514412b534cff39eb2844ae1ca18077"; + sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/rm/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5d75ac9e6c0c27b0faf436d69305f206e09867c306264a4de30cd3b1f879c1d0"; + sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ro/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "aa64e96ad2d1a361c8cd96b5b0e88cdd51eba2c3c036ac453ff9225320d08f6a"; + sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/ru/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6d293d0ee9eebd01c6e36e085333c4da15f0ce2ece73dc99015545255a435538"; + sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "37436cda08659abd49108f7e9a8ee5645d2ee1ed0086a7b4158279342d0cbdfb"; + sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sl/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "fc8e6fed968e6312f69545479b5b3230390d41490a2a5b6385f046a2a3709018"; + sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sq/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ce68e8f855d6d366b1490cc3b7e044a84fba63bcfa11453afc4b98ec665450c6"; + sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "128843650ddfa57493c8691e7c591685cca4b1ab6c118949ef1580318954f110"; + sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/sv-SE/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7180055d5184c38f3fb893538b0c270d3d125da4434debe6fffdcd3288d8ea53"; + sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/th/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4b964b7517b941622f18328f73813aca740a4da1799805a0a267b510704308e7"; + sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/tr/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "71d551988a6ff2bd96900bf4ce72e05ac47bcb36af9a25af4e3b76d16da37d50"; + sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uk/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e62b6fce0bb1175c9c6acb37ff9454509766d4953fb0d4494023143fd70650a9"; + sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/uz/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c5c9e10e82ab793d9a82d95bcb20eb288395e32c27dcf5ca2a91fc937e479aba"; + sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/vi/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "081895dc1684360c0859d5084ece871c7539e91b858392dbaa3ddf8ee0f38ea9"; + sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-CN/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b5fadde23bd94f3ab2fbe6b8070040d9e89a506a399d9c1348b80a8639b8220b"; + sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.1/linux-i686/zh-TW/thunderbird-91.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4d31d6a8d4f94486e4ebec3c98d2d535fd5485b3b73dfa0a52760300608c7eac"; + sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 033e55575890a..5b0b66ca34511 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.6.0"; + version = "91.6.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749"; + sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ee5e98ed42c6a..3c05398df0ea3 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-xxQ6NGRSwRP+7kTxUsDB00VItHRHuaFopEroETtnGSs="; + sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index c7af9f31d3254..d56197c313474 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-3j2THRqhKK+bXIvTjyYDL9vJ9eH+Yy2LHE49auTKL5k="; + sha256 = "sha256-8oDA1QU5ZjtQZoCPVDa1U3P2KLzXtegtOxm6rNh+Ahk="; }; - vendorSha256 = "sha256-LTsq3qk95LcgyDaEtTUJWCzQY0AjrMvgn61Dhcntdl8="; + vendorSha256 = "sha256-n+WwkNHT+/CrC4vWIVHqYs2a8Qe/LNc0L3uoPZWDTts="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index f98b1c28ebf86..4dd603dae1eac 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.88"; + version = "2.89"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-B/gcuga82lZSLPKjYWAiLyvqf1FRQmHJsH2jqLkusjA="; + sha256 = "sha256-OCfgWMKFhdjdmNHnTUP2VthPxBjAVd9Z+yH/c+vF1a4="; }; - vendorSha256 = "sha256-N7zOrSMrCR/eOH+08TImI1q2AFGUuWN7xIt3CUVB9rM="; + vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 3128529f0e67e..0b95023ad59d4 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA="; + sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc="; }; modRoot = "./agent"; - vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks="; + vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8572ff15c1db4..c5b5fc56f7856 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -25,7 +25,7 @@ assert builtins.elem variant [ "fresh" "still" ]; let jre' = jre_minimal.override { - modules = [ "java.base" "java.desktop" ]; + modules = [ "java.base" "java.desktop" "java.logging" ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 58fa569bdf00d..20449b1911ff4 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.2.4"; + version = "22.2.7"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "d4edaa353039beacab7c324496a165919709814be60d9d7536f9118aab1e4f7e"; + sha256 = "f7c97f3dc3435ecdc740131548aacd390332c8b97c4e6fee98a3e80985786533"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 479b3b641cd37..383c5710808f5 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -7,78 +7,97 @@ , gtest , openssl , gflags -, gnuradio3_8 +, gnuradio , thrift -, libpcap +, enableRawUdp ? true, libpcap , orc , pkg-config -, uhd -, log4cpp , blas, lapack , matio , pugixml , protobuf }: -gnuradio3_8.pkgs.mkDerivation rec { +gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - # There's an issue with cpufeatures on 0.0.15, see: - # https://github.com/NixOS/nixpkgs/pull/142557#issuecomment-950217925 - version = "0.0.13"; + version = "0.0.16"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; + sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM="; }; + patches = [ + # Use the relative install location for volk_gnsssdr_module and + # cpu_features which is bundled in the source. NOTE: Perhaps this patch + # should be sent upstream. + ./fix_libcpu_features_install_path.patch + ]; + nativeBuildInputs = [ cmake - gnuradio3_8.unwrapped.python - gnuradio3_8.unwrapped.python.pkgs.Mako - gnuradio3_8.unwrapped.python.pkgs.six + pkg-config + gnuradio.unwrapped.python + gnuradio.unwrapped.python.pkgs.Mako + gnuradio.unwrapped.python.pkgs.six + ]; + checkInputs = [ + gtest ]; buildInputs = [ gmp armadillo - gnuradio3_8.unwrapped.boost glog - gtest - openssl gflags + openssl orc - # UHD support is optional, but gnuradio is built with it, so there's - # nothing to be gained by leaving it out. - gnuradio3_8.unwrapped.uhd - log4cpp blas lapack matio pugixml protobuf - gnuradio3_8.pkgs.osmosdr + gnuradio.unwrapped.boost + ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [ + gnuradio.unwrapped.uhd + ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [ + gnuradio.unwrapped.spdlog + ] else [ + gnuradio.unwrapped.log4cpp + ]) ++ lib.optionals (enableRawUdp) [ libpcap - ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ + ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift - gnuradio3_8.unwrapped.python.pkgs.thrift + gnuradio.unwrapped.python.pkgs.thrift + ] ++ lib.optionals (gnuradio.hasFeature "gr-pdu" || gnuradio.hasFeature "gr-iio") [ + gnuradio.unwrapped.libiio + ] ++ lib.optionals (gnuradio.hasFeature "gr-pdu") [ + gnuradio.unwrapped.libad9361 ]; cmakeFlags = [ - "-DGFlags_ROOT_DIR=${gflags}/lib" + "-DGFlags_INCLUDE_DIRS=${gflags}/include" "-DGLOG_INCLUDE_DIR=${glog}/include" + # Should use .dylib if darwin support is requested + "-DGFlags_LIBS=${gflags}/lib/libgflags.so" + "-DGLOG_LIBRARIES=${glog}/lib/libglog.so" + # Use our dependencies glog, gflags and armadillo dependencies + "-DENABLE_OWN_GLOG=OFF" + "-DENABLE_OWN_ARMADILLO=OFF" + "-DENABLE_ORC=ON" + "-DENABLE_LOG=ON" + "-DENABLE_RAW_UDP=${if enableRawUdp then "ON" else "OFF"}" + "-DENABLE_UHD=${if (gnuradio.hasFeature "gr-uhd") then "ON" else "OFF"}" + "-DENABLE_FMCOMMS2=${if (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" + "-DENABLE_PLUTOSDR=${if (gnuradio.hasFeature "gr-iio") then "ON" else "OFF"}" + "-DENABLE_AD9361=${if (gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" "-DENABLE_UNIT_TESTING=OFF" # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. - "-DBLAS=YES" - "-DLAPACK=YES" "-DBLAS_LIBRARIES=-lblas" "-DLAPACK_LIBRARIES=-llapack" - - # Similarly, it doesn't actually use gfortran despite checking for - # its presence. - "-DGFORTRAN=YES" ]; meta = with lib; { diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch new file mode 100644 index 0000000000000..cfeb0bd416b40 --- /dev/null +++ b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch @@ -0,0 +1,47 @@ +--- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800 ++++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800 +@@ -1214,7 +1214,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1247,7 +1247,7 @@ + ) + set(VOLK_GNSSSDR_BUILD_BYPRODUCTS + ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} +- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() + ExternalProject_Add(volk_gnsssdr_module +@@ -1256,7 +1256,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1271,7 +1271,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1310,7 +1310,7 @@ + if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) + if(NOT CpuFeatures_FOUND) + set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES +- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() + endif() diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 63adbf04b0e4c..f3a56cfdb0550 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -251,7 +251,11 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + log4cpp + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 784ab7bd0fc23..638064bbd0729 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -275,7 +275,11 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + log4cpp + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 2865e8b70a104..eef1960ae1f48 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -49,12 +49,12 @@ , versionAttr ? { major = "3.10"; minor = "1"; - patch = "0"; + patch = "1"; } }: let - sourceSha256 = "sha256-bU6z7H08G8QIToogAMI2P5tHBtVZezlBDqSbnEsqAjE="; + sourceSha256 = "sha256-vsAK+GQzcpA9Vsa6q4RFEzVpbF7/+yZkMsemKn6VhIg="; featuresInfo = { # Needed always basic = { @@ -293,9 +293,15 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + spdlog + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; + } // lib.optionalAttrs (hasFeature "gr-pdu") { + inherit libiio libad9361; } // lib.optionalAttrs (hasFeature "gr-qtgui") { inherit (libsForQt5) qwt; }; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 5fe7ddf813d68..28be25920a459 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -5,7 +5,6 @@ , qt5 , gnuradio3_8Minimal , thrift -, log4cpp , mpir , fftwFloat , alsa-lib @@ -39,7 +38,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { qt5.wrapQtAppsHook ]; buildInputs = [ - log4cpp + gnuradio3_8Minimal.unwrapped.log4cpp mpir fftwFloat alsa-lib diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 6960eba6a57d1..567a587e6d5bc 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -7,7 +7,6 @@ , thrift # Not gnuradioPackages' , codec2 -, log4cpp , gmp , gsm , libopus @@ -48,7 +47,7 @@ gnuradio3_8.pkgs.mkDerivation rec { buildInputs = [ gnuradio3_8.unwrapped.boost codec2 - log4cpp + gnuradio3_8.unwrapped.log4cpp gmp libpulseaudio libconfig diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index b41d266dbab58..5302b43bb0263 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.15.3"; + version = "3.15.4"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-suWp/XplruWriGIi1q9Pe3vH91XaegOUFXH6vWueFJk="; + sha256 = "sha256-OyQcUopCqL398j5b+PAISDR5BZDQhJHezqnw8AnYWJ8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 72958898428a7..3c2b11c0e292e 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "21.20.0"; + version = "22.3.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-xOtlJSUY7QLyggFXW0Ay3+6KNHIqljyDpyk0CP8jxWs="; + sha256 = "sha256-ASnweoVBYSnO/FjE9tpLgaOAgiPQeUnw7CzwkKRXnAg="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 1e3c96ae8c62a..ff2b211b34d2f 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,18 +1,25 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, cmake }: -let version = "1.6.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tetgen"; - inherit version; + version = "1.6.0"; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk="; }; + nativeBuildInputs = [ cmake ]; + installPhase = '' - mkdir -p $out/bin + runHook preInstall + + mkdir -p $out/{bin,lib,include} cp tetgen $out/bin + cp libtet.a $out/lib + cp ../tetgen.{cxx,h} $out/include + + runHook postInstall ''; meta = { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fe99b045512b9..bdd2796addcdb 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -130,11 +130,12 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ optional buildIde copyDesktopItems + ++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 806a3c34df156..22e755bd852e9 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.39.1"; + version = "3.39.2"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "1781ded0d0062f40a7eaf3ead8dcbef4429c6321"; - sha256 = "0xdpbfjfa1q4cnf87nl7l760ivr4agpqmy3i1f2b132sgbjzm1xx"; + rev = "402f41cdedbd46a368fb7807bebe83550d887631"; + sha256 = "0jddakr07ixspw19xblpj1882vxxaljg3fflhn4myvigwzkav334"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 7d447745a23d2..8b9f64a8f5b94 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; - sha256 = "d532ba31aafe17afba1130f92410d9257454ff7393d1eb2fe032f0c07f352da5"; + sha256 = "sha256-+hhUPkTtWXSoW9LGDA3BZiCuEXaA6o5pPSaRmZ7ZCyI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 5ea3550d08a44..7515d6d344fd6 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "getdp"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; - sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf"; + sha256 = "sha256-d5YxJgtMf94PD6EHvIXpPBFPKC+skI/2v1K5Sad51hA="; }; inherit (petsc) mpiSupport; diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 474c8d1ea060e..60841eaa3ee2b 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,6 +8,13 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { + version = "13.0.1"; + lang = "en"; + language = "English"; + sha256 = "3672a920c1b4af1afd480733f6d67665baf8258757dfe59a6ed6d7440cf26dba"; + installer = "Mathematica_13.0.1_BNDL_LINUX.sh"; + } + { version = "13.0.0"; lang = "en"; language = "English"; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e4531f0e5c2d3..73a5881d21428 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -144,6 +144,17 @@ stdenv.mkDerivation rec { rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579"; sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs="; }) + + # TODO: This will not be necessary when Sphinx 4.4.1 is released, + # since some warnings introduced in 4.4.0 will be disabled by then + # (https://github.com/sphinx-doc/sphinx/pull/10126). + # https://trac.sagemath.org/ticket/33272 + (fetchSageDiff { + base = "9.5"; + name = "sphinx-4.4-warnings.patch"; + rev = "97d7958bed441cf2ccc714d88f83d3a8426bc085"; + sha256 = "sha256-y1STE0oxswnijGCsBw8eHWWqpmT1XMznIfA0vvX9pFA="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 60f9810dfb6a0..c41c8593a5c49 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -7,13 +7,13 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.6"; + version = "3.7"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; + sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; }; buildInputs = [ @@ -30,7 +30,7 @@ mkDerivation rec { with a graphical and command-line interface. ''; homepage = "https://colmap.github.io/index.html"; - license = licenses.bsd2; + license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ lebastr ]; }; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 86cab93fa209d..5cfd7be8e64a7 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220210171524"; + version = "3.1.20220217190813"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "sha256-Z0Btg2NklOwwv9c9lIwE6ONpfwCqZfraNWZd3qxzpGs="; + sha256 = "sha256-2Zd1Z/Tv8wAiqlaYkZRflsUVl8OAOXdufq9k4j4L7f0="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 002c383dcaf65..888419fbc86fd 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, perl, python3, boost, valgrind -# Optional requirements -# Lua 5.3 needed and not available now -#, luaSupport ? false, lua5 +{ stdenv, lib, fetchFromGitLab, cmake, perl, python3, boost , fortranSupport ? false, gfortran , buildDocumentation ? false, fig2dev, ghostscript, doxygen , buildJavaBindings ? false, openjdk +, buildPythonBindings ? true, python3Packages , modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw +, minimalBindings ? false , debug ? false +, optimize ? (!debug) , moreTests ? false +, withoutBin ? false }: with lib; @@ -18,54 +19,35 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.28"; + version = "3.30"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0vylwgd4i89bvhbgfay0wq953324dwfmmr8jp9b4vvlc9m0017r9"; + sha256 = "1dg8ywqif20g0fs8dnd6364n080nvwx7f444zcfwqwz6iax61qv1"; }; - patches = [ - (fetchpatch { - name = "fix-smpi-dirs-absolute.patch"; - url = "https://framagit.org/simgrid/simgrid/-/commit/71f01e667577be1076646eb841e0a57bd5388545.patch"; - sha256 = "0x3y324b6269687zfy43ilc48bwrs4nb7svh2mpg88lrz53rky15"; - }) - ]; - propagatedBuildInputs = [ boost ]; - nativeBuildInputs = [ cmake perl python3 valgrind ] - ++ optionals fortranSupport [ gfortran ] - ++ optionals buildJavaBindings [ openjdk ] - ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] - ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; + nativeBuildInputs = [ cmake perl python3 ] + ++ optionals fortranSupport [ gfortran ] + ++ optionals buildJavaBindings [ openjdk ] + ++ optionals buildPythonBindings [ python3Packages.pybind11 ] + ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] + ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; - #buildInputs = optional luaSupport lua5; - - # Make it so that libsimgrid.so will be found when running programs from - # the build dir. - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/build/lib" - ''; + outputs = [ "out" ] + ++ optionals buildPythonBindings [ "python" ]; - # Release mode is not supported in SimGrid + # "Release" does not work. non-debug mode is Debug compiled with optimization cmakeBuildType = "Debug"; - - # Disable/Enable functionality - # Note: those packages are not packaged in Nixpkgs yet so some options - # are disabled: - # - papi: for enable_smpi_papi - # - ns3: for enable_ns3 - # - lua53: for enable_lua - # - # For more information see: - # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options) cmakeFlags = [ "-Denable_documentation=${optionOnOff buildDocumentation}" "-Denable_java=${optionOnOff buildJavaBindings}" + "-Denable_python=${optionOnOff buildPythonBindings}" + "-DSIMGRID_PYTHON_LIBDIR=./" # prevents CMake to install in ${python3} dir + "-Denable_msg=${optionOnOff buildJavaBindings}" "-Denable_fortran=${optionOnOff fortranSupport}" "-Denable_model-checking=${optionOnOff modelCheckingSupport}" "-Denable_ns3=off" @@ -75,27 +57,28 @@ stdenv.mkDerivation rec { "-Denable_mallocators=on" "-Denable_debug=on" "-Denable_smpi=on" + "-Dminimal-bindings=${optionOnOff minimalBindings}" "-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}" "-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}" - "-Denable_compile_warnings=${optionOnOff debug}" - "-Denable_compile_optimizations=${optionOnOff (!debug)}" - "-Denable_lto=${optionOnOff (!debug)}" - # "-Denable_lua=${optionOnOff luaSupport}" - # "-Denable_smpi_papi=${optionOnOff moreTests}" + "-Denable_compile_warnings=off" + "-Denable_compile_optimizations=${optionOnOff optimize}" + "-Denable_lto=${optionOnOff optimize}" ]; - makeFlags = optional debug "VERBOSE=1"; - # Some Perl scripts are called to generate test during build which - # is before the fixupPhase, so do this manualy here: + # needed to run tests and to ensure correct shabangs in output scripts preBuild = '' patchShebangs .. ''; - doCheck = true; + # needed by tests (so libsimgrid.so is found) + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/build/lib" + ''; - # Prevent the execution of tests known to fail. + doCheck = true; preCheck = '' + # prevent the execution of tests known to fail cat <<EOW >CTestCustom.cmake SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) EOW @@ -104,6 +87,20 @@ stdenv.mkDerivation rec { make tests -j $NIX_BUILD_CORES ''; + postInstall = lib.optionalString withoutBin '' + # remove bin from output if requested. + # having a specific bin output would be cleaner but it does not work currently (circular references) + rm -rf $out/bin + '' + lib.optionalString buildPythonBindings '' + # manually install the python binding if requested. + mkdir -p $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/ + cp ./lib/simgrid.cpython*.so $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/ + ''; + + # improve debuggability if requested + hardeningDisable = lib.optionals debug [ "fortify" ]; + dontStrip = debug; + meta = { description = "Framework for the simulation of distributed applications"; longDescription = '' @@ -118,5 +115,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 40c102fc68220..f4a3da9711dda 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,8 +1,8 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.10.0"; + version = "6.15.5"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -29,12 +29,31 @@ python3Packages.buildPythonApplication rec { wrapt ]; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "199a86c8d1fcfdb88c4271a1507b0ab371a15bc407f2dad9b0ab8c43438adff8"; + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU="; }; - doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json + # See + # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99 + # for the current basic test suite. Tibanna and Tes require extra + # setup. + + checkInputs = with python3Packages; [ + pandas + pytestCheckHook + requests-mock + ]; + + disabledTestPaths = [ + "tests/test_tes.py" + "tests/test_tibanna.py" + "tests/test_linting.py" + ]; + + pythonImportsCheck = [ "snakemake" ]; meta = with lib; { homepage = "https://snakemake.github.io"; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 76d2318cead41..afd05c3e8f711 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.4"; + version = "4.2.0"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -29,6 +29,8 @@ mkDerivation rec { "CONFIG+=StableBuild" # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" + # Tries to download x86_64-only prebuilt binaries + "DEFINES+=DISABLE_AIRMAP" "../qgroundcontrol.pro" ]; @@ -62,13 +64,13 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "0lhc36jpy7a5bnysqi574nk5izglj557mf8n9lcsgvzwxlkb2rbf"; + sha256 = "sha256-TBnJQKO9cwxP9q+bIB1CaGnm9npymJ3iEAD9kPJi9JA="; fetchSubmodules = true; }; meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = "http://qgroundcontrol.org/"; + homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 6dd9c61d66072..73d35b1bd9b2f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, libgit2, ...}: +{ fetchFromGitHub, libgit2, ... }: libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ @@ -8,15 +8,18 @@ libgit2.overrideAttrs (oldAttrs: { "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_GSSAPI=OFF" "-DUSE_HTTPS=OFF" - "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 "-DUSE_NTLMCLIENT=OFF" "-DUSE_SSH=OFF" "-DZERO_NSEC=ON" ]; + src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61"; sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY="; }; + + patches = [ ]; }) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 39b52cd7fa677..9f0126d9ac4c8 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "sha256-xXE0BCO1Ur5qhn0gOKOqaSGKNeXNEHD+pZCz1SoPD3A="; + sha256 = "sha256-IEo8poEYPjAbBGk+SQdJqyhwgMYjNLdibI+AktVIg1g="; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 7983251a459da..51c9dd71f1601 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -14,6 +14,8 @@ let rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; }; + + patches = []; }); rubyEnv = bundlerEnv rec { diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5f28580c7d405..80c2679d05cf5 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-X7TDbThWKS6/WEBR1ZMG2WrYqjK1U3RSsdnEdvlasRo="; + sha256 = "sha256-Z/E2R6RlF6K1Z83Lc8mHIdddNqBDLeuxUCK3f5wTgzM="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-rIG57oPCTUz4HNJyuMBPlKTSh02ecF5052Q1P9wGq1s="; + sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; sourceRoot = "${pname}-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 287557d6f53eb..2bd30c9e5291b 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, makeDesktopItem, ffmpeg , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine +, yt-dlp }: mkDerivation rec { @@ -16,7 +17,15 @@ mkDerivation rec { buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = lib.optionalString (ffmpeg != null) '' + patches = [ + ./yt-dlp-path.patch + ]; + + postPatch = '' + substituteInPlace youtube_dl.cpp \ + --replace 'QString YoutubeDl::path = QString();' \ + 'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");' + '' + lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' diff --git a/pkgs/applications/video/clipgrab/yt-dlp-path.patch b/pkgs/applications/video/clipgrab/yt-dlp-path.patch new file mode 100644 index 0000000000000..5a9a4b6dcc48d --- /dev/null +++ b/pkgs/applications/video/clipgrab/yt-dlp-path.patch @@ -0,0 +1,86 @@ +--- a/main.cpp ++++ b/main.cpp +@@ -91,14 +91,5 @@ int main(int argc, char *argv[]) + w.show(); + } + +- QTimer::singleShot(0, [=] { +- cg->getUpdateInfo(); +- QObject::connect(cg, &ClipGrab::updateInfoProcessed, [cg] { +- bool force = QSettings().value("forceYoutubeDlDownload", false).toBool(); +- if (force) QSettings().setValue("forceYoutubeDlDownload", false); +- cg->downloadYoutubeDl(force); +- }); +- }); +- + return app.exec(); + } +--- a/youtube_dl.cpp ++++ b/youtube_dl.cpp +@@ -8,52 +8,16 @@ YoutubeDl::YoutubeDl() + QString YoutubeDl::path = QString(); + + QString YoutubeDl::find(bool force) { +- if (!force && !path.isEmpty()) return path; +- +- // Prefer downloaded youtube-dl +- QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp"); +- QProcess* process = instance(localPath, QStringList() << "--version"); +- process->start(); +- process->waitForFinished(); +- process->deleteLater(); +- if (process->state() != QProcess::NotRunning) process->kill(); +- if (process->exitCode() == QProcess::ExitStatus::NormalExit) { +- path = localPath; +- return path; +- } +- +- // Try system-wide youtube-dlp installation +- QString globalPath = QStandardPaths::findExecutable("yt-dlp"); +- process = instance(globalPath, QStringList() << "--version"); +- process->start(); +- process->waitForFinished(); +- process->deleteLater(); +- if (process->state() != QProcess::NotRunning) process->kill(); +- if (process->exitCode() == QProcess::ExitStatus::NormalExit) { +- path = globalPath; +- return path; +- } +- +- return ""; ++ // We supply yt-dlp from nixpkgs, so the downloading ++ // machinery is not needed anymore. ++ (void)force; ++ return path; + } + + QProcess* YoutubeDl::instance(QStringList arguments) { +- return instance(find(), arguments); +-} +- +-QProcess* YoutubeDl::instance(QString path, QStringList arguments) { + QProcess *process = new QProcess(); + +- QString execPath = QCoreApplication::applicationDirPath(); +- QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); +- env.insert("PATH", execPath + ":" + env.value("PATH")); +- process->setEnvironment(env.toStringList()); +- +- #if defined Q_OS_WIN +- process->setProgram(execPath + "/python/python.exe"); +- #else +- process->setProgram(QStandardPaths::findExecutable("python3")); +- #endif ++ process->setProgram(path); + + QSettings settings; + QStringList proxyArguments; +@@ -81,7 +45,7 @@ QProcess* YoutubeDl::instance(QString path, QStringList arguments) { + networkArguments << "--force-ipv4"; + } + +- process->setArguments(QStringList() << path << arguments << proxyArguments << networkArguments); ++ process->setArguments(QStringList() << arguments << proxyArguments << networkArguments); + return process; + } + diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index 596ab546766b3..460b0a176688b 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -2,7 +2,7 @@ let pname = "lbry-desktop"; - version = "0.52.2"; + version = "0.52.4"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec { src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml - sha512 = "+yymVTpEQ0hKrJYij9lNVxK5J8vnW1g5o1TkGJX/TkSAqIUFhwRUJyqDS3uCvgTrD8ywulewgk1TREd/PA615w=="; + sha512 = "TWRFCVktSKs5PORtm8FvM6qNWuiL/1HN98ilr1busVUGvain0QXGZwB/Dzvsox1c+X9VofUdapzozSOT6r58qw=="; }; }; diff --git a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch b/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch deleted file mode 100644 index 0bc7962486075..0000000000000 --- a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 635772c4c5ecf11a0f84e6c9fc273dce6b9a5688 Mon Sep 17 00:00:00 2001 -From: V <v@anomalous.eu> -Date: Thu, 10 Jun 2021 18:36:22 +0200 -Subject: [PATCH] Change product_version to user_agent_product - -This is its name as of CEF 91.1.0. ---- - obs-browser-plugin.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp -index 1a6a009..5eb379e 100644 ---- a/plugins/obs-browser/obs-browser-plugin.cpp -+++ b/plugins/obs-browser/obs-browser-plugin.cpp -@@ -298,7 +298,7 @@ static void BrowserInit(void) - prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min) - << "." << std::to_string(obs_pat); - -- CefString(&settings.product_version) = prod_ver.str(); -+ CefString(&settings.user_agent_product) = prod_ver.str(); - - #ifdef USE_QT_LOOP - settings.external_message_pump = true; --- -2.31.1 - diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index f8bed23656385..6d3f9b6d32dbb 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -34,8 +34,10 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio , libcef +, pciutils , pipewireSupport ? stdenv.isLinux , pipewire +, libdrm }: let @@ -44,22 +46,19 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.0.1"; + version = "27.2.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "04fzsr9yizmxy0r7z2706crvnsnybpnv5kgfn77znknxxjacfhkn"; + sha256 = "KZgwAtyxv2vXDW7vF1eArF5Mqw45NngwChc+5OnXuXg="; fetchSubmodules = true; }; patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch - - # Lets obs-browser build against CEF 91.1.0+ - ./Change-product_version-to-user_agent_product.patch ]; nativeBuildInputs = [ @@ -89,11 +88,12 @@ mkDerivation rec { x264 libvlc mbedtls + pciutils ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio - ++ optional pipewireSupport pipewire; + ++ optionals pipewireSupport [ pipewire libdrm ]; # Copied from the obs-linuxbrowser postUnpack = '' @@ -143,5 +143,6 @@ mkDerivation rec { maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + mainProgram = "obs"; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix index 5c13d33ae466f..d747268cc5567 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix @@ -4,24 +4,48 @@ , fetchpatch , cmake , qtbase +, qtsvg , obs-studio , asio_1_10 , websocketpp +, nlohmann_json }: stdenv.mkDerivation rec { pname = "obs-websocket"; - version = "4.9.1"; + + # We have updated to the alpha version when OBS Studio 27.2 was + # released, because this is the only version of obs-websocket that + # builds against the new OBS Studio. + version = "5.0.0-alpha3"; src = fetchFromGitHub { owner = "Palakis"; repo = "obs-websocket"; rev = version; - sha256 = "sha256-XCiSNWTiA/u+3IbYlhIc5bCjKjLHDRVjYIG5MEoYnr0="; + sha256 = "Lr6SBj5rRTAWmn9Tnlu4Sl7SAkOCRCTP6sFWSp4xB+I="; + fetchSubmodules = true; }; + patches = [ + # This patch can be dropped when obs-websocket is updated to the + # next version. + (fetchpatch { + url = "https://github.com/obsproject/obs-websocket/commit/13c7b83c34eb67b2ee80af05071d81f10d0d2997.patch"; + sha256 = "TNap/T8+058vhfWzRRr4vmlblFk9tHMUNyG6Ob5PwiM="; + name = "obs-addref-werror-fix.patch"; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase obs-studio asio_1_10 websocketpp ]; + buildInputs = [ + qtbase + qtsvg + obs-studio + asio_1_10 + websocketpp + nlohmann_json + ]; dontWrapQtApps = true; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4845b1b6466a3..e83fc4ef50183 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "colima"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hZ5BqNHQAMzL69ptpbTT+fN4NdV4AFhboCL2t1sF5AQ="; + sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index a41dde4c95195..aa4a9000d2306 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,15 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.9"; - - outputs = [ "out" "man" ]; + version = "1.6.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg="; + sha256 = "sha256-0Fbmtb7Ec6WcA7ARtgdBK5i7yAq2t3iXtfLb/MZcKJA="; }; vendorSha256 = null; @@ -32,14 +30,13 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - make binaries man "VERSION=v${version}" "REVISION=${src.rev}" + make binaries "VERSION=v${version}" "REVISION=${src.rev}" runHook postBuild ''; installPhase = '' runHook preInstall install -Dm555 bin/* -t $out/bin - installManPage man/*.[1-9] installShellCompletion --bash contrib/autocomplete/ctr installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete runHook postInstall @@ -51,7 +48,7 @@ buildGoModule rec { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester endocrimes ]; + maintainers = with maintainers; [ offline vdemeester endocrimes zowoq ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 2ae0aca5845e0..ee923f4e0cd0a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -2,7 +2,7 @@ , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell -, attr, libcap, libcap_ng +, attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp @@ -31,6 +31,8 @@ ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false +, doCheck ? false +, qemu # for passthru.tests }: stdenv.mkDerivation rec { @@ -158,7 +160,6 @@ stdenv.mkDerivation rec { ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" ++ lib.optional uringSupport "--enable-linux-io-uring"; - doCheck = false; # tries to access /dev dontWrapGApps = true; # QEMU attaches entitlements with codesign and strip removes those, @@ -182,6 +183,40 @@ stdenv.mkDerivation rec { ''; preBuild = "cd build"; + # tests can still timeout on slower systems + inherit doCheck; + checkInputs = [ socat ]; + preCheck = '' + # time limits are a little meagre for a build machine that's + # potentially under load. + substituteInPlace ../tests/unit/meson.build \ + --replace 'timeout: slow_tests' 'timeout: 50 * slow_tests' + substituteInPlace ../tests/qtest/meson.build \ + --replace 'timeout: slow_qtests' 'timeout: 50 * slow_qtests' + substituteInPlace ../tests/fp/meson.build \ + --replace 'timeout: 90)' 'timeout: 300)' + + # point tests towards correct binaries + substituteInPlace ../tests/unit/test-qga.c \ + --replace '/bin/echo' "$(type -P echo)" + substituteInPlace ../tests/unit/test-io-channel-command.c \ + --replace '/bin/socat' "$(type -P socat)" + + # combined with a long package name, some temp socket paths + # can end up exceeding max socket name len + substituteInPlace ../tests/qtest/bios-tables-test.c \ + --replace 'qemu-test_acpi_%s_tcg_%s' '%s_%s' + + # get-fsinfo attempts to access block devices, disallowed by sandbox + sed -i -e '/\/qga\/get-fsinfo/d' -e '/\/qga\/blacklist/d' \ + ../tests/unit/test-qga.c + '' + lib.optionalString stdenv.isDarwin '' + # skip test that stalls on darwin, perhaps due to subtle differences + # in fifo behaviour + substituteInPlace ../tests/unit/meson.build \ + --replace "'test-io-channel-command'" "#'test-io-channel-command'" + ''; + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm @@ -189,6 +224,9 @@ stdenv.mkDerivation rec { passthru = { qemu-system-i386 = "bin/qemu-system-i386"; + tests = { + qemu-tests = qemu.override { doCheck = true; }; + }; }; # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix deleted file mode 100644 index 17cee52a64e05..0000000000000 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, curl, SDL }: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2018-09-23"; - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; - }; - buildInputs = [ openssl curl SDL ]; - makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - meta = { - homepage = "https://bellard.org/tinyemu/"; - description = "A system emulator for the RISC-V and x86 architectures"; - longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with lib.licenses; [ mit bsd2 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jhhuh ]; - }; -} diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 07b7a557836c0..6ac7377122de8 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-ojKloMFbpBsr8fykMbLIBAzrlVaJDv+4BL0lozXsgC4="; + sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index a194a1326690d..da04da4e9eae2 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.4"; + version = "0.21.5"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D/+SDKkrYfdzFw+cNBJrCshpDuFSLbr70jvFMbX3B0w="; + sha256 = "sha256-0maPT1NdWFkSupU6CL2cFd6hlZ2BMxAOK6f3rQbfFA8="; }; - cargoSha256 = "sha256-tNwf2ShnzoSrb1R/g0hOGwQMulWYXyVCILU3Jb+Sfpg="; + cargoSha256 = "sha256-QUecTmw8pWqrTdcstbXoFf53dFfwFN51tQ7ngUzkyV0="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 5b77320e2203c..20f4c33ae60e1 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-WGss/XmryULq8Ly5MFmEqsL+9r4fnrvBEtetngJ05NY="; + sha256 = "sha256-GLHmX628UUdIM+xYJhPtqFg4whQqaF8hFxg0Z5grPac="; }; - cargoSha256 = "sha256-9qvXzsAu4H2TAcArajrGqXwKF3BBDvmZbny7hiVO9Yo="; + cargoSha256 = "sha256-4Pu3TDLmi0c2nyUj1lTRincgRqL40A/g0PkyJOen0is="; buildInputs = rpathLibs; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 20e29938d0c3d..b5a524a38b49e 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "9"; + version = "9.1"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg="; + sha256 = "sha256-Fqk6bPAOg4muxmSP+ezpGUNw6xrMWchZACKemeA08mA="; fetchSubmodules = true; }; diff --git a/pkgs/build-support/fetchgit/deterministic-git b/pkgs/build-support/fetchgit/deterministic-git new file mode 100755 index 0000000000000..67f5855591167 --- /dev/null +++ b/pkgs/build-support/fetchgit/deterministic-git @@ -0,0 +1,45 @@ +#!/bin/sh + +# some git commands print to stdout, which would contaminate our JSON output +clean_git(){ + git "$@" >&2 +} + +# Remove all remote branches, remove tags not reachable from HEAD, do a full +# repack and then garbage collect unreferenced objects. +make_deterministic_repo(){ + local repo="$1" + + # run in sub-shell to not touch current working directory + ( + cd "$repo" + # Remove files that contain timestamps or otherwise have non-deterministic + # properties. + rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD \ + .git/refs/remotes/origin/HEAD .git/config + + # Remove all remote branches. + git branch -r | while read -r branch; do + clean_git branch -rD "$branch" + done + + # Remove tags not reachable from HEAD. If we're exactly on a tag, don't + # delete it. + maybe_tag=$(git tag --points-at HEAD) + git tag --contains HEAD | while read -r tag; do + if [ "$tag" != "$maybe_tag" ]; then + clean_git tag -d "$tag" + fi + done + + # Do a full repack. Must run single-threaded, or else we lose determinism. + clean_git config pack.threads 1 + clean_git repack -A -d -f + rm -f .git/config + + # Garbage collect unreferenced objects. + # Note: --keep-largest-pack prevents non-deterministic ordering of packs + # listed in .git/objects/info/packs by only using a single pack + clean_git gc --prune=all --keep-largest-pack + ) +} diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix new file mode 100644 index 0000000000000..5208dbc7d05dc --- /dev/null +++ b/pkgs/build-support/flutter/default.nix @@ -0,0 +1,277 @@ +{ flutter +, lib +, llvmPackages_13 +, cmake +, ninja +, pkg-config +, wrapGAppsHook +, autoPatchelfHook +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, libxkbcommon +, at-spi2-core +, libsecret +, jsoncpp +, xorg +, dbus +, gtk3 +, glib +, pcre +, libepoxy +, stdenvNoCC +, cacert +, git +, dart +, nukeReferences +, targetPlatform +, bash +, curl +, unzip +, which +, xz +}: + +# absolutely no mac support for now + +args: +let + pl = n: "##FLUTTER_${n}_PLACEHOLDER_MARKER##"; + placeholder_deps = pl "DEPS"; + placeholder_flutter = pl "FLUTTER"; + fetchAttrs = [ "src" "sourceRoot" "setSourceRoot" "unpackPhase" "patches" ]; + getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null); + flutterDeps = [ + # flutter deps + flutter.unwrapped + bash + curl + flutter.dart + git + unzip + which + xz + ]; + self = +(self: llvmPackages_13.stdenv.mkDerivation (args // { + deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { + name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${targetPlatform.system}.tar.gz"; + + nativeBuildInputs = flutterDeps ++ [ + nukeReferences + ]; + + installPhase = '' + . ${../fetchgit/deterministic-git} + + TMP=$(mktemp -d) + + export HOME="$TMP" + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + + flutter config --no-analytics &>/dev/null # mute first-run + flutter config --enable-linux-desktop + flutter packages get + flutter build linux || true # so it downloads tools + + RES="$TMP" + + mkdir -p "$RES/f" + + # so we can use lock, diff yaml + cp "pubspec.yaml" "$RES" + cp "pubspec.lock" "$RES" + mv .dart_tool .flutter-plugins .flutter-plugins-dependencies .packages "$RES/f" + + # replace paths with placeholders + find "$RES" -type f -exec sed -i \ + -e s,$TMP,${placeholder_deps},g \ + -e s,${flutter.unwrapped},${placeholder_flutter},g \ + {} + + + remove_line_matching() { + replace_line_matching "$1" "$2" "" + } + + replace_line_matching() { + sed "s|.*$2.*|$3|g" -r -i "$1" + } + + # nuke nondeterminism + + # clientId is random + remove_line_matching "$RES/.flutter" clientId + + # deterministic git repos + find "$RES" -iname .git -type d | while read -r repoGit; do + make_deterministic_repo "$(dirname "$repoGit")" + done + + # dart _fetchedAt, etc + DART_DATE=$(date --date="@$SOURCE_DATE_EPOCH" -In | sed "s|,|.|g" | sed "s|+.*||g") + find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} + + replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",' + replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",' + remove_line_matching "$RES/f/.packages" "Generated by pub" + + # nuke refs + find "$RES" -type f -exec nuke-refs {} + + + # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ + tar --owner=0 --group=0 --numeric-owner --format=gnu \ + --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ + -czf "$out" -C "$RES" . + ''; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" + ]; + + # unnecesarry + dontFixup = true; + + outputHashAlgo = if self ? vendorHash then null else "sha256"; + # outputHashMode = "recursive"; + outputHash = if self ? vendorHash then + self.vendorHash + else if self ? vendorSha256 then + self.vendorSha256 + else + lib.fakeSha256; + + }); + + nativeBuildInputs = flutterDeps ++ [ + # flutter dev tools + cmake + ninja + pkg-config + wrapGAppsHook + # flutter likes dynamic linking + autoPatchelfHook + ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; + + buildInputs = [ + # cmake deps + gtk3 + glib + pcre + util-linux + # also required by cmake, not sure if really needed or dep of all packages + libselinux + libsepol + libthai + libdatrie + xorg.libXdmcp + xorg.libXtst + libxkbcommon + dbus + at-spi2-core + libsecret + jsoncpp + # build deps + xorg.libX11 + # directly required by build + libepoxy + ] ++ lib.optionals (args ? buildInputs) args.buildInputs; + + # TODO: do we need this? + NIX_LDFLAGS = "-rpath ${lib.makeLibraryPath self.buildInputs}"; + NIX_CFLAGS_COMPILE = "-I${xorg.libX11}/include"; + LD_LIBRARY_PATH = lib.makeLibraryPath self.buildInputs; + + configurePhase = '' + runHook preConfigure + + # for some reason fluffychat build breaks without this - seems file gets overriden by some tool + cp pubspec.yaml pubspec-backup + + # we get this from $depsFolder so disabled for now, but we might need it again once deps are fetched properly + # flutter config --no-analytics >/dev/null 2>/dev/null # mute first-run + # flutter config --enable-linux-desktop + + # extract deps + depsFolder=$(mktemp -d) + tar xzf "$deps" -C "$depsFolder" + + # after extracting update paths to point to real paths + find "$depsFolder" -type f -exec sed -i \ + -e s,${placeholder_deps},$depsFolder,g \ + -e s,${placeholder_flutter},${flutter.unwrapped},g \ + {} + + + # ensure we're using a lockfile for the right package version + if [ -e pubspec.lock ]; then + # diff -u pubspec.lock $depsFolder/pubspec.lock + true + else + cp -v "$depsFolder/pubspec.lock" . + fi + diff -u pubspec.yaml $depsFolder/pubspec.yaml + + mv -v $(find $depsFolder/f -type f) . + + # prepare + export HOME=$depsFolder + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + + # binaries need to be patched + autoPatchelf -- "$depsFolder" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # for some reason fluffychat build breaks without this - seems file gets overriden by some tool + mv pubspec-backup pubspec.yaml + mkdir -p build/flutter_assets/fonts + + flutter packages get --offline -v + flutter build linux --release -v + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + built=build/linux/*/release/bundle + + mkdir -p $out/bin + mv $built $out/app + + for f in $built/data/flutter_assets/assets/*.desktop; do + install -D $f $out/share/applications/$(basename $f) + done + for f in $(find $out/app -maxdepth 1 -type f); do + ln -s $f $out/bin/$(basename $f) + done + + # this confuses autopatchelf hook otherwise + rm -rf "$depsFolder" + + # make *.so executable + find $out/app -iname "*.so" -type f -exec chmod +x {} + + + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral + for f in $(find $out/app -executable -type f); do + if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also + echo "strip RPath of $f" + newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") + patchelf --set-rpath "$newrp" "$f" + fi + done + + runHook postInstall + ''; +})) self; +in + self diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index 01f8ae2533e6f..14f25a91601cc 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -10,38 +10,103 @@ # commit. { url ? null # The git url, if empty it will be set to src.url , branch ? null +, stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD) +, tagPrefix ? "" # strip this prefix from a tag name when using stable version }: let updateScript = writeShellScript "unstable-update-script.sh" '' set -ex - url="$1" + url="" + branch="" + use_stable_version="" + tag_prefix="" + + while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + url="''${flag#*=}" + ;; + --branch=*) + branch="''${flag#*=}" + ;; + --use-stable-version) + use_stable_version=1 + ;; + --tag-prefix=*) + tag_prefix="''${flag#*=}" + ;; + *) + echo "$0: unknown option ‘''${flag}’" + exit 1 + ;; + esac + done # By default we set url to src.url if [[ -z "$url" ]]; then url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \ - "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url" \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \ | tr -d '"')" fi # Get info about HEAD from a shallow git clone tmpdir="$(${coreutils}/bin/mktemp -d)" - ${git}/bin/git clone --bare --depth=1 \ - ${lib.optionalString (branch != null) "--branch ${branch}"} \ - "$url" "$tmpdir" + + cloneArgs=( + --bare + --depth=1 + ) + + if [[ -n "$branch" ]]; then + cloneArgs+=(--branch="$branch") + fi + + ${git}/bin/git clone "''${cloneArgs[@]}" "$url" "$tmpdir" + pushd "$tmpdir" commit_date="$(${git}/bin/git show -s --pretty='format:%cs')" commit_sha="$(${git}/bin/git show -s --pretty='format:%H')" + if [[ -z "$use_stable_version" ]]; then + new_version="unstable-$commit_date" + else + depth=100 + while (( $depth < 10000 )); do + last_tag="$(${git}/bin/git describe --tags --abbrev=0 2> /dev/null || true)" + if [[ -n "$last_tag" ]]; then + break + fi + ${git}/bin/git fetch --depth="$depth" --tags + depth=$(( $depth * 2 )) + done + if [[ -z "$last_tag" ]]; then + echo "Cound not found a tag within last 10000 commits" > /dev/stderr + exit 1 + fi + if [[ -n "$tag_prefix" ]]; then + last_tag="''${last_tag#$tag_prefix}" + fi + new_version="$last_tag+date=$commit_date" + fi popd - ${coreutils}/bin/rm -rf "$tmpdir" + # ${coreutils}/bin/rm -rf "$tmpdir" # update the nix expression ${common-updater-scripts}/bin/update-source-version \ "$UPDATE_NIX_ATTR_PATH" \ - "unstable-$commit_date" \ + "$new_version" \ --rev="$commit_sha" ''; -in [ updateScript url ] - +in [ + updateScript + "--url=${builtins.toString url}" +] ++ lib.optionals (branch != null) [ + "--branch=${branch}" +] ++ lib.optionals stableVersion [ + "--use-stable-version" + "--tag-prefix=${tagPrefix}" +] diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index e8f671566d8dd..23dfd975bf745 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "41.1"; + version = "41.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ve499XfRcX/BUvwq64nQr3qeyoZsiXTGdfYL1jCIjEg="; + sha256 = "0xcIld06i7EXyfFIoLs/tJDRr3ExxEFod7G7/sWROVo="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index ff86338c26d4a..322a033cab2d3 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "sahel-fonts"; - version = "1.0.0-alpha22"; + version = "3.4.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; ''; - sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7"; + sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 5cf54697fdf60..df8d78b05e519 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "shabnam-fonts"; - version = "4.0.0"; + version = "5.0.1"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; ''; - sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba"; + sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/data/icons/vimix-icon-theme/default.nix index 502a8023c9bd2..853b1d209abbf 100644 --- a/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, colorVariants ? [] # default: all +}: + +let + pname = "vimix-icon-theme"; + +in +lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants stdenv.mkDerivation rec { - pname = "vimix-icon-theme"; + inherit pname; version = "2021-11-09"; src = fetchFromGitHub { @@ -23,10 +36,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + patchShebangs install.sh - ./install.sh -a -d $out/share/icons + + ./install.sh \ + ${if colorVariants != [] then builtins.toString colorVariants else "-a"} \ + -d $out/share/icons + # replace duplicate files with symlinks - jdupes -l -r $out/share/icons + jdupes -L -r $out/share/icons + runHook postInstall ''; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 2ffb05e2eb96f..9ac49167f66b4 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20220119"; + version = "20220216"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-8JJ6RG7yA1ssoYsvgDYp3/r+h1+rKnOwwoDhRx2brY8="; + sha256 = "sha256-Nr8OvxbJRf9t2BUtEX3qBAH2BSs6KWLMzSpykiwYsHQ="; }; preConfigure = '' diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh deleted file mode 100644 index 0bb61d863ecea..0000000000000 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source "$stdenv/setup" - -mkdir -p $out/share/GeoIP -cd $out/share/GeoIP - -# Iterate over all environment variable names beginning with "src": -for var in "${!src@}"; do - # Store the value of the variable with name $var in $src: - eval src="\$$var" - - # Copy $src to current directory, removing Nix hash from the filename: - dest="${src##*/}" - dest="${dest#*-}" - cp "$src" "$dest" -done - -gzip -dv *.gz - -ln -s GeoLiteCity.dat GeoIPCity.dat -ln -s GeoLiteCityv6.dat GeoIPCityv6.dat diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 735a660894926..ad9560da9a481 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,41 +1,34 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, zstd }: -let - fetchDB = src: sha256: fetchurl { - inherit sha256; - url = "https://geolite.maxmind.com/download/geoip/database/${src}"; - }; -in stdenv.mkDerivation { pname = "geolite-legacy"; - version = "2017-12-02"; + version = "2022-01-25"; + + # We use Arch Linux package as a snapshot, because upstream database is updated in-place. + geoip = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-ieuLpllJTHYu28UXBGfDWbnr9Ei8pGnos+RPWDsAGcM="; + }; - srcGeoIP = fetchDB - "GeoLiteCountry/GeoIP.dat.gz" - "1nggml11wzlanmzk6wbw2kla91fj8ggd9kh9yz42lnyckdlf5ac4"; - srcGeoIPv6 = fetchDB - "GeoIPv6.dat.gz" - "0w809xgmr5zi4fgm9q3lhrnh1vl62s49n737bhq4jplm5918ki50"; - srcGeoLiteCity = fetchDB - "GeoLiteCity.dat.gz" - "0cibajsv5xdjpw1qfx22izm5azqcj0d7nvk39irgwflkim9jfjbs"; - srcGeoLiteCityv6 = fetchDB - "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "1ldwbzgs64irfgb3kq3jp8fmhwmwqk713dr4kkdqlglrblr9hfkc"; - srcGeoIPASNum = fetchDB - "asnum/GeoIPASNum.dat.gz" - "06qqs8qr8vxqwd80npz7n66k3bpc1vs7w43i2bb4k0di5yxnjwr9"; - srcGeoIPASNumv6 = fetchDB - "asnum/GeoIPASNumv6.dat.gz" - "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; + extra = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-xrTnuJvuvtvn+uIARtbuJUlHco3Q+9BXLljt35V3ip0="; + }; + + nativeBuildInputs = [ zstd ]; + + buildCommand = '' + tar -xaf "$geoip" + tar -xaf "$extra" + mkdir -p $out/share + mv usr/share/GeoIP $out/share + ''; meta = with lib; { description = "GeoLite Legacy IP geolocation databases"; - homepage = "https://geolite.maxmind.com/download/geoip"; - license = licenses.cc-by-sa-30; + homepage = "https://mailfud.org/geoip-legacy/"; + license = licenses.cc-by-sa-40; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; - - builder = ./builder.sh; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c19431e9ad77e..d22dccf38cf06 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a4422bb744c0b60e56ccbdd350df5c205caf0b20", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4422bb744c0b60e56ccbdd350df5c205caf0b20.tar.gz", - "sha256": "1ih77xavy81mjhf8d3nknbgvhpql14nbak01pddh7y195wv1dknd", - "msg": "Update from Hackage at 2022-02-06T15:34:38Z" + "commit": "aa8f2230d08c540df249147ea681a5c22314d083", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/aa8f2230d08c540df249147ea681a5c22314d083.tar.gz", + "sha256": "1h92r4si1vmf3v2m843xaqwr99hpnn1s0x08qcvd2gwjkc2qq10a", + "msg": "Update from Hackage at 2022-02-14T17:17:31Z" } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 17a63debdc646..c7a1ef2755f38 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20210312"; + version = "20211216"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA="; + sha256 = "sha256-CeznsOUhMw4x0SpZFx408JcYGny7zW+M1J+SiSO7EII="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 11c3c1cc10446..df190fd9ef80a 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202202100032"; + version = "202202170030"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "0a16dba825e420425786ff74f51a6bb881a62624"; - sha256 = "sha256-M3DitRNhvPh4AOocnG6omiQAPKgWziAcN4uO42/7BNE="; + rev = "ebc49c1ccbe7f267778ab42dbfa01d7ff8a5241c"; + sha256 = "sha256-CxV7jKNeaSW7lVBKKr7Ih2XAehnFcapkyDogd5V32Zk="; }; installPhase = '' diff --git a/pkgs/data/themes/pitch-black/default.nix b/pkgs/data/themes/pitch-black/default.nix new file mode 100644 index 0000000000000..95037f90239e0 --- /dev/null +++ b/pkgs/data/themes/pitch-black/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec{ + pname = "pitch-black"; + version = "unstable-2019-07-23"; + + src = fetchFromGitHub { + repo = pname; + owner = "freefreeno"; + rev = "d8039341419aef1157c030bf3d9237bd926e0b95"; + hash = "sha256-Rn3ZMBD6srIkYFNN3HT5JFP46Akodmeqz5tbV2/2ZDA="; + }; + + dontBuild = true; + + installPhase = '' + rm LICENSE README.md + mkdir -p $out/share + mv GTK $out/share/themes + mv * $out/share + ''; + + meta = with lib; { + description = "A dark plasma theme built with usability in mind"; + homepage = "https://github.com/freefreeno/Pitch-Black"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.pasqui23 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 47e43758447cd..e8bf145e5028a 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.3"; + version = "5.2.4"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-kPxwWciNf4KQx3JG1qPQcZJeOa4B+udMyQmH8A7JcfQ="; + sha256 = "sha256-v63dFiBKtLCmRnwJ6u814lSv+tfPG+IIJtcWCnOEZjk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index a6748dfc4174b..b8783e4db4624 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , meson , fetchurl , python3 @@ -7,12 +8,12 @@ , glib , adwaita-icon-theme , libpeas +, libxml2 , gtksourceview4 , gsettings-desktop-schemas , wrapGAppsHook , ninja , libsoup -, tepl , gnome , gspell , perl @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; + sha256 = "epsYsViAjRiSmJFl83BsTxooKXkHmrdFinnTwkrU3rU="; }; patches = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils itstool + libxml2 meson ninja perl @@ -57,7 +59,6 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas libsoup - tepl ]; postPatch = '' @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 11308bfcf5e92..b7ba12be13567 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.3"; + version = "3.42.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; + sha256 = "fftBs+bAWBHUSajeTfx3q5sZ+O3yCzL92FeRhmIm0lI="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 85cfa8bf3144a..f68977e52dd07 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "41.2"; + version = "41.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gnH8azPsJBileDBN0+V9Zl8NfMcGqZqXvkGYSGGP4kg="; + sha256 = "sha256-1tsMTLcIV77PSKxQB/ErX2O51dfoDqfuV9O+USZp98k="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 437da36a7a3b8..aa61bd91c2979 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "41.1"; + version = "41.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0ObyJz8I1S2SX8K7ZrR7KOXvUNG4oUAgh3xmJCPVB9M="; + sha256 = "rZuoL0y9BHJpc7XoevrRiv2qMjhgoK8+ckDzp00iLxk="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index dc3aaea930e0e..3b89ceb78172e 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "41.3"; + version = "41.4"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Hj36KgvklFQYK0rOd/EdENP1uYjvD8tzK3MTVzlJ3tE="; + sha256 = "x+73SvMEZJwDuG25m9C6x1oBH7/2d0yO41WD282tivQ="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 4103965ce271b..aa9058ad410aa 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "41.3"; + version = "41.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZQVjN3q2mxAQXfdxuz8hY3lVO7evQISNjDBljgEAmLw="; + sha256 = "evhzzkcs8racUbyevGG4Nt+8z9b0Jwbj7TqpCaruxGU="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index d9dd6efa1487a..d0b8a7537e294 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -46,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "41.3"; + version = "41.4"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cZxdEGDrYFwbpkO0hvtXsaPHGX59+DvWwzZvxLaEd+U="; + sha256 = "VYgmlQZKpvA4XNH39/qywqLtLJrsePV4+qB/UgnKUpw="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 4b3ee62dcee4d..be858a19487da 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, webkitgtk_4_1 +, webkitgtk , pkg-config , gtk3 , glib @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - webkitgtk_4_1 + webkitgtk sqlite libxml2 libxslt @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good ]; + # To reduce the GNOME ISO closure size. Remove when other packages + # are using webkit2gtk_4_1. + configureFlags = ["--with-webkit2gtk-4-0"]; + passthru = { updateScript = gnome.updateScript { packageName = "yelp"; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix new file mode 100644 index 0000000000000..c78a59af5237c --- /dev/null +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, glib +, gettext +, sassc +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-dash-to-dock"; + version = "71+date=2022-01-24"; + + # Temporarily switched to commit hash because stable version is buggy. + src = fetchFromGitHub { + owner = "micheleg"; + repo = "dash-to-dock"; + rev = "53114b4e000482a753e8b42dfa10d6057c08d1c6"; + sha256 = "Gv78I/dxhc6FpjZWk10uHBfD24tHE4KdkpaAo8UZpwU="; + }; + + nativeBuildInputs = [ + glib + gettext + sassc + ]; + + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + passthru = { + extensionUuid = "dash-to-dock@micxgx.gmail.com"; + extensionPortalSlug = "dash-to-dock"; + + updateScript = unstableGitUpdater { + stableVersion = true; + tagPrefix = "extensions.gnome.org-v"; + }; + }; + + meta = with lib; { + description = "A dock for the Gnome Shell"; + homepage = "https://micheleg.github.io/dash-to-dock/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eperuffo jtojnar rhoriguchi ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index da95f3244095b..bc659b9a44389 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -28,10 +28,6 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ eperuffo ]; })) - (patchExtension "dash-to-dock@micxgx.gmail.com" (old: { - meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ]; - })) - (patchExtension "ddterm@amezin.github.com" (old: { # Requires gjs, zenity & vte via the typelib nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 28d0f32777a8d..1ed840670643e 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -2,6 +2,7 @@ { "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; + "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 3a158e7ddf811..683b5c22626f7 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.4.2"; + version = "0.4.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HSBpQHkwDhL+q9t3MEqWnRzBkNHRKpSb6EXK0Bx4pdM="; + sha256 = "e98HiVU0lqvdw8ljsM5zY4BcDALAJf7d68qsx4cknog="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 83928c04827b4..bdaeb47ab233b 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.42.2"; + version = "3.42.5"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-VWtq1jPwUHHIDpVaSYQ0FiihlfulRofFmacMyv/buMw="; + sha256 = "sha256-BpDA2V40V+VF2CB7ik+edMxrRtYSFnTQ48ec6pt8Jo4="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 38de716394dba..fe7a8e946d10e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -47,18 +47,9 @@ stdenv.mkDerivation rec { src = ./hardcode-fallback-background.patch; default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) - # Revert "UserCard: use accent color for logged_in check (#566)" - # https://github.com/elementary/greeter/pull/566 - # Fixes crash issue reported in: - # https://github.com/elementary/greeter/issues/578 # https://github.com/NixOS/nixpkgs/issues/151609 - # Probably also fixes: - # https://github.com/elementary/greeter/issues/568 - # https://github.com/elementary/greeter/issues/583 - # https://github.com/NixOS/nixpkgs/issues/140513 - # Revisit this when the greeter is ported to GTK 4: - # https://github.com/elementary/greeter/pull/591 - ./revert-pr566.patch + # https://github.com/elementary/greeter/issues/578#issuecomment-1030746697 + ./fix-crash.patch # Fix build with meson 0.61 # https://github.com/elementary/greeter/pull/590 (fetchpatch { diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch new file mode 100644 index 0000000000000..ca6f6aab6d606 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch @@ -0,0 +1,21 @@ +diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala +index 83df22c..8cd917e 100644 +--- a/src/Cards/UserCard.vala ++++ b/src/Cards/UserCard.vala +@@ -42,6 +42,7 @@ public class Greeter.UserCard : Greeter.BaseCard { + private Gtk.Stack login_stack; + private Greeter.PasswordEntry password_entry; + ++ private SelectionCheck logged_in; + private unowned Gtk.StyleContext logged_in_context; + private weak Gtk.StyleContext main_grid_style_context; + private weak Gtk.StyleContext password_entry_context; +@@ -214,7 +215,7 @@ public class Greeter.UserCard : Greeter.BaseCard { + }; + avatar_overlay.add (avatar); + +- var logged_in = new SelectionCheck () { ++ logged_in = new SelectionCheck () { + halign = Gtk.Align.END, + valign = Gtk.Align.END + }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch deleted file mode 100644 index ed05ba24b86a8..0000000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Tue, 25 Jan 2022 10:03:31 +0800 -Subject: [PATCH] Revert "UserCard: use accent color for logged_in check - (#566)" - -This reverts commit 6f18c79c780582e43039032f6926816efa82e206. ---- - data/Check.css | 11 ----------- - data/greeter.gresource.xml | 1 - - src/Cards/UserCard.vala | 29 +++-------------------------- - 3 files changed, 3 insertions(+), 38 deletions(-) - delete mode 100644 data/Check.css - -diff --git a/data/Check.css b/data/Check.css -deleted file mode 100644 -index 947db6b..0000000 ---- a/data/Check.css -+++ /dev/null -@@ -1,11 +0,0 @@ --check { -- background-color: @accent_color; -- border-radius: 99px; -- color: white; -- margin: 2px; -- min-height: 20px; -- min-width: 20px; -- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7); -- -gtk-icon-source: -gtk-icontheme("check-active-symbolic"); -- -gtk-icon-transform: scale(0.6); --} -diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml -index 604c89a..ce9be29 100644 ---- a/data/greeter.gresource.xml -+++ b/data/greeter.gresource.xml -@@ -2,7 +2,6 @@ - <gresources> - <gresource prefix="/io/elementary/greeter"> - <file alias="Card.css" compressed="true">Card.css</file> -- <file alias="Check.css" compressed="true">Check.css</file> - <file alias="DateTime.css" compressed="true">DateTime.css</file> - <file alias="MainWindow.css" compressed="true">MainWindow.css</file> - </gresource> -diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala -index 83df22c..02d2b0a 100644 ---- a/src/Cards/UserCard.vala -+++ b/src/Cards/UserCard.vala -@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard { - private Gtk.Stack login_stack; - private Greeter.PasswordEntry password_entry; - -- private unowned Gtk.StyleContext logged_in_context; - private weak Gtk.StyleContext main_grid_style_context; - private weak Gtk.StyleContext password_entry_context; - -@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard { - }; - avatar_overlay.add (avatar); - -- var logged_in = new SelectionCheck () { -- halign = Gtk.Align.END, -- valign = Gtk.Align.END -- }; -- -- logged_in_context = logged_in.get_style_context (); -- - if (lightdm_user.logged_in) { -+ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR); -+ logged_in.halign = logged_in.valign = Gtk.Align.END; -+ - avatar_overlay.add_overlay (logged_in); - - session_button.sensitive = false; -@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard { - gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color); - - var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null); -- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - } - -@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard { - return GLib.Source.REMOVE; - }); - } -- -- private class SelectionCheck : Gtk.Spinner { -- private static Gtk.CssProvider check_provider; -- -- class construct { -- set_css_name (Gtk.STYLE_CLASS_CHECK); -- } -- -- static construct { -- check_provider = new Gtk.CssProvider (); -- check_provider.load_from_resource ("/io/elementary/greeter/Check.css"); -- } -- -- construct { -- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER); -- } -- } - } diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix index d7816de30422b..5de935b9ec237 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Look at your windows and desktops from above."; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; inherit (kwindowsystem.meta) platforms; }; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index c7bfa49ac719a..08ebb6136fc5e 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.22.0"; + version = "0.23.1"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-s5gCqQ0gJViS8t/jCAFtNYfmXQ7SBarlRLKUWHHEgSg="; + sha256 = "sha256-N0jkdzwNi9dx0dmN4qL+mb8S60OII4C/MnR/y8G3GUY="; rev = version; }; releaseType = "escript"; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 4b0789e35eb80..43538ede339ed 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -32,6 +32,7 @@ , nss , systemd , which +, callPackage }: let drvName = "flutter-${version}"; @@ -146,6 +147,8 @@ let }; in +let +self = (self: runCommand drvName { startScript = '' @@ -159,6 +162,9 @@ runCommand drvName passthru = { unwrapped = flutter; inherit dart; + mkFlutterApp = callPackage ../../../build-support/flutter { + flutter = self; + }; }; meta = with lib; { description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; @@ -179,4 +185,6 @@ runCommand drvName echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} -'' +'') self; +in +self diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index c0823e3b5a5b2..17c310519995b 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.18beta2"; + version = "1.18rc1"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-PLFOLILaNm9zk8mI8fP8LBa3GlSSvT1J01iGzfJ6nRM="; + sha256 = "sha256-XOx6ZlMAj6hfiCGzNmXeN74om3oC8X829wWojEOYC7g="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix new file mode 100644 index 0000000000000..12bac4c4d9d8f --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -0,0 +1,106 @@ +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, ffmpeg, python3, ruby, icu68 }: + +let + major = "17"; + update = ".0.0.1"; + build = "+1"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk17_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = true + COMPILE_WEBKIT = false + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk17_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "http://openjdk.java.net/projects/openjfx/"; + license = licenses.gpl2; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/development/compilers/passerine/default.nix index e9427f892e642..e5f88e586746a 100644 --- a/pkgs/development/compilers/passerine/default.nix +++ b/pkgs/development/compilers/passerine/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "passerine"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "vrtbl"; repo = "passerine"; - rev = "dd8a6f5efc5dcb03d45b102f61cc8a50d46e8e98"; - sha256 = "sha256-/QzqKLkxAVqvTY4Uft1qk7nJat6nozykB/4X1YGqu/I="; + rev = "v${version}"; + hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0="; }; - cargoSha256 = "sha256-8WiiDLIJ/abXELF8S+4s+BPA/Lr/rpKmC1NWPCLzQWA="; + cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0="; meta = with lib; { description = "A small extensible programming language designed for concise expression with little code"; - homepage = "https://github.com/vrtbl/passerine"; + homepage = "https://www.passerine.io/"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index a72ae7d52aba2..e3a9aa2b486cd 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -52,7 +52,7 @@ let # - integration-tests versions = { - swift = "5.5.2"; + swift = "5.5.3"; yams = "4.0.2"; argumentParser = "0.4.3"; format = "swift-5.5-branch"; @@ -79,7 +79,7 @@ let swift = fetchSwiftRelease { repo = "swift"; - sha256 = "1a9ja3r6ap4cappbvlk18krlvwi0q75z21j5yx5rhbnw4ihh7lda"; + sha256 = "0ma96sfvwiv2f4qhzrvcwxi9igzd80930gnaw4r7ra4w190cnag7"; }; cmark = fetchSwiftRelease { repo = "swift-cmark"; @@ -99,7 +99,7 @@ let }; swiftpm = fetchSwiftRelease { repo = "swift-package-manager"; - sha256 = "0hdjvb2asfi6h3x9bjssxkc3bgjn3idlmyga3dl3lscfq88hjxr9"; + sha256 = "0z90mg837jzwh516pypn48r3wsjf0lqymsyigdhgr7j2sgcckrr1"; }; syntax = fetchSwiftRelease { repo = "swift-syntax"; @@ -111,7 +111,7 @@ let }; corelibsFoundation = fetchSwiftRelease { repo = "swift-corelibs-foundation"; - sha256 = "1f7qcdx8597gwqa9pwl38d31w6w4d84c5hadj4ycj99msrm2f32x"; + sha256 = "06gkdliihl1l86jx5khzwkjmjk45fq290x033rscramzcdxh7d1b"; }; corelibsLibdispatch = fetchSwiftRelease { repo = "swift-corelibs-libdispatch"; @@ -128,7 +128,7 @@ let }; llvmProject = fetchSwiftRelease { repo = "llvm-project"; - sha256 = "1gvqps5f9jh6lbhcjh1fyzp3bc0h9chbljzaspcrdi2qp878prlx"; + sha256 = "18rn5xg5hpxxsacs0ygjmjpzpc8pq85898kknzc0s0z5m55h45z8"; }; # Projects that have their own versions during each release diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d4eb57815a80c..a2cd8f44ce283 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -11,19 +11,20 @@ let in stdenv.mkDerivation rec { pname = "zig"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - hash = "sha256-Hfl1KKtGcopMrn+U9r0/qr/wReWJIgb8+IgwMoguv/0="; + hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; + buildInputs = [ libxml2 zlib diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 1ba8080e0b10f..2f7437fd74fd5 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.14"; out = "4.0.0"; } + { case = range "8.10" "8.15"; out = "4.0.0"; } ] null; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; releaseRev = v: "${v}"; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 1d2a1a3c05fc8..80aaf506139bb 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,5 +1,7 @@ { lib, mkCoqDerivation, coq, compcert, ITree, version ? null }: +with lib; + # A few modules that are not built and installed by default # but that may be useful to some users. # They depend on ITree. @@ -7,12 +9,15 @@ let extra_floyd_files = [ "ASTsize.v" "io_events.v" "powerlater.v" - "printf.v" + ] + # floyd/printf.v is broken in VST 2.9 + ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v" + ++ [ "quickprogram.v" ]; in -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq${coq.coq-version}-VST"; namePrefix = []; displayVersion = { coq = false; }; @@ -20,8 +25,10 @@ with lib; mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.13" "8.15"; out = "2.9"; } { case = range "8.12" "8.13"; out = "2.8"; } ] null; + release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; extraBuildInputs = [ ITree ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 9757b3e43c8ba..197f1a96fc4a2 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -16,7 +16,8 @@ let compcert = mkCoqDerivation rec { defaultVersion = with versions; switch coq.version [ { case = range "8.8" "8.11"; out = "3.8"; } - { case = range "8.12" "8.14"; out = "3.10"; } + { case = isEq "8.12" ; out = "3.9"; } + { case = range "8.12" "8.15"; out = "3.10"; } ] null; release = { @@ -106,13 +107,18 @@ compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.14") "3.10" ]; + { cases = [ (range "8.14" "8.15") "3.10" ]; out = [ # Support for Coq 8.14.1 (fetchpatch { url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch"; sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94"; }) + # Support for Coq 8.15.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/a882f78c069f7337dd9f4abff117d4df98ef38a6.patch"; + sha256 = "sha256:16i87s608fj9ni7cvd5wrd7gicqniad7w78wi26pxdy0pacl7bjg"; + }) ]; } ] []; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 6e67bdd465bfd..c4055648c5a90 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -6,7 +6,7 @@ with builtins; with lib; let { case = "8.12"; out = { version = "1.12.0"; };} { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} - { case = "8.15"; out = { version = "1.13.7"; };} + { case = "8.15"; out = { version = "1.14.1"; };} ] {}); in mkCoqDerivation { pname = "elpi"; @@ -14,12 +14,13 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.15"; out = "1.12.1"; } + { case = "8.15"; out = "1.13.0"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n"; release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4"; release."1.11.1".sha256 = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b1f641199d431..4cf5867c65714 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1268,13 +1268,6 @@ self: super: { # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))); - # add unreleased commit fixing version constraint as a patch - # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved - utc = appendPatch (pkgs.fetchpatch { - url = "https://github.com/lpeterse/haskell-utc/commit/e4502c08591e80d411129bb7c0414539f6302aaf.diff"; - sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7"; - }) super.utc; - # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp. jsaddle-warp = dontCheck super.jsaddle-warp; @@ -1459,10 +1452,6 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/2375 hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; - # 2021-11-23: Too strict bounds on ghcide, pending new release - hls-rename-plugin = assert super.hls-rename-plugin.version == "1.0.0.0"; - doJailbreak super.hls-rename-plugin; - # 2021-03-21: Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 # 2021-11-13: Too strict upper bound on implicit-hie-cradle diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f3a0b963fe052..6d217a6d13851 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -414,6 +414,7 @@ broken-packages: - bkr - blakesum - blas + - blatex - blaze-html-contrib - blaze-html-hexpat - blaze-html-truncate @@ -986,7 +987,6 @@ broken-packages: - data-validation - data-variant - DataVersion - - dates - datetime - datetime-sb - dawdle @@ -1005,6 +1005,7 @@ broken-packages: - dclabel - dclabel-eci11 - dcpu16 + - ddate - ddc-base - ddc-code - dead-code-detection @@ -1120,6 +1121,7 @@ broken-packages: - dmcc - dmenu - dnscache + - dns-patterns - dnsrbl - dnssd - dobutok @@ -2223,7 +2225,6 @@ broken-packages: - hlongurl - hlrdb-core - hls-exactprint-utils - - hls-rename-plugin - hlwm - hmarkup - hmatrix-banded @@ -2251,6 +2252,7 @@ broken-packages: - hobbes - hocilib - hocker + - hocon - hodatime - HODE - hoe @@ -2749,6 +2751,7 @@ broken-packages: - kmp-dfa - koellner-phonetic - koji-install + - koneko - Konf - kontra-config - kparams @@ -3315,6 +3318,7 @@ broken-packages: - nanomsg - nanomsg-haskell - nanoparsec + - nanopass - NanoProlog - nanovg-simple - nanq @@ -3912,6 +3916,7 @@ broken-packages: - prints - PriorityChansConverger - priority-queue + - pro-abstract - probable - process-conduit - processing @@ -4816,6 +4821,7 @@ broken-packages: - SybWidget - syb-with-class-instances-text - sydtest-aeson + - sydtest-hedgehog - sydtest-hedis - sydtest-hspec - sydtest-mongo @@ -5040,6 +5046,7 @@ broken-packages: - tkyprof - tmp-proc-example - todo + - todos - tofromxml - to-haskell - toilet @@ -5245,6 +5252,7 @@ broken-packages: - urxml - users-mysql-haskell - users-persistent + - utc - utf - utf8-prelude - utf8-validator @@ -5296,6 +5304,7 @@ broken-packages: - vector-space-points - vector-static - Vec-Transform + - velma - Verba - verbalexpressions - verdict @@ -5430,6 +5439,7 @@ broken-packages: - windowslive - winerror - Wired + - wireguard-hs - wires - wiring - witty @@ -5553,6 +5563,7 @@ broken-packages: - yeshql-postgresql-simple - yesod-angular - yesod-angular-ui + - yesod-articles - yesod-auth-account - yesod-auth-account-fork - yesod-auth-bcrypt diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7ab2a4a2725e7..2ecfb76784d59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -134,6 +134,8 @@ default-package-overrides: # On the recommendation of hnix author: # https://github.com/NixOS/nixpkgs/pull/154461#issuecomment-1015511883 - hnix < 0.15 + # needs http-client >= 0.7.11 which isn't part of Stackage LTS 18 + - http-client-restricted < 0.0.5 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 54122581a99d7..77be3013a48bb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.24 +# Stackage LTS 18.25 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -192,7 +192,7 @@ default-package-overrides: - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.2.0 - attoparsec-path ==0.0.0.1 - - audacity ==0.0.2 + - audacity ==0.0.2.1 - aur ==7.0.7 - aura ==3.2.5 - authenticate ==1.3.5.1 @@ -407,7 +407,7 @@ default-package-overrides: - clientsession ==0.9.1.2 - climb ==0.3.3 - Clipboard ==2.3.2.0 - - clock ==0.8.2 + - clock ==0.8.3 - closed ==0.2.0.1 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 @@ -444,7 +444,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.14 + - concurrent-output ==1.10.15 - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 @@ -591,7 +591,7 @@ default-package-overrides: - depq ==0.4.2 - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - - derive-topdown ==0.0.2.2 + - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.8 - deriving-compat ==0.5.10 - derulo ==1.0.10 @@ -615,7 +615,7 @@ default-package-overrides: - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.2.0 - - distribution-opensuse ==1.1.1 + - distribution-opensuse ==1.1.3 - distributive ==0.6.2.1 - dlist ==1.0 - dlist-instances ==0.1.1.1 @@ -999,20 +999,20 @@ default-package-overrides: - haskell-lsp-types ==0.24.0.0 - haskell-names ==0.9.9 - HaskellNet ==0.6 - - haskell-src ==1.0.3.1 + - haskell-src ==1.0.4 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.8 + - haskell-src-meta ==0.8.9 - haskey-btree ==0.3.0.1 - hasktags ==0.72.0 - hasql ==1.4.5.3 - hasql-notifications ==0.2.0.0 - - hasql-optparse-applicative ==0.3.0.7 + - hasql-optparse-applicative ==0.3.0.8 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - hasql-transaction ==1.0.1.1 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.0 + - HaTeX ==3.22.3.1 - HaXml ==1.25.8 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 @@ -1072,7 +1072,7 @@ default-package-overrides: - hmm-lapack ==0.4 - hmpfr ==0.4.4 - hnock ==0.4.0 - - hoauth2 ==1.16.1 + - hoauth2 ==1.16.2 - hoogle ==5.0.18.3 - hOpenPGP ==2.9.7 - hopenpgp-tools ==0.23.6 @@ -1168,13 +1168,13 @@ default-package-overrides: - http-media ==0.8.0.0 - http-query ==0.1.1 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.9.4 + - http-streams ==0.8.9.6 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.5 - - hvect ==0.4.0.0 + - hvect ==0.4.0.1 - hvega ==0.11.0.1 - hw-balancedparens ==0.4.1.1 - hw-bits ==0.7.2.1 @@ -1296,7 +1296,7 @@ default-package-overrides: - java-adt ==0.2018.11.4 - jira-wiki-markup ==1.4.0 - jose ==0.8.4 - - jose-jwt ==0.9.2 + - jose-jwt ==0.9.3 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1325,8 +1325,8 @@ default-package-overrides: - keycode ==0.2.2 - keys ==3.12.3 - ki ==0.2.0.1 - - kind-apply ==0.3.2.0 - - kind-generics ==0.4.1.2 + - kind-apply ==0.3.2.1 + - kind-generics ==0.4.1.4 - kind-generics-th ==0.2.2.2 - kmeans ==0.1.3 - koji ==0.0.2 @@ -1353,7 +1353,7 @@ default-package-overrides: - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.2.1 + - lapack-ffi-tools ==0.1.3 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==2.0.2 @@ -1474,7 +1474,7 @@ default-package-overrides: - mcmc-types ==1.0.3 - medea ==1.2.0 - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 + - med-module ==0.1.2.2 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1516,8 +1516,6 @@ default-package-overrides: - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 - - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.3 - mmorph ==1.1.5 - mnist-idx ==0.1.2.8 - mnist-idx-conduit ==0.4.0.0 @@ -1525,7 +1523,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.1.2.2 - model ==0.5 - - modern-uri ==0.3.4.2 + - modern-uri ==0.3.4.3 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.3.1 @@ -1648,9 +1646,9 @@ default-package-overrides: - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.1.3 - - nri-prelude ==0.6.0.5 + - nri-env-parser ==0.1.0.8 + - nri-observability ==0.1.1.4 + - nri-prelude ==0.6.0.6 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1665,8 +1663,8 @@ default-package-overrides: - nvim-hs-ghcid ==2.0.0.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.2 - - o-clock ==1.2.1 - - odbc ==0.2.5 + - o-clock ==1.2.1.1 + - odbc ==0.2.6 - oeis2 ==1.0.6 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 @@ -1901,7 +1899,7 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - - quickcheck-higherorder ==0.1.0.0 + - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.25.2 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 @@ -1951,7 +1949,7 @@ default-package-overrides: - reanimate ==1.1.5.0 - reanimate-svg ==0.13.0.1 - rebase ==1.13.2 - - record-dot-preprocessor ==0.2.13 + - record-dot-preprocessor ==0.2.14 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2092,10 +2090,10 @@ default-package-overrides: - serf ==0.1.1.0 - serialise ==0.2.4.0 - servant ==0.18.3 - - servant-auth ==0.4.0.0 + - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.6.0 + - servant-auth-server ==0.4.7.0 - servant-auth-swagger ==0.2.10.1 - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 @@ -2117,7 +2115,7 @@ default-package-overrides: - servant-rawm ==1.0.0.0 - servant-server ==0.18.3 - servant-swagger ==1.1.10 - - servant-swagger-ui ==0.3.5.3.52.5 + - servant-swagger-ui ==0.3.5.4.5.0 - servant-swagger-ui-core ==0.3.5 - serverless-haskell ==0.12.6 - serversession ==1.0.2 @@ -2254,14 +2252,14 @@ default-package-overrides: - streaming ==0.2.3.1 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.1 - - streaming-commons ==0.2.2.3 + - streaming-commons ==0.2.2.4 - streamly ==0.7.3 - streams ==3.3 - streamt ==0.5.0.0 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.6 - - strict-tuple ==0.1.4 + - strict-tuple ==0.1.5 - strict-tuple-lens ==0.1.0.1 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 @@ -2468,7 +2466,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.23 + - turtle ==1.5.24 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - typed-process ==0.2.8.0 @@ -2529,7 +2527,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.6 - unix-compat ==0.5.4 - unix-time ==0.4.7 - - unliftio ==0.2.20.1 + - unliftio ==0.2.21.0 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2615,7 +2613,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.18 + - warp ==3.3.19 - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2692,11 +2690,11 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.7.0 - yamlparse-applicative ==0.2.0.1 - - yesod ==1.6.1.2 - - yesod-auth ==1.6.10.5 + - yesod ==1.6.2 + - yesod-auth ==1.6.11 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - - yesod-bin ==1.6.1 + - yesod-bin ==1.6.2 - yesod-core ==1.6.21.0 - yesod-fb ==0.6.1 - yesod-form ==1.7.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index cc55e28d96c18..fc5ece3e06986 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -589,7 +589,6 @@ dont-distribute-packages: - bla - blakesum-demo - blastxml - - blatex - blaze-builder-enumerator - blaze-colonnade - blink1 @@ -700,7 +699,6 @@ dont-distribute-packages: - chainweb-mining-client - chalkboard-viewer - charade - - chart-cli - chart-svg - chart-svg-various - chart-unit @@ -728,8 +726,12 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_6_1 - clash-lib + - clash-lib-hedgehog + - clash-lib_1_6_1 - clash-multisignal + - clash-prelude-hedgehog - clash-prelude-quickcheck - clash-shake - clash-systemverilog @@ -897,10 +899,8 @@ dont-distribute-packages: - data-structure-inferrer - datadog-tracing - dataflow - - date-conversions - dbjava - dbus-client - - ddate - ddc-build - ddc-core - ddc-core-babel @@ -1196,7 +1196,7 @@ dont-distribute-packages: - funnyprint - funsat - fused-effects-squeal - - futhark_0_21_5 + - futhark_0_21_6 - fwgl-glfw - fwgl-javascript - fxpak @@ -2145,9 +2145,7 @@ dont-distribute-packages: - mkbndl - mlist - mmark-cli - - mmark-cli_0_0_5_1 - mmark-ext - - mmark-ext_0_2_1_4 - mmtl-base - moan - modify-fasta @@ -3037,7 +3035,6 @@ dont-distribute-packages: - tn - to-string-instances - toboggan - - todos - toktok - too-many-cells - top @@ -3303,7 +3300,6 @@ dont-distribute-packages: - ycextra - yeamer - yeshql - - yesod-articles - yesod-auth-ldap - yesod-colonnade - yesod-continuations diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b06857169cd69..f6db635805b51 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9747,26 +9747,6 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.3.0"; - sha256 = "0v9vgql7a9rpkwlrgw8nsy9m2rv3l2gczngc7a1xkndxi214m4kl"; - libraryHaskellDepends = [ - base bibtex bytestring containers hashable matrix parsec - prettyprinter QuickCheck text transformers - ]; - testHaskellDepends = [ - base parsec QuickCheck tasty tasty-quickcheck text - ]; - description = "The Haskell LaTeX library"; - license = lib.licenses.bsd3; - }) {}; - - "HaTeX_3_22_3_1" = callPackage - ({ mkDerivation, base, bibtex, bytestring, containers, hashable - , matrix, parsec, prettyprinter, QuickCheck, tasty - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HaTeX"; version = "3.22.3.1"; sha256 = "0vgyixd8j3nzpy8s04cy3q7gj2gfblba2z0ppr58rdm8qgj16j5c"; libraryHaskellDepends = [ @@ -9778,7 +9758,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -11827,8 +11806,8 @@ self: { pname = "JuicyPixels-blurhash"; version = "0.1.0.3"; sha256 = "0kgl2j7990p8q5yrkn0wgaszc9fzva1pc3277j11k1lbjsymz360"; - revision = "7"; - editedCabalFile = "0w6svmml3m1bfkycakkd8sib74nixwkr16z334w9v1cs8fjzfwjk"; + revision = "8"; + editedCabalFile = "09mlq9874j1lc33mk9f7qx6nwyz58hywnb8r4l1nkmnnbnc56alj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13664,25 +13643,22 @@ self: { }) {}; "MissingH" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , network-bsd, old-locale, old-time, parsec, process, random - , regex-compat, time, unix + ({ mkDerivation, array, base, containers, directory, filepath + , hslogger, HUnit, mtl, network, network-bsd, old-locale, old-time + , parsec, process, regex-compat, time, unix }: mkDerivation { pname = "MissingH"; - version = "1.4.3.0"; - sha256 = "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw"; - revision = "2"; - editedCabalFile = "0p5md995w0nh2m89v3jsb1bvhfkrnp2s14smjbnh3g0pbq3fgfzg"; + version = "1.5.0.0"; + sha256 = "100x3315lk0zs58cv951jxcy6cgip18cq25r8f2bsgwbvv6gh2by"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network - network-bsd old-locale old-time parsec process random regex-compat - time unix + network-bsd old-locale old-time parsec process regex-compat time + unix ]; testHaskellDepends = [ - base containers directory errorcall-eq-instance filepath HUnit - old-time parsec regex-compat time unix + base containers directory filepath HUnit old-time parsec + regex-compat time unix ]; description = "Large utility library"; license = lib.licenses.bsd3; @@ -17795,8 +17771,8 @@ self: { }: mkDerivation { pname = "SJW"; - version = "0.1.2.3"; - sha256 = "10ky2pd83wng5bgpqimdyxvhlfpwbssgh576ss28f1rzm6b8wqcm"; + version = "0.1.2.4"; + sha256 = "1flr9dp3v4cyn8fs6sybibbim5spzab7kxi6rxpczjcwmnn1cv78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23361,6 +23337,8 @@ self: { pname = "acid-state"; version = "0.16.0.1"; sha256 = "0n8qp002w972lf7z9hhn5bbz2rslh8m6am07c88y755nj5xk6y88"; + revision = "1"; + editedCabalFile = "0jz3826gx6chsa2bipzdpqvl2risp3bm6g4nrr79wb403qrqwbf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24203,8 +24181,8 @@ self: { pname = "acts"; version = "0.3.1.0"; sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; - revision = "3"; - editedCabalFile = "01vjb8mp9ifbfknnibzc1yhimn5yli2vafpxs6adk0cdjna99g4w"; + revision = "4"; + editedCabalFile = "081arnkkll6xkni350ywsnwzagnki2ly5in42cx5zcpfp1xbssmk"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -25534,20 +25512,15 @@ self: { }) {}; "aeson-tiled" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec, text - , vector + ({ mkDerivation, aeson, base, bytestring, containers, text, vector }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.0.1"; - sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk"; - isLibrary = true; - isExecutable = true; + version = "0.0.1.0"; + sha256 = "1szlwkww2sbqrz6d8mbq20nzkba70a41if33bcka0vhfq5lrp224"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ aeson base hspec ]; description = "Aeson instances for the Tiled map editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -35987,27 +35960,6 @@ self: { }: mkDerivation { pname = "audacity"; - version = "0.0.2"; - sha256 = "1916phnj3m12apyjarmda48xr2bq19rfn7sn6nskkbg6qjqxzlnr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq directory explicit-exception filepath - non-empty semigroups storable-record storablevector tagchup - transformers utility-ht xml-basic - ]; - description = "Interchange with the Audacity sound signal editor"; - license = lib.licenses.bsd3; - }) {}; - - "audacity_0_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, deepseq, directory - , explicit-exception, filepath, non-empty, semigroups - , storable-record, storablevector, tagchup, transformers - , utility-ht, xml-basic - }: - mkDerivation { - pname = "audacity"; version = "0.0.2.1"; sha256 = "04r36gy8z0d2fz1l5px6yajp7izf3zpda9vci6q0wc273pxc8ck6"; isLibrary = true; @@ -36019,7 +35971,6 @@ self: { ]; description = "Interchange with the Audacity sound signal editor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "audiovisual" = callPackage @@ -41147,6 +41098,8 @@ self: { pname = "bidirectionalization-combined"; version = "0.1.0.1"; sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m"; + revision = "1"; + editedCabalFile = "1fvqr3g7i57ybszqaa279nvrciw3yv1sj8hpjs3pa0z0cvxvvr42"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -44667,6 +44620,7 @@ self: { description = "Blog in LaTeX"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "blaze" = callPackage @@ -44785,8 +44739,8 @@ self: { pname = "blaze-html"; version = "0.9.1.2"; sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30"; - revision = "1"; - editedCabalFile = "0wvlfb3rd9cm3p894p5rl9kggrsr5da3n8x9ydrbagx91yvkxns9"; + revision = "2"; + editedCabalFile = "1hjxvz62wlg0x7svc51zascgc96f5ly9xkkiyllgb4aqcvx9zf3l"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -45129,8 +45083,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.2.1.0"; - sha256 = "1mczzhpbdch3m5wmw9zr8pzwmg5jpg3qx167pxv548ykd0nvfjiq"; + version = "0.3.0.0"; + sha256 = "1773mklwigyqhgbxsp2zz4yzwsq0s2sapifzisrk56qix74z9md4"; libraryHaskellDepends = [ aeson base bytestring data-default-class deriving-aeson lens QuickCheck quickcheck-instances safe-money servant servant-docs @@ -45153,8 +45107,8 @@ self: { }: mkDerivation { pname = "blockfrost-client"; - version = "0.2.1.0"; - sha256 = "19jw8dr49ahfy5ln8d7fnaxw07mqzj71dawv6bx0p5j0dqdhzxky"; + version = "0.3.0.0"; + sha256 = "0n49qbqlghgqw0nnx6bpkfiiyaqzzscl6hr0rh7xxw56955r55p0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46628,17 +46582,17 @@ self: { }) {}; "box" = callPackage - ({ mkDerivation, attoparsec, base, concurrency, containers - , contravariant, exceptions, lens, mmorph, mtl, profunctors, text - , time, transformers + ({ mkDerivation, base, concurrency, containers, contravariant + , dlist, exceptions, kan-extensions, mtl, profunctors + , semigroupoids, text, time, transformers }: mkDerivation { pname = "box"; - version = "0.7.0"; - sha256 = "0fxrhfzf4xsfma2x355ij3ky1h83wq3khd08vkix1lnmw9vnvk37"; + version = "0.8.1"; + sha256 = "18f7waxmnrfk205aacwlzzv18bhyff9vpq3xcna955p9qgm47lg5"; libraryHaskellDepends = [ - attoparsec base concurrency containers contravariant exceptions - lens mmorph mtl profunctors text time transformers + base concurrency containers contravariant dlist exceptions + kan-extensions mtl profunctors semigroupoids text time transformers ]; description = "boxes"; license = lib.licenses.bsd3; @@ -46647,16 +46601,12 @@ self: { }) {}; "box-csv" = callPackage - ({ mkDerivation, attoparsec, base, box, generic-lens, lens - , scientific, text, time - }: + ({ mkDerivation, attoparsec, base, box, text, time }: mkDerivation { pname = "box-csv"; - version = "0.1.0"; - sha256 = "0h62za6qirm003bwrsjb9pj4d9gnrypvqchzhnv3nj37niscmddy"; - libraryHaskellDepends = [ - attoparsec base box generic-lens lens scientific text time - ]; + version = "0.2.0"; + sha256 = "0m3zx6m267hsnhvjspbd8132phkkbpm18cvii2if02bd3kj1x7rb"; + libraryHaskellDepends = [ attoparsec base box text time ]; description = "CSV parsing in a box"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -46664,22 +46614,20 @@ self: { "box-socket" = callPackage ({ mkDerivation, async, base, box, bytestring, concurrency - , exceptions, generic-lens, lens, network, network-simple - , optparse-generic, text, websockets + , exceptions, network, network-simple, optparse-generic, text + , websockets }: mkDerivation { pname = "box-socket"; - version = "0.2.0"; - sha256 = "198llmb67g348apjrhp180x2ykjlp2mnbhvkw90yh5nm7pnd0j3c"; + version = "0.3.0"; + sha256 = "1z9qlmpbq2ppc13viyf0sha95d7cm0jswnabjvg5fvx9ln1c5ivp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base box bytestring concurrency exceptions generic-lens lens - network network-simple text websockets - ]; - executableHaskellDepends = [ - base box concurrency generic-lens lens optparse-generic text + async base box bytestring concurrency exceptions network + network-simple text websockets ]; + executableHaskellDepends = [ base optparse-generic ]; description = "Box websockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -50995,6 +50943,27 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "cabal2spec_2_6_3" = callPackage + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.6.3"; + sha256 = "1mxqllc6mbxbyr5iz6qs0sxmvzrn5jf9wbs6zqnlygg23ml043kr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + description = "Convert Cabal files into rpm spec files"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "cabalQuery" = callPackage ({ mkDerivation, base, Cabal, containers, directory, MissingH , pretty @@ -54976,7 +54945,6 @@ self: { ]; description = "Command-line utility to draw charts from input data easily"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "chart-histogram" = callPackage @@ -56271,18 +56239,18 @@ self: { "cimple" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, base , bytestring, containers, data-fix, filepath, groom, happy, hspec - , hspec-discover, monad-parallel, mtl, recursion-schemes, text - , transformers-compat + , hspec-discover, monad-parallel, mtl, recursion-schemes, split + , text, transformers-compat }: mkDerivation { pname = "cimple"; - version = "0.0.13"; - sha256 = "18c3x6mb93hj2zzq63p9wczi73wm1c3b24ksjmnksldkaakwv6wy"; + version = "0.0.14"; + sha256 = "1n287ybpl4h8laklw4s0gqf7hn8w12yv3wxm1xjh7rx9fivnim2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers data-fix - filepath groom monad-parallel mtl recursion-schemes text + filepath groom monad-parallel mtl recursion-schemes split text transformers-compat ]; libraryToolDepends = [ alex happy ]; @@ -57084,6 +57052,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_6_1" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, clash-lib + , clash-prelude, concurrent-supply, containers, data-binary-ieee754 + , deepseq, directory, exceptions, extra, filepath, ghc, ghc-boot + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.6.1"; + sha256 = "0kkwrp2ch01s75gyy3xa3lf305xi9czw0v4sgqcb4cds4qb47ih2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring Cabal clash-lib clash-prelude + concurrent-supply containers data-binary-ieee754 deepseq directory + exceptions extra filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -57127,6 +57126,74 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_6_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, async + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, Glob, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, pretty-show, prettyprinter, primitive + , quickcheck-text, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, time, transformers, trifecta, unordered-containers, vector + , vector-binary-instances, yaml + }: + mkDerivation { + pname = "clash-lib"; + version = "1.6.1"; + sha256 = "0qghvgl4x1lskmadn14kgbilfq9m2cb6n3ik513p27cvv5k8ahpj"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array async attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist exceptions extra filepath ghc ghc-boot-th + hashable haskell-src-meta hint integer-gmp interpolate lens mtl + ordered-containers pretty-show prettyprinter primitive + template-haskell temporary terminal-size text time transformers + trifecta unordered-containers vector vector-binary-instances yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers deepseq directory Glob + stringsearch yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + + "clash-lib-hedgehog" = callPackage + ({ mkDerivation, base, clash-lib, containers, data-binary-ieee754 + , fakedata, ghc-typelits-knownnat, ghc-typelits-natnormalise + , hedgehog, hedgehog-fakedata, mmorph, mtl, pretty-show, primitive + , text, transformers + }: + mkDerivation { + pname = "clash-lib-hedgehog"; + version = "1.6.1"; + sha256 = "0mm5wr80aylkp8xr71r40n90n5piipyfq7nrrj1ppqmb7lcs8gwj"; + libraryHaskellDepends = [ + base clash-lib containers data-binary-ieee754 fakedata + ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog + hedgehog-fakedata mmorph mtl pretty-show primitive text + transformers + ]; + description = "Hedgehog Generators for clash-lib"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -57184,6 +57251,63 @@ self: { broken = true; }) {}; + "clash-prelude_1_6_1" = callPackage + ({ mkDerivation, array, arrows, base, binary, bytestring + , constraints, containers, criterion, data-binary-ieee754 + , data-default-class, deepseq, directory, doctest-parallel, extra + , filepath, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, th-abstraction, th-lift + , th-orphans, time, transformers, type-errors, uniplate, vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.6.1"; + sha256 = "18fhkk2icwk8jm7d6ni0l2l7jgh0isdkmlzj2dpvqrwla6qf40j2"; + libraryHaskellDepends = [ + array arrows base binary bytestring constraints containers + data-binary-ieee754 data-default-class deepseq extra ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + th-abstraction th-lift th-orphans time transformers type-errors + uniplate vector + ]; + testHaskellDepends = [ + base bytestring deepseq doctest-parallel filepath + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + hedgehog hint quickcheck-classes-base tasty tasty-hedgehog + tasty-hunit tasty-quickcheck tasty-th template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "clash-prelude-hedgehog" = callPackage + ({ mkDerivation, base, clash-prelude, ghc-typelits-knownnat + , ghc-typelits-natnormalise, hedgehog, text + }: + mkDerivation { + pname = "clash-prelude-hedgehog"; + version = "1.6.1"; + sha256 = "12p3rnfxi0l249l7w6cbvp2l4hlzxzppi9nca7vn9awr20shi2r4"; + libraryHaskellDepends = [ + base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise + hedgehog text + ]; + description = "Hedgehog Generators for clash-prelude"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -57204,10 +57328,8 @@ self: { }: mkDerivation { pname = "clash-shake"; - version = "0.2.1"; - sha256 = "0lxv3ihlhnibi7vmfa4pqmf04524vlr3ksmdzgrlcarximi122kd"; - revision = "1"; - editedCabalFile = "07yb41fg6s5r8cs4xvax8nk3mly33shbbclql0q24wz5g7h4w06d"; + version = "0.2.2"; + sha256 = "10gj6764qhdy6ki0dyy75ycpj5il26jgxxjcr0xy9kkixi3wgsrb"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -57278,8 +57400,8 @@ self: { }: mkDerivation { pname = "clashilator"; - version = "0.1.1"; - sha256 = "0d95h9dflclzgfph4as4bzz0442z0a9w59d97snzih9wc1cg4vbp"; + version = "0.1.2"; + sha256 = "1p58zn6m85zgn4f6pj6v6vqhhcazbid7gi9vg7cm52i1sx1jdbb8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57811,22 +57933,21 @@ self: { ({ mkDerivation, atomic-primops, base, containers, exceptions , extra, hspec, lifted-base, microlens, monad-control, primitive , QuickCheck, rec-smallarray, template-haskell, th-abstraction - , transformers, transformers-base, unliftio + , transformers-base, unliftio }: mkDerivation { pname = "cleff"; - version = "0.2.0.0"; - sha256 = "0p9xmp9injfyy4d9p4cxqm103rwrwwwdghph4gawhjwsyp4611m8"; + version = "0.2.1.0"; + sha256 = "1a9gvmz9s71c1m9d1f5mxnhid8096fdhmgw4j9l358gg4i6lzvrw"; libraryHaskellDepends = [ atomic-primops base containers exceptions microlens monad-control primitive rec-smallarray template-haskell th-abstraction - transformers transformers-base unliftio + transformers-base unliftio ]; testHaskellDepends = [ atomic-primops base containers exceptions extra hspec lifted-base microlens monad-control primitive QuickCheck rec-smallarray - template-haskell th-abstraction transformers transformers-base - unliftio + template-haskell th-abstraction transformers-base unliftio ]; description = "Fast and concise extensible effects"; license = lib.licenses.bsd3; @@ -58363,8 +58484,8 @@ self: { ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: mkDerivation { pname = "clock"; - version = "0.8.2"; - sha256 = "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b"; + version = "0.8.3"; + sha256 = "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -62884,22 +63005,6 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.14"; - sha256 = "01d5zq7ja55jjn65fj5rs11kzqnc6baysxkzkq0jfd23wdqf9f92"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_10_15" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; version = "1.10.15"; sha256 = "1n02ck0zci6y2w8dm03j2qypgbc176skapixrmnxrp9dnbwcprc0"; libraryHaskellDepends = [ @@ -62908,7 +63013,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "concurrent-resource-map" = callPackage @@ -73161,7 +73265,6 @@ self: { testHaskellDepends = [ base dates hspec QuickCheck time ]; description = "Date conversions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "dates" = callPackage @@ -73178,8 +73281,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Small library for parsing different dates formats"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "datetime" = callPackage @@ -73657,6 +73758,7 @@ self: { description = "Discordian Date Types for Haskell"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ddc-base" = callPackage @@ -74028,8 +74130,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.3.1"; - sha256 = "1ndwwnvx89pz0rmkr5ba4gv7w2q2q8j9n3a31s9aibxd0qjd6ijx"; + version = "1.4.0"; + sha256 = "02s649lbfil4c5hqvqrqp93sag21g45hmfw2nxbnpazj1cn1bk7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75664,8 +75766,8 @@ self: { }: mkDerivation { pname = "derive-topdown"; - version = "0.0.2.2"; - sha256 = "1rymdadqwryr7ipxrw9j3m3g1n2c8l3j7wc3wphcak2nk6x2b60k"; + version = "0.0.3.0"; + sha256 = "1w36nczl0rl91sgm3vcd4gvm3lr6zdjqvmfdikkjq664xwnxrn8h"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; @@ -75779,8 +75881,8 @@ self: { }: mkDerivation { pname = "deriving-trans"; - version = "0.3.0.0"; - sha256 = "07847l2iwnrgskldqnjx3312rw95fp3xsmdx5rc61746ghl76aq7"; + version = "0.3.1.0"; + sha256 = "0x7kk9b08f9fplkycw2202qil3rh5l2x7l7whjlv30b0v5k885xz"; libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; @@ -77290,6 +77392,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.2"; sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; + revision = "1"; + editedCabalFile = "1pcc4vh1sb6h4bq4x2nxpynjvmif2bn1w3ddi24jbjhgr5b6ln59"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -77309,8 +77413,8 @@ self: { pname = "diagrams-canvas"; version = "1.4.1"; sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj"; - revision = "2"; - editedCabalFile = "0x8iv0998nn42l0ph90xq50ca514m3zhac4s9zl1hc5hzivj10sl"; + revision = "3"; + editedCabalFile = "0yajv3bnzhqwr673rch0wd9vhc4kcfdpdw5p5a2x1xbrpzghksac"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -77773,6 +77877,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "dialogue" = callPackage + ({ mkDerivation, base, bytestring, directory }: + mkDerivation { + pname = "dialogue"; + version = "0.1.0"; + sha256 = "03rlcyvkzm9fyqdsgswx9sgw2jdiplngw9a1rknngwnwnx5mqbpm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring directory ]; + executableHaskellDepends = [ base ]; + description = "I/O in Haskell Report 1.2"; + license = lib.licenses.bsd3; + }) {}; + "dib" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, digest, directory, filepath, mtl, process, text, time @@ -79053,8 +79171,8 @@ self: { }: mkDerivation { pname = "disco"; - version = "0.1.1.0"; - sha256 = "04z203dvqc6ipcw6mhnx63q2s2hlmvxy5d5v0ml2z53b4crbprha"; + version = "0.1.2.0"; + sha256 = "0c8d7ly5v6x9pf9xhs1rlnd627d6lsna0x40qrz59xcc77n78xr3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79140,8 +79258,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.11.0"; - sha256 = "10vak5aar5fx25ani676pi870mnnvzrn6n1b1akhdyags1hrsghm"; + version = "1.12.0"; + sha256 = "02gxfpwrxg7i9n0wca4g0dfsndrdxasdsdbp79ixwp51pvd04cad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80192,8 +80310,8 @@ self: { }: mkDerivation { pname = "distribution-opensuse"; - version = "1.1.1"; - sha256 = "1drjlcakv48djnqyrl50c6l974zrxm1gq3z8cx58xndfb2j0hzq6"; + version = "1.1.3"; + sha256 = "1yrir5x70nsw5rajcphmr7bzi7k2m05iw97bl7b3v3a5q1i69as5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80606,6 +80724,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "dns-patterns" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, HUnit + , parser-combinators, text + }: + mkDerivation { + pname = "dns-patterns"; + version = "0.1"; + sha256 = "01ap0j5ar81v5k9dm0vsd03271xkqwi0a1dx3s9yflg7ll98yjs8"; + libraryHaskellDepends = [ + attoparsec base bytestring parser-combinators text + ]; + testHaskellDepends = [ attoparsec base bytestring HUnit text ]; + description = "DNS name parsing and pattern matching utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -90124,13 +90260,13 @@ self: { "evm-opcodes" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-dword - , hedgehog, hspec, tasty, tasty-discover, tasty-hedgehog - , tasty-hspec, text + , hedgehog, hspec, tasty, tasty-bench, tasty-discover + , tasty-hedgehog, tasty-hspec, text }: mkDerivation { pname = "evm-opcodes"; - version = "0.1.0"; - sha256 = "1bjn8i6d6vccms4xzs877cpmd75v0kgd349a024gig3rfsxqadn5"; + version = "0.1.1"; + sha256 = "07y2j1d6q9mnq3qaz2nf9394p88rnil6naanfxb608d9qa0cxbg9"; libraryHaskellDepends = [ base bytestring cereal containers data-dword text ]; @@ -90139,6 +90275,9 @@ self: { tasty-discover tasty-hedgehog tasty-hspec text ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers data-dword tasty-bench text + ]; description = "Opcode types for Ethereum Virtual Machine (EVM)"; license = lib.licenses.mit; }) {}; @@ -92885,10 +93024,8 @@ self: { }: mkDerivation { pname = "fastsum"; - version = "0.1.1.1"; - sha256 = "0j9jd068xgk7nn2ilgdkv1pxngflqqgxz1pnhdssgiih04v8zw5l"; - revision = "1"; - editedCabalFile = "0mmdkpgxlc6fsl5pq8kgdh41h08m86s0y4wnan293h3c74q1xd6x"; + version = "0.2.0.0"; + sha256 = "1yjsmk8ws6y5rbv23d3jqyqz4pvkzn44dmx1gflldgdfm9xi31ac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99145,8 +99282,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.0.2.6"; - sha256 = "0fkvpc9glzp4xm21nqvn1hfv9704hxyqrvmhl6z5qn43dv97srvf"; + version = "1.0.2.8"; + sha256 = "072jq8bqxa7h067hplhwp8zfnx1ygfcg1yxjyj10lwxdmr3barsw"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit containers data-default datadog doctest ekg-core errors exceptions @@ -101466,7 +101603,7 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_21_5" = callPackage + "futhark_0_21_6" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 @@ -101481,8 +101618,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.5"; - sha256 = "1an0xk4hqma5hd5jq3m00l0f2kkh8mpg01ww488xsbh1976jm1dy"; + version = "0.21.6"; + sha256 = "1981w3yzzfhlqs5p98mdb5b3yhhck1lvcxx12j3krsa4raclf8s6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106114,6 +106251,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-events_0_17_0_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.17.0.2"; + sha256 = "0dkzxpfiqpd1i1lhrssp1b242111228ap113iavarr9hb7y8rl72"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -112502,8 +112659,8 @@ self: { }: mkDerivation { pname = "gmail-simple"; - version = "0.1.0.2"; - sha256 = "03zqp5gl3jxn2y5mx3qpb9xxj1zsbsbqapz9jdmvfrxdsb1xsa56"; + version = "0.1.0.4"; + sha256 = "1xjgww7hn27x4vmj23ji3i2r2552kkinbc0170k6sc5f2bxdda6f"; libraryHaskellDepends = [ aeson base base64 blaze-html bytestring containers cryptonite http-api-data http-conduit http-media jwt text time @@ -112686,6 +112843,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "gnuplot_0_5_7" = callPackage + ({ mkDerivation, array, base, containers, data-accessor + , data-accessor-transformers, deepseq, filepath, process + , semigroups, temporary, time, transformers, utility-ht + }: + mkDerivation { + pname = "gnuplot"; + version = "0.5.7"; + sha256 = "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers data-accessor data-accessor-transformers + deepseq filepath process semigroups temporary time transformers + utility-ht + ]; + description = "2D and 3D plots using gnuplot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gnutls" = callPackage ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers }: @@ -125792,10 +125971,8 @@ self: { ({ mkDerivation, array, base, happy, pretty, syb }: mkDerivation { pname = "haskell-src"; - version = "1.0.3.1"; - sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "5"; - editedCabalFile = "1qaibp1b1szb3ci5lhsxa3lh7iwyfzr5gjnmb4nypqwjqs05dk2c"; + version = "1.0.4"; + sha256 = "1spkhv83hy5v1lxs44l3w53vk8zj7gnx42c40hrkj4fcz6apdiwb"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -125939,8 +126116,8 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.8"; - sha256 = "0fg5h6k8m6hf7vwmczp8my2p1js5srhj7bcl7q0pdgd2d0lx43dd"; + version = "0.8.9"; + sha256 = "0y3hnqg33pqzc66nl58va8lvwvmb0mx5q0p9r55i6cc3xwjahiyx"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -126941,8 +127118,8 @@ self: { }: mkDerivation { pname = "haskellish"; - version = "0.3.1"; - sha256 = "1a3lsdy78f4lfgrag2ppy4yp2snvn1dg5krhbxwarl70sd2j4fhg"; + version = "0.3.2"; + sha256 = "1rrzgzgajga1gvw6cfmlif1crzy7zr0dq7wyx1r6rp7sf0drrgxr"; libraryHaskellDepends = [ base containers haskell-src-exts mtl template-haskell text ]; @@ -128363,7 +128540,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_5_0_1" = callPackage + "hasql_1_5_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, postgresql-binary @@ -128373,8 +128550,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.5.0.1"; - sha256 = "0y8q3jh6lf9nc3xj4l1rql2g1r0id5j7gjmicqq6rqz6k0njs8h9"; + version = "1.5.0.2"; + sha256 = "1f9faq0f2bilylc0rd64s0icrp086qb0q70w4z4vih2hs0sx6fs0"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl postgresql-binary postgresql-libpq @@ -128535,20 +128712,20 @@ self: { "hasql-interpolate" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty - , tasty-hunit, template-haskell, text, time, transformers, uuid - , vector + , tasty-hunit, template-haskell, text, time, tmp-postgres + , transformers, uuid, vector }: mkDerivation { pname = "hasql-interpolate"; - version = "0.1.0.1"; - sha256 = "134h9jrqdnvki97dq3cagzwabcnbcbls72l5f32m9s44dbrnq5bl"; + version = "0.1.0.2"; + sha256 = "1snayn9g5xa9q4c38p8s0ir6ij32js17b02qsacif6v080hqw94b"; libraryHaskellDepends = [ aeson array base bytestring containers haskell-src-meta hasql megaparsec mtl scientific template-haskell text time transformers uuid vector ]; testHaskellDepends = [ - base hasql tasty tasty-hunit template-haskell text + base hasql tasty tasty-hunit template-haskell text tmp-postgres ]; description = "QuasiQuoter that supports expression interpolation for hasql"; license = lib.licenses.bsd3; @@ -128600,21 +128777,6 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.3.0.7"; - sha256 = "1ncv3xs9kxgzibmxddrxii1ik9z6iw2p1q0lbli8n56d4y1rs570"; - libraryHaskellDepends = [ - base-prelude hasql hasql-pool optparse-applicative - ]; - description = "\"optparse-applicative\" parsers for \"hasql\""; - license = lib.licenses.mit; - }) {}; - - "hasql-optparse-applicative_0_3_0_8" = callPackage - ({ mkDerivation, base-prelude, hasql, hasql-pool - , optparse-applicative - }: - mkDerivation { - pname = "hasql-optparse-applicative"; version = "0.3.0.8"; sha256 = "1yx56vi1dpymxk5c3rkk74bbghcxfp6x333xn2j4x2ls38676dvg"; libraryHaskellDepends = [ @@ -128622,7 +128784,6 @@ self: { ]; description = "\"optparse-applicative\" parsers for \"hasql\""; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-pipes" = callPackage @@ -137165,6 +137326,8 @@ self: { pname = "hls-class-plugin"; version = "1.0.2.0"; sha256 = "0drpxrazhwd228skgky7xdzcf22gi1pi2lby0dj0nzpzhrdl0pw0"; + revision = "1"; + editedCabalFile = "18x8k0gwpxv0vs4d8rbl5p0pjf75apb142i0p8vssbpvjwiwx33i"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp text transformers @@ -137459,25 +137622,20 @@ self: { "hls-rename-plugin" = callPackage ({ mkDerivation, base, containers, extra, filepath, ghc - , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-retrie-plugin - , hls-test-utils, lsp, lsp-types, syb, text, transformers + , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-test-utils + , lsp, lsp-types, syb, text, transformers }: mkDerivation { pname = "hls-rename-plugin"; - version = "1.0.0.0"; - sha256 = "0j13nh3fvvmj1sd11fiq9fccq23s6p7jz3m96b49kprkayx65zhh"; - revision = "1"; - editedCabalFile = "193q5qz563lvwm1vpfadr7cy7yxk15z2va5p9bw0xjz2x8yhc5fq"; + version = "1.0.0.1"; + sha256 = "04l2w3x60ayxa9a6cdmscrfvyx9fsnbl4q05m8f0s1s18zlgjf86"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hiedb - hls-plugin-api hls-retrie-plugin lsp lsp-types syb text - transformers + hls-plugin-api lsp lsp-types syb text transformers ]; testHaskellDepends = [ base filepath hls-test-utils ]; description = "Rename plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-retrie-plugin" = callPackage @@ -138658,8 +138816,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.16.1"; - sha256 = "17845a9p2k2390xwnh1k2v9a1sdwjn5r5riww54nknxv2vqdkf42"; + version = "1.16.2"; + sha256 = "0yw9fnpac1ryk0pn0ikf4g1p687mvschrnpj7szlcj6am78ldqzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138831,6 +138989,8 @@ self: { testHaskellDepends = [ base hspec MissingH parsec split ]; description = "Small library for typesafe's configuration specification"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hodatime" = callPackage @@ -144066,17 +144226,17 @@ self: { "hsendxmpp" = callPackage ({ mkDerivation, base, hslogger, pontarius-xmpp - , pontarius-xmpp-extras, string-class, text + , pontarius-xmpp-extras, string-class, text, tls }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.6"; - sha256 = "1w3jm8lsll65i57iqlspw1vzvw5rr4q9qwarq896s0vr8kz68irh"; + version = "0.1.3"; + sha256 = "01zwrq37877jb39yji622ibmb8nmgqhgflb9bbl7pnf7ck7cj0aq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hslogger pontarius-xmpp pontarius-xmpp-extras string-class - text + text tls ]; description = "sendxmpp clone, sending XMPP messages via CLI"; license = lib.licenses.agpl3Only; @@ -145847,18 +146007,18 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-junit-formatter_1_1_0_0" = callPackage + "hspec-junit-formatter_1_1_0_1" = callPackage ({ mkDerivation, base, conduit, containers, directory, exceptions - , filepath, hspec, hspec-core, markdown-unlit, temporary, text - , time, xml-conduit, xml-types + , filepath, hspec, hspec-core, iso8601-time, markdown-unlit + , temporary, text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.0"; - sha256 = "024xvpnyhlgg435bhh4klf2bl8siy7vx0k5y2nccyhv16bchhl96"; + version = "1.1.0.1"; + sha256 = "194r8bxfn525mn8vq4dcfkbsn668s11yz4mdqbfr5qy29i1bzm5p"; libraryHaskellDepends = [ base conduit containers directory exceptions filepath hspec-core - text time xml-conduit xml-types + iso8601-time text time xml-conduit xml-types ]; testHaskellDepends = [ base containers filepath hspec hspec-core markdown-unlit temporary @@ -148206,6 +148366,8 @@ self: { pname = "http-client-openssl"; version = "0.3.3"; sha256 = "03rr1wz1907v3gx5qsqdkd850hy47glb574s69265pv6yspaivdx"; + revision = "1"; + editedCabalFile = "0f2x40wdd09svjylg1zwapnnqgvxid1fcakvwgxlz61a16w8sfb6"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system http-client network ]; @@ -148274,6 +148436,23 @@ self: { license = lib.licenses.mit; }) {}; + "http-client-restricted_0_0_5" = callPackage + ({ mkDerivation, base, connection, data-default, http-client + , http-client-tls, network, network-bsd, utf8-string + }: + mkDerivation { + pname = "http-client-restricted"; + version = "0.0.5"; + sha256 = "1vfm9qc3zr0rmq2ddgyg13i67020cdk8xqhyzfc2zcn1km2p6r85"; + libraryHaskellDepends = [ + base connection data-default http-client http-client-tls network + network-bsd utf8-string + ]; + description = "restricting the servers that http-client will use"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-client-session" = callPackage ({ mkDerivation, base-prelude, bytestring, either, http-client , mtl-prelude @@ -148335,7 +148514,7 @@ self: { license = lib.licenses.mit; }) {}; - "http-client-tls_0_3_6" = callPackage + "http-client-tls_0_3_6_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, cryptonite, data-default-class, exceptions, gauge , hspec, http-client, http-types, memory, network, network-uri @@ -148343,8 +148522,8 @@ self: { }: mkDerivation { pname = "http-client-tls"; - version = "0.3.6"; - sha256 = "0c6pbkvk25z7xnv88mkjysfqvqjs1vmbxrdcrblald44nbs2prvd"; + version = "0.3.6.1"; + sha256 = "03f8p9gxdzl6slyw1r6vpv2dqhsyjvbaawbjv75kaq0vlj3gz7xi"; libraryHaskellDepends = [ base bytestring case-insensitive connection containers cryptonite data-default-class exceptions http-client http-types memory network @@ -149021,37 +149200,6 @@ self: { , directory, filepath, ghc-prim, HsOpenSSL, hspec , hspec-expectations, http-common, HUnit, io-streams, lifted-base , mtl, network, network-uri, openssl-streams, random, snap-core - , snap-server, system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.9.4"; - sha256 = "03xdcb0v735xdrkjlm1w56mskh3x08cbsjrcd7wn4li65ixc20xa"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory filepath HsOpenSSL http-common - io-streams mtl network network-uri openssl-streams text - transformers unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams random snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = lib.licenses.bsd3; - }) {}; - - "http-streams_0_8_9_6" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, filepath, ghc-prim, HsOpenSSL, hspec - , hspec-expectations, http-common, HUnit, io-streams, lifted-base - , mtl, network, network-uri, openssl-streams, random, snap-core , snap-server, text, transformers, unordered-containers }: mkDerivation { @@ -149073,7 +149221,6 @@ self: { ]; description = "An HTTP client using io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-test" = callPackage @@ -150155,8 +150302,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "hvect"; - version = "0.4.0.0"; - sha256 = "1dihbqfjwgd92khlrc8mwjxsjbwbassma3bxg8hqr7qqgwdfyl6b"; + version = "0.4.0.1"; + sha256 = "01fh0nr4dfkn4aj1fx6chiaijwg9azp8qics48n5arlwn2c4kn5p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Simple strict heterogeneous lists"; @@ -152456,8 +152603,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hypergeometric"; - version = "0.1.1.0"; - sha256 = "0wajl2wyxy7j44khx9bipwvz0z1dqazwym3bk5w997b8f87irpfk"; + version = "0.1.2.0"; + sha256 = "19vxqc9ng2vfvqxslxb950ygdqdd3cbqs4m6nqw8mbyjgld2wqd8"; libraryHaskellDepends = [ base ]; description = "Hypergeometric functions"; license = lib.licenses.agpl3Only; @@ -152968,8 +153115,8 @@ self: { }: mkDerivation { pname = "ice40-prim"; - version = "0.3.1.2"; - sha256 = "1jsqisqpwvnj9fibnrs88255hqarmssq62nkm080g7h0n8a14ggr"; + version = "0.3.1.3"; + sha256 = "02971h72z9k6rv7p3lkyrf8apkk4angk71n6dyqfkvg2phark2d1"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise interpolate @@ -159516,8 +159663,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "0.3.0.0"; - sha256 = "16m9gqswwqm66w1wynrivis51vhr6xh40gv12z6nf5w2dry8kljx"; + version = "0.3.1.0"; + sha256 = "1nn3c91fhq46ng2yh9425cpxlk5mksalx5wrv1d7z0xn5m1v1387"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -160644,8 +160791,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.9.2"; - sha256 = "1iwzrpgd9lhp0c2hhyv3nfcv5pw344vp1llqf9vdw5mliz116jn4"; + version = "0.9.3"; + sha256 = "1sdcf55mynij8bcwj65j3izay65q2h8dl7lqlhkm3670h3v3f91h"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite memory mtl text time transformers transformers-compat @@ -162651,6 +162798,8 @@ self: { pname = "jwt"; version = "0.11.0"; sha256 = "1l9qblq11kbrrmcfnh0hcjqnhmi3qm6va3z4pmi4i32wqh3bwjnx"; + revision = "1"; + editedCabalFile = "0afy7kpsw9x2nx7d7fk3jc4rjm6mpiaihihqr5dnqg09wig760h6"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite cryptostore http-types memory network-uri scientific semigroups text time @@ -164078,8 +164227,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.4.0"; - sha256 = "10jdkcp256q1n63v0pqqml9nvq0fp3paww2fy742f5xvyid927qr"; + version = "0.1.5.1"; + sha256 = "09b9zjfsk03xrp34b8z7a48ym1vyhqjwpfv7hdkn3nr3pkgljkf1"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive file-embed foldl geomancy @@ -164117,8 +164266,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.4.0"; - sha256 = "0dyhainb14q3gi1spdfsz31yf6xiisjyp06hzxrqz3q5fg7in0c9"; + version = "0.1.5.0"; + sha256 = "0ral2p8i7kjxhil70q2fkirbl0nq3kfrvqzk3x2ykbmx91c90ds0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring derive-storable @@ -164345,6 +164494,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "kewar" = callPackage + ({ mkDerivation, array, base, containers, HUnit, split }: + mkDerivation { + pname = "kewar"; + version = "0.1.1.1"; + sha256 = "02bqjql9y0kp58wasr1myjf3kd6g2acmzp4f4mb8g8qfbrj15lr1"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ array base containers split ]; + executableHaskellDepends = [ array base containers split ]; + testHaskellDepends = [ array base containers HUnit split ]; + description = "CLI and library to generate QR codes"; + license = lib.licenses.mit; + }) {}; + "key" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -164709,8 +164874,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "kind-apply"; - version = "0.3.2.0"; - sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq"; + version = "0.3.2.1"; + sha256 = "0si02ps0aivra87sc57fss088vimvs9j32r7xhbaqv8vh0wi0ng9"; libraryHaskellDepends = [ base ]; description = "Utilities to work with lists of types"; license = lib.licenses.bsd3; @@ -164720,8 +164885,8 @@ self: { ({ mkDerivation, base, kind-apply }: mkDerivation { pname = "kind-generics"; - version = "0.4.1.2"; - sha256 = "0p5svycdf3vwfz871acv2a66qm0ab67ygl0hjdpn01qcl1mzghhm"; + version = "0.4.1.4"; + sha256 = "11l1n57wfh1gr9mn0gb9kbkjbrfghmf3qasl0l6fjlbjcl8yvzbm"; libraryHaskellDepends = [ base kind-apply ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; license = lib.licenses.bsd3; @@ -165104,6 +165269,40 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "koneko" = callPackage + ({ mkDerivation, aeson, array, async, base, bytestring, cmdargs + , deepseq, directory, doctest, filepath, hashtables, megaparsec + , random, regex-pcre, safe, silently, split, text, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "koneko"; + version = "0.0.2"; + sha256 = "0s6wa3alj7z3jhadghf2rqkdphlr9mbx0n1lhgxljw25nj7x5z00"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson array async base bytestring cmdargs deepseq directory + filepath hashtables megaparsec random regex-pcre safe silently + split text unix unordered-containers vector + ]; + executableHaskellDepends = [ + aeson array async base bytestring cmdargs deepseq directory + filepath hashtables megaparsec random regex-pcre safe silently + split text unix unordered-containers vector + ]; + testHaskellDepends = [ + aeson array async base bytestring cmdargs deepseq directory doctest + filepath hashtables megaparsec random regex-pcre safe silently + split text unix unordered-containers vector + ]; + description = "a concatenative not-quite-lisp for kittens"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -168185,30 +168384,6 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.2.1"; - sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh"; - revision = "1"; - editedCabalFile = "1h5chlb66ycg96ab56hwqr4qk82l19gq1pg1zfzhfdl5byg24fln"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring cassava containers explicit-exception filepath - non-empty optparse-applicative parsec pathtype transformers - unordered-containers utility-ht vector - ]; - description = "Generator for Haskell interface to Fortran LAPACK"; - license = lib.licenses.bsd3; - }) {}; - - "lapack-ffi-tools_0_1_3" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers - , explicit-exception, filepath, non-empty, optparse-applicative - , parsec, pathtype, transformers, unordered-containers, utility-ht - , vector - }: - mkDerivation { - pname = "lapack-ffi-tools"; version = "0.1.3"; sha256 = "0qk5a43w8xn8pp9bhmjmjyvriiin2dyf4nvk13w858hsxyx6xqkx"; isLibrary = false; @@ -168221,7 +168396,6 @@ self: { ]; description = "Generator for Haskell interface to Fortran LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lapack-hmatrix" = callPackage @@ -170758,16 +170932,16 @@ self: { "libarchive" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal , composition-prelude, cpphs, criterion, deepseq, dir-traverse - , directory, dlist, filepath, hspec, hspec-core, libarchive, mtl + , directory, dlist, filepath, hspec, libarchive, mtl , pathological-bytestrings, tar, tar-conduit, temporary , unix-compat }: mkDerivation { pname = "libarchive"; - version = "3.0.3.1"; - sha256 = "1rkm6n2p41i6lxdfsrvpv5sbz2p3mgyp3xx6g437fcgjjbdsyx3q"; - revision = "1"; - editedCabalFile = "0r48nmczidz00l19cbmq05f766wipc9dwkqb3xsvbwwcazapbjkz"; + version = "3.0.3.2"; + sha256 = "000yq98nm151p0j95nm6dy2pp4g0dz8sh704ga3gcsp2dhk3vrji"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -170777,7 +170951,7 @@ self: { libraryToolDepends = [ c2hs cpphs ]; testHaskellDepends = [ base bytestring composition-prelude deepseq dir-traverse directory - filepath hspec hspec-core mtl pathological-bytestrings temporary + filepath hspec mtl pathological-bytestrings temporary ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ @@ -174956,8 +175130,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.0"; - sha256 = "1j1cfx2ja45nyzv8yivh1803yx6cywikj4pryp74pl0bkdjszv60"; + version = "12.0.0.1"; + sha256 = "0l576wi605lqj8lgvqz1a4kd99bk93fi09gpppifbizw1vgihhy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180202,8 +180376,8 @@ self: { pname = "marshal-contt"; version = "0.2.0.0"; sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb"; - revision = "1"; - editedCabalFile = "1cfkcb3zpddikzg610zbrwr00vn3y8sakr3m8vis5cw25hxra1c0"; + revision = "2"; + editedCabalFile = "12krz2lzqfkhqwa8dbq0rfbl9vz1dns2q7ddfzcwk9ck3gfsz8c7"; libraryHaskellDepends = [ base bytestring kan-extensions lens mtl ]; @@ -181812,18 +181986,18 @@ self: { }) {}; "mealy" = callPackage - ({ mkDerivation, adjunctions, base, containers, folds, generic-lens - , lens, matrix, mwc-probability, numhask, numhask-array, primitive + ({ mkDerivation, adjunctions, base, containers, folds, matrix + , mwc-probability, numhask, numhask-array, optics-core, primitive , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.1.0"; - sha256 = "14xdhb39aa548sswbkasx546pzpgyl9msabi2w5gd7qwvlhxsmg3"; + version = "0.2.0"; + sha256 = "0rc1c7l2g7b1xr66dga3p6lg49pykxhsy24jg5rl4ag255axlfyv"; libraryHaskellDepends = [ - adjunctions base containers folds generic-lens lens matrix - mwc-probability numhask numhask-array primitive profunctors tdigest - text vector vector-algorithms + adjunctions base containers folds matrix mwc-probability numhask + numhask-array optics-core primitive profunctors tdigest text vector + vector-algorithms ]; description = "Mealy machines for processing time-series and ordered data"; license = lib.licenses.bsd3; @@ -181900,23 +182074,6 @@ self: { }: mkDerivation { pname = "med-module"; - version = "0.1.2.1"; - sha256 = "0f1yjdix89g6z2kigj08iq88jmi0x59la7764ixfha5sbjnwz0pp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring storable-endian transformers utility-ht - ]; - description = "Parse song module files from Amiga MED and OctaMED"; - license = lib.licenses.gpl3Only; - }) {}; - - "med-module_0_1_2_2" = callPackage - ({ mkDerivation, base, bytestring, storable-endian, transformers - , utility-ht - }: - mkDerivation { - pname = "med-module"; version = "0.1.2.2"; sha256 = "0qvwz49xz4bbhkkh9c7zjqzvbdhmgnraxpj8a4fc5lf0yb1k79ba"; isLibrary = true; @@ -181926,7 +182083,6 @@ self: { ]; description = "Parse song module files from Amiga MED and OctaMED"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "medea" = callPackage @@ -182152,18 +182308,18 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, optparse-simple, pantry, path - , path-io, rio, rio-orphans, yaml + ({ mkDerivation, aeson, base, bytestring, optparse-simple, pantry + , path, path-io, rio, rio-orphans, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.4.2.0"; - sha256 = "002qwccn4nwd7ik78k3qq9jxchj1v57c0c4b56w8424xg5291lzk"; + version = "0.4.2.1"; + sha256 = "00c1cc2cgwr6p01xc8sf570aly5hw6p932anjjra7rw7a3mcmc96"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring optparse-simple pantry path path-io rio rio-orphans - yaml + aeson base bytestring optparse-simple pantry path path-io rio + rio-orphans yaml ]; description = "Handles uploading to Hackage from mega repos"; license = lib.licenses.mit; @@ -185641,35 +185797,13 @@ self: { ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark , mmark-ext, optparse-applicative, stache, text - , unordered-containers - }: - mkDerivation { - pname = "mmark-cli"; - version = "0.0.5.0"; - sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "6"; - editedCabalFile = "1qki0f2iwr9phma4wby3alnsxigzl5qc1ims8cvhszkill9yfi4z"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring directory ghc-syntax-highlighter gitrev lucid - megaparsec mmark mmark-ext optparse-applicative stache text - unordered-containers - ]; - description = "Command line interface to the MMark markdown processor"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "mmark-cli_0_0_5_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory - , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark - , mmark-ext, optparse-applicative, stache, text }: mkDerivation { pname = "mmark-cli"; version = "0.0.5.1"; sha256 = "1an1rc7gdl2209d3agxx1dfl61zsc2wg5nx9cwdf50spmlgs3cr0"; + revision = "1"; + editedCabalFile = "0x4lpxga127f37z43w4rgccw9w05j23ppy7k19kz6gh3p43gnx1m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185688,29 +185822,6 @@ self: { }: mkDerivation { pname = "mmark-ext"; - version = "0.2.1.3"; - sha256 = "1hc95gvw4dyjlf2y4nli68zavjd0aj9br55n7417r7g70si1m82s"; - revision = "2"; - editedCabalFile = "1jnx5g34k7l5vxds8f7amsjn9cqpvwy1g6hvfq8kjrdnxv6rzyfs"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri - skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark skylighting text ]; - testToolDepends = [ hspec-discover ]; - description = "Commonly useful extensions for the MMark markdown processor"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "mmark-ext_0_2_1_4" = callPackage - ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec - , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting - , text - }: - mkDerivation { - pname = "mmark-ext"; version = "0.2.1.4"; sha256 = "02ygx0kkp69gd2n4bnqjzbwzhs9ksqm148jf6zfgn3z8w1p9glzh"; enableSeparateDataOutput = true; @@ -186231,34 +186342,6 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.4.2"; - sha256 = "018hiiqx6n272mwbmhd5j9wlzyz0x7ppa9jsrv4zx1nb6n7shkh5"; - revision = "1"; - editedCabalFile = "01v497wkcida80xlkg25yhppb711ynyx2zyv9hdyzrflq8pz4g6w"; - 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_4_3" = 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.4.3"; sha256 = "0904ff8pzcbk1swp0s1v5js468qnf3ccyzfcvaa62nsaj4qb7shq"; libraryHaskellDepends = [ @@ -186275,7 +186358,6 @@ self: { ]; description = "Modern library for working with URIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -190435,16 +190517,18 @@ self: { "msgpack-binary" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-binary-ieee754, deepseq, groom, hashable, hspec - , msgpack-types, QuickCheck, text, unordered-containers, vector + , monad-validate, msgpack-types, QuickCheck, text + , unordered-containers, vector }: mkDerivation { pname = "msgpack-binary"; - version = "0.0.14"; - sha256 = "1pf0fzxkrd2f1jzm3mkybayd94pxq28a49nvjzx8i2lxrdmynkp6"; + version = "0.0.15"; + sha256 = "0i3m4n5gw4a5ryikmy2drzh95g7766pdfsb5bahin8cmi1bq5bj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 msgpack-types text + base binary bytestring data-binary-ieee754 monad-validate + msgpack-types text ]; executableHaskellDepends = [ base bytestring groom ]; testHaskellDepends = [ @@ -190482,6 +190566,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "msgpack-persist" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , groom, hashable, hspec, monad-validate, msgpack-types, persist + , QuickCheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-persist"; + version = "0.0.15"; + sha256 = "07ibjg1pkr9005qydw87hll1f5x03ip5qqxvm9vpnnk9fi1jckl4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monad-validate msgpack-types persist text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers hashable hspec msgpack-types QuickCheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = lib.licenses.bsd3; + }) {}; + "msgpack-rpc" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring , conduit, conduit-extra, exceptions, monad-control, msgpack, mtl @@ -190505,19 +190615,18 @@ self: { "msgpack-rpc-conduit" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring - , conduit, conduit-extra, data-default-class - , data-default-instances-base, exceptions, hspec, monad-control - , msgpack-binary, msgpack-types, mtl, network, text, unliftio-core + , conduit, conduit-extra, data-default-class, exceptions, hspec + , monad-control, monad-validate, msgpack-binary, msgpack-types, mtl + , network, text, unliftio-core }: mkDerivation { pname = "msgpack-rpc-conduit"; - version = "0.0.6"; - sha256 = "000aycbvxac4li8rxqxmj3a020fwl08wnq01fv8jdlx3qg7k57hf"; + version = "0.0.7"; + sha256 = "1x9zzv70vwkqiiazx9gyj8nqqid3k6b0725znszcm7ai3f5rgd43"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra - data-default-class data-default-instances-base exceptions - monad-control msgpack-binary msgpack-types mtl network text - unliftio-core + data-default-class exceptions monad-control monad-validate + msgpack-binary msgpack-types mtl network text unliftio-core ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; @@ -190525,22 +190634,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "msgpack-testsuite" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, hspec + , monad-validate, msgpack-types, QuickCheck, text + , unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-testsuite"; + version = "0.0.15"; + sha256 = "0dy7knji7nckdkp0kpnxxc7nmqyzbkq7j0aas59p3yg0n1nsd2bd"; + libraryHaskellDepends = [ + base bytestring containers hashable hspec monad-validate + msgpack-types QuickCheck text unordered-containers vector + ]; + testHaskellDepends = [ base hspec ]; + description = "A Haskell implementation of MessagePack"; + license = lib.licenses.bsd3; + }) {}; + "msgpack-types" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq - , generic-arbitrary, hashable, hspec, hspec-discover, QuickCheck - , text, unordered-containers, vector + , generic-arbitrary, hashable, hspec, hspec-discover + , monad-validate, QuickCheck, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "msgpack-types"; - version = "0.1.0"; - sha256 = "1q28xxv6093h6xp6mih515cid5dm08dz5ak2y1jvcb1b2lf29s01"; + version = "0.2.1"; + sha256 = "1s6i7y2mr04z6bdhq307xqm78h1d8f7a17i3fbdknsiw5lvfsj49"; libraryHaskellDepends = [ - base bytestring containers deepseq hashable QuickCheck text - unordered-containers vector + base bytestring containers deepseq hashable monad-validate + QuickCheck text transformers unordered-containers vector ]; testHaskellDepends = [ base bytestring containers deepseq generic-arbitrary hashable hspec - QuickCheck text unordered-containers vector + monad-validate QuickCheck text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; @@ -193848,6 +193976,28 @@ self: { broken = true; }) {}; + "nanopass" = callPackage + ({ mkDerivation, base, containers, mtl, pretty-simple + , template-haskell, transformers + }: + mkDerivation { + pname = "nanopass"; + version = "0.0.2.0"; + sha256 = "0pymmshr81pckiixqyxz985lx402d0srhcnz31vv27pyn9xvi6xf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl template-haskell transformers + ]; + executableHaskellDepends = [ + base pretty-simple template-haskell transformers + ]; + description = "An EDSL for creating compilers using small passes and many intermediate representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "nanospec" = callPackage ({ mkDerivation, base, hspec, silently }: mkDerivation { @@ -198939,20 +199089,6 @@ self: { }: mkDerivation { pname = "nri-env-parser"; - version = "0.1.0.7"; - sha256 = "1mm879mqpgl040p789wcjm5bhrqia5czn18c5dgni8bwa4y61ank"; - libraryHaskellDepends = [ - base modern-uri network-uri nri-prelude text - ]; - description = "Read environment variables as settings to build 12-factor apps"; - license = lib.licenses.bsd3; - }) {}; - - "nri-env-parser_0_1_0_8" = callPackage - ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text - }: - mkDerivation { - pname = "nri-env-parser"; version = "0.1.0.8"; sha256 = "0hwl363iya38hi021an2l4cinclz1p96n4lck2x9yi9cf4yfqzk8"; libraryHaskellDepends = [ @@ -198960,7 +199096,6 @@ self: { ]; description = "Read environment variables as settings to build 12-factor apps"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-http" = callPackage @@ -199019,32 +199154,6 @@ self: { }: mkDerivation { pname = "nri-observability"; - version = "0.1.1.3"; - sha256 = "0brjddl4ff8881ld41sp7ix3skxgj10jign4xx8l3ad89f91621b"; - libraryHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring conduit - directory hostname http-client http-client-tls nri-env-parser - nri-prelude random safe-exceptions stm text time - unordered-containers uuid - ]; - testHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring conduit - directory hostname http-client http-client-tls nri-env-parser - nri-prelude random safe-exceptions stm text time - unordered-containers uuid - ]; - description = "Report log spans collected by nri-prelude"; - license = lib.licenses.bsd3; - }) {}; - - "nri-observability_0_1_1_4" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs - , bytestring, conduit, directory, hostname, http-client - , http-client-tls, nri-env-parser, nri-prelude, random - , safe-exceptions, stm, text, time, unordered-containers, uuid - }: - mkDerivation { - pname = "nri-observability"; version = "0.1.1.4"; sha256 = "077zj96iapjp6cn38z0g6didpwq866xz5m03d8kbp3pwdmfpr65c"; libraryHaskellDepends = [ @@ -199061,7 +199170,6 @@ self: { ]; description = "Report log spans collected by nri-prelude"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-postgresql" = callPackage @@ -199093,33 +199201,6 @@ self: { "nri-prelude" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc - , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text - , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text - , time, unix, vector - }: - mkDerivation { - pname = "nri-prelude"; - version = "0.6.0.5"; - sha256 = "0qam6bamjp92mky193iddpq3v7knsxx4kcyc8fw3a8nkbrx6gigh"; - libraryHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-coloured-text-terminfo - safe-exceptions terminal-size text time unix vector - ]; - testHaskellDepends = [ - aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-coloured-text-terminfo - safe-exceptions terminal-size text time unix vector - ]; - description = "A Prelude inspired by the Elm programming language"; - license = lib.licenses.bsd3; - }) {}; - - "nri-prelude_0_6_0_6" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base - , bytestring, containers, directory, exceptions, filepath, ghc , hedgehog, junit-xml, lens, pretty-diff, pretty-show , safe-coloured-text, safe-coloured-text-terminfo, safe-exceptions , terminal-size, text, time, unix, vector @@ -199144,7 +199225,6 @@ self: { ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nri-redis" = callPackage @@ -200226,19 +200306,17 @@ self: { }) {}; "o-clock" = callPackage - ({ mkDerivation, base, doctest, ghc-prim, Glob, hedgehog - , hspec-expectations, markdown-unlit, tasty, tasty-hedgehog - , tasty-hunit-compat, type-spec + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec-expectations + , markdown-unlit, tasty, tasty-hedgehog, tasty-hunit-compat + , type-spec }: mkDerivation { pname = "o-clock"; - version = "1.2.1"; - sha256 = "17y44aajipysw1p268rq8a6lhv9cdhkvxjcpcdij93sqp818q96z"; - revision = "1"; - editedCabalFile = "1n8ns0f4ljbarb5xmlwfs1lq24jg30m3hv0gmpgd26y666d3hh95"; + version = "1.2.1.1"; + sha256 = "0rq9bn9lxsmgjw6w55r3c15y1pjq36vi246qldr53csr0pa9ggfy"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ghc-prim ]; + libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hedgehog hspec-expectations markdown-unlit tasty @@ -200740,35 +200818,6 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.2.5"; - sha256 = "157g6ys5j5kj4cc1jp2rmcpwrax4fh7bx1zvvicmrf88qaq56v2h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec base bytestring containers deepseq formatting - hashable parsec semigroups template-haskell text time transformers - unliftio-core - ]; - librarySystemDepends = [ unixODBC ]; - executableHaskellDepends = [ - base bytestring optparse-applicative text - ]; - testHaskellDepends = [ - base bytestring hspec parsec QuickCheck text time - ]; - benchmarkHaskellDepends = [ async base text weigh ]; - description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) unixODBC;}; - - "odbc_0_2_6" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , deepseq, formatting, hashable, hspec, optparse-applicative - , parsec, QuickCheck, semigroups, template-haskell, text, time - , transformers, unixODBC, unliftio-core, weigh - }: - mkDerivation { - pname = "odbc"; version = "0.2.6"; sha256 = "0yyyjnnlnd3zpvnh55l5gsvakrciml91jaqy5hdgnlpqfslz330r"; isLibrary = true; @@ -200788,7 +200837,6 @@ self: { benchmarkHaskellDepends = [ async base text weigh ]; description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) unixODBC;}; "odd-jobs" = callPackage @@ -201612,7 +201660,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_9_0_0" = callPackage + "opaleye_0_9_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -201622,8 +201670,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.9.0.0"; - sha256 = "0i2ncvgx7pdq4q7i1fxnpxya3jb9jnzz7d6hcd5s0lrc2flv6rxd"; + version = "0.9.2.0"; + sha256 = "0zvms42pmsg6ish76mvk0ksz4apxvs4iyjfvgkm7zwadq3i9v8l3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -201713,28 +201761,29 @@ self: { ({ mkDerivation, acc, attoparsec, attoparsec-data, base, base64 , binary, bytestring, caerbannog, containers, data-default, domain , domain-optics, hashable, hashable-time, http-client, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , quickcheck-instances, scientific, tasty, tasty-hunit , tasty-quickcheck, text, text-builder, time, transformers , unordered-containers, vector, vector-instances, xml-conduit , xml-parser }: mkDerivation { pname = "opc-xml-da-client"; - version = "0.1.1"; - sha256 = "15mc3i7j2pjxd7gw7ba8nlvkbp8j161vphbsg3iqbjqaqivfzivl"; + version = "0.1.2"; + sha256 = "1hfm6ky5zh27z1iv0f4p53d4nbpragaiq734si4q8hkk0aafldw5"; libraryHaskellDepends = [ acc attoparsec attoparsec-data base base64 bytestring containers data-default domain domain-optics hashable hashable-time - http-client QuickCheck rerebase scientific text text-builder time - transformers unordered-containers vector vector-instances - xml-conduit xml-parser + http-client scientific text text-builder time transformers + unordered-containers vector vector-instances xml-conduit xml-parser ]; testHaskellDepends = [ - attoparsec binary caerbannog data-default http-client QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - text-builder xml-conduit xml-parser + acc attoparsec attoparsec-data base base64 binary bytestring + caerbannog containers data-default domain domain-optics hashable + hashable-time http-client QuickCheck quickcheck-instances + scientific tasty tasty-hunit tasty-quickcheck text text-builder + time transformers unordered-containers vector vector-instances + xml-conduit xml-parser ]; - doHaddock = false; description = "OPC XML-DA Client"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -204321,6 +204370,8 @@ self: { pname = "ormolu"; version = "0.3.1.0"; sha256 = "1517z6bi8ifzdmfclmqdiipi6zcnxagymf1sxr43sj2ipkglg2rs"; + revision = "1"; + editedCabalFile = "1ns76yw44hp84lrxdhl23aa2d14jjf4m6fd906672a4b4x3cr64l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204350,6 +204401,8 @@ self: { pname = "ormolu"; version = "0.4.0.0"; sha256 = "1alibf9ya2igwwjx23pjd0fi2kdaldrkfdpyr2w211irf9agy0j9"; + revision = "2"; + editedCabalFile = "11r9j19xiaf1kpzr1kz41i8ldchf6ygqp0zxrkgmrzvidpvh6q62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206476,7 +206529,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_5_3" = callPackage + "pantry_0_5_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -206490,8 +206543,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.3"; - sha256 = "1pb9vr615rhh0lyi392ghxdnxq5pr15y0w8f372xh046i9dinj39"; + version = "0.5.4"; + sha256 = "080j0pw8fmyb05klbi8vy3dpahiw3zxmykvqamvziwrznl1p4b2m"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -207326,6 +207379,18 @@ self: { broken = true; }) {}; + "pareto-front" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "pareto-front"; + version = "0.1.0.1"; + sha256 = "0c375bbsgbv6agjks0n01zxvjsh7zpnph212cf4jbpmjm0rgixsa"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Monoids for dealing with Pareto efficiency"; + license = lib.licenses.bsd3; + }) {}; + "paripari" = callPackage ({ mkDerivation, base, bytestring, parser-combinators, random , tasty, tasty-hunit, text @@ -208798,6 +208863,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-io_1_7_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.7.0"; + sha256 = "1jr1inh3x0a42rdh4q0jipbw8jsprdza1j5xkzd7nxcq0a143g9l"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions filepath hspec path transformers + unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-like" = callPackage ({ mkDerivation, base, path }: mkDerivation { @@ -209478,15 +209564,15 @@ self: { license = lib.licenses.asl20; }) {}; - "pcre2_2_0_5" = callPackage + "pcre2_2_1_0" = callPackage ({ mkDerivation, base, containers, criterion, hspec, microlens , microlens-platform, mtl, pcre-light, regex-pcre-builtin , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "2.0.5"; - sha256 = "11rggirpd02rx9xyfd1yigglzyqzn8vx0knszgrbbvj0cmzb20fn"; + version = "2.1.0"; + sha256 = "0ina14prysmh6njfcpyhzhyz0r6qsixvli3fifh46biqryx2whaw"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -212270,8 +212356,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.8.4.0"; - sha256 = "1sxc7qsp93qdf11lp09www1ynrzpnxnc0k00pidz1bpka2hqcjh1"; + version = "0.9.0.0"; + sha256 = "1sbsywylcmjf592618rs727k1lfc42yll541cqwm34ffhzsvfzij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212442,8 +212528,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.14.1.0"; - sha256 = "0cs0h9dh39cxbdgnajbh5j1mc0fqbqd6q8mkgc1an7n463m756vr"; + version = "0.15.0.0"; + sha256 = "1rayhhyvqskxw374jrl5h92lhx0n3k3wda7vw4wkgw3kbargwm7q"; libraryHaskellDepends = [ base cli-arguments heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -212465,8 +212551,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.3.0.0"; - sha256 = "1ajgp4wyfdzvvnj5272r0cpl9jykps5bwzn93asmfbilzfdjaynz"; + version = "0.4.0.0"; + sha256 = "0bhjmnj1k54c7xg3m9p5rlnqq4csf872ap2a2axf4d6caizz29cf"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics ]; @@ -212481,8 +212567,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.8.5.0"; - sha256 = "18a1a7509gajp5yf7kbsgd1iak5rghqr0qky8yhmb4n8j2mz8wfa"; + version = "0.9.0.0"; + sha256 = "17zr8j9slvimjv1vx6bzq1d86n5ap1j17yglxvviyd3xbhnp2qq2"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -221651,6 +221737,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "pro-abstract" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, hedgehog + , neat-interpolation, optics-core, text + }: + mkDerivation { + pname = "pro-abstract"; + version = "0.1.0.0"; + sha256 = "0w8dmf8n35z414j4591gvix7q9dn7zn1pai4mg93p9fkd09453fm"; + libraryHaskellDepends = [ + base containers deepseq hashable optics-core text + ]; + testHaskellDepends = [ + base containers deepseq hashable hedgehog neat-interpolation + optics-core text + ]; + doHaddock = false; + description = "Abstract syntax for writing documents"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pro-source" = callPackage ({ mkDerivation, base, deepseq, hashable, optics-core , prettyprinter, tasty, tasty-hunit, tasty-quickcheck, text, vector @@ -226470,29 +226578,12 @@ self: { }: mkDerivation { pname = "quickcheck-higherorder"; - version = "0.1.0.0"; - sha256 = "1gv7r1h9fjg6qi6gj8cg66d7z51kddishxp4hp6cnk55zx1wgy6w"; - revision = "1"; - editedCabalFile = "1xlfpnfbjlihl021b1l6mnl195fcpsjpmdnszf0bfh7q8mrdwr3j"; - libraryHaskellDepends = [ base QuickCheck test-fun ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - description = "QuickCheck extension for higher-order properties"; - license = lib.licenses.mit; - }) {}; - - "quickcheck-higherorder_0_1_0_1" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, test-fun - }: - mkDerivation { - pname = "quickcheck-higherorder"; version = "0.1.0.1"; sha256 = "17bnbq6hndlvfv2ryingw181vhv6ab5npkjxkxs0bijv654dca2h"; libraryHaskellDepends = [ base QuickCheck test-fun ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "QuickCheck extension for higher-order properties"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-instances" = callPackage @@ -230576,8 +230667,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.13"; - sha256 = "0kqk8iiqhpqrr0b0bxcy0vqp159cnsf9zri45hbp4npqm2lvcw37"; + version = "0.2.14"; + sha256 = "07hq90pk30p14jqk016wchmqrc1qhwa9qajaj90i363g3arcb24p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -234974,12 +235065,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_15" = callPackage + "rerebase_1_15_0_3" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.15"; - sha256 = "034i8g44w5sfx1770wn95vyh809ar0f6mjwfg96dpszs78b4bzr5"; + version = "1.15.0.3"; + sha256 = "0jxlssdxgh5ldgkdpmhpk8vy5fxmq95171b3jl57r9m2f7zqrcd2"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -235497,24 +235588,17 @@ self: { }: mkDerivation { pname = "rest-rewrite"; - version = "0.1.1"; - sha256 = "0absln2c3ia5bj473wr6lahms9x9xj6szk9lgpb9382px038wxrn"; - revision = "1"; - editedCabalFile = "0nzzqg9m7b01g574mm37yiqaqkff4p7hskgj98nb4v7cdp46nypb"; - isLibrary = true; - isExecutable = true; + version = "0.2.0"; + sha256 = "05s5c9j6afswy0ix8m543csk1blknncrh4kz2ihyw90yfgpjjb3b"; libraryHaskellDepends = [ - base containers hashable mtl parsec process text - unordered-containers - ]; - executableHaskellDepends = [ base containers hashable monad-loops mtl parsec process QuickCheck text time unordered-containers ]; testHaskellDepends = [ - base containers hashable mtl parsec process QuickCheck text + base containers hashable mtl QuickCheck text time unordered-containers ]; + doHaddock = false; description = "Rewriting library with online termination checking"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -235863,16 +235947,16 @@ self: { ({ mkDerivation, barbies, base, clash-ghc, clash-lib, clash-prelude , containers, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, lens, lift-type, monoidal-containers - , mtl, template-haskell, th-orphans, transformers + , mtl, template-haskell, transformers }: mkDerivation { pname = "retroclash-lib"; - version = "0.1.0.1"; - sha256 = "1wcnr6hk05xj3qyq6wdwyn5qv820wi6djlcllyv8nc2cz8zgc3v7"; + version = "0.1.1"; + sha256 = "1v8xw37cbnz16gqmf65hgk0kvh0vgmq8sj6nh4ngz48l6i5wylv6"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - lens lift-type monoidal-containers mtl template-haskell th-orphans + lens lift-type monoidal-containers mtl template-haskell transformers ]; description = "Code shared across the code samples in the book \"Retrocomputing with Clash\""; @@ -235888,8 +235972,8 @@ self: { }: mkDerivation { pname = "retroclash-sim"; - version = "0.1.0"; - sha256 = "1wv8is17ds9y49an832dlgixly9b98h8x6ybc5dj7zzf1jwplyp8"; + version = "0.1.1"; + sha256 = "147i7nbxyxgsvyj2wiaiipi0s8sp14y1av33yba4s148k38zsiw3"; libraryHaskellDepends = [ array arrows base clash-ghc clash-lib clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -245162,8 +245246,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { pname = "serialport"; - version = "0.5.3"; - sha256 = "0f0q26n27s6b9mfqc9xb9j8p4qrfjfddwiz1wslxk4rh176qw96i"; + version = "0.5.4"; + sha256 = "0hw9vcmxfhjad0jcq0c7m2klcnhilk5ag7byymyny0kzg4js27vr"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; @@ -245366,23 +245450,6 @@ self: { }) {}; "servant-auth" = callPackage - ({ mkDerivation, aeson, base, jose, lens, servant, text - , unordered-containers - }: - mkDerivation { - pname = "servant-auth"; - version = "0.4.0.0"; - sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; - revision = "3"; - editedCabalFile = "1hq0mz4fm2f6v57jzyahk5wfip285v3yh20dawvmwdh7wq6104zr"; - libraryHaskellDepends = [ - aeson base jose lens servant text unordered-containers - ]; - description = "Authentication combinators for servant"; - license = lib.licenses.bsd3; - }) {}; - - "servant-auth_0_4_1_0" = callPackage ({ mkDerivation, aeson, base, containers, jose, lens, servant, text , unordered-containers }: @@ -245395,7 +245462,6 @@ self: { ]; description = "Authentication combinators for servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-auth-client" = callPackage @@ -245529,36 +245595,6 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.6.0"; - sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; - revision = "3"; - editedCabalFile = "0iasfns12wab45hf4qkwm5bx1z63ass9n5sh926wnn82g1v6qdyw"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - case-insensitive cookie data-default-class entropy http-types jose - lens memory monad-time mtl servant servant-auth servant-server - tagged text time unordered-containers wai - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive hspec http-client http-types - jose lens lens-aeson mtl QuickCheck servant servant-auth - servant-server time transformers wai warp wreq - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "servant-server/servant-auth compatibility"; - license = lib.licenses.bsd3; - }) {}; - - "servant-auth-server_0_4_7_0" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, cookie, data-default-class, entropy - , hspec, hspec-discover, http-client, http-types, jose, lens - , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck - , servant, servant-auth, servant-server, tagged, text, time - , transformers, unordered-containers, wai, warp, wreq - }: - mkDerivation { - pname = "servant-auth-server"; version = "0.4.7.0"; sha256 = "1m145xxqg1xy7i1br9yfh3avwkb30zh808nr658ljl7j2imlknj2"; libraryHaskellDepends = [ @@ -245575,7 +245611,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-auth-swagger" = callPackage @@ -245733,6 +245768,8 @@ self: { pname = "servant-auth-wordpress"; version = "1.0.0.2"; sha256 = "0j4n5anlw3a2cgclmyblg01dcls91hzlmxgc2jkcdpwd49i0pv5n"; + revision = "1"; + editedCabalFile = "0d3sy1i3jcknfgca13a9ajjr65rpam2rahw0634rnmx0wdd30s0w"; libraryHaskellDepends = [ base mtl servant-server text time wai wordpress-auth ]; @@ -246737,8 +246774,8 @@ self: { pname = "servant-js"; version = "0.9.4.2"; sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; - revision = "1"; - editedCabalFile = "0lka70i2qjjj9x8i1ilsfgqq5hwdlrcyd2cj1qcpyhj85c9anxl3"; + revision = "2"; + editedCabalFile = "1wi3q1rn384h9gvxv6dmk31h0wwb6j4yjimz01cz6sgs7fs77ndj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246829,8 +246866,8 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.4"; - sha256 = "1m02z60l1knzpcc41ccqmg8fblg2wzdn60vy3cwjbk15girjpxaw"; + version = "0.9.0.5"; + sha256 = "0yhxj62hhqk0269wk3062dpb39qp7khz1gjqyqqmzfbb4v5x8mfz"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -247526,21 +247563,18 @@ self: { }) {}; "servant-serf" = callPackage - ({ mkDerivation, attoparsec, base, hpack, mtl, optparse-applicative - , regex-base, regex-tdfa, text - }: + ({ mkDerivation, base, Cabal, directory, exceptions, filepath }: mkDerivation { pname = "servant-serf"; - version = "0.2.1"; - sha256 = "1xbjjf243ml2mavvizp6a7llw9c43mnncp7yk0ksjqcnchvsx43w"; + version = "0.3.0.1"; + sha256 = "0qa7ycz9nr214fdhkfvpfwhznshwbxn42mh90a4f8ddlqvbj3is2"; isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - attoparsec base hpack mtl optparse-applicative regex-base - regex-tdfa text + libraryHaskellDepends = [ + base Cabal directory exceptions filepath ]; - doHaddock = false; - description = "Generates a servant API module"; + executableHaskellDepends = [ base ]; + description = "Automatically generate Servant API modules"; license = lib.licenses.mit; }) {}; @@ -247937,24 +247971,6 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.3.5.3.52.5"; - sha256 = "1m7scy7fm19zk6xq5mb9l12ajdhm0ml9zl60rqr2m86x4q2i6gq0"; - revision = "1"; - editedCabalFile = "1hdwdhw8ipwf16asbpjgkbvchvc3ax1wqnpcdcjpagniay2x253r"; - libraryHaskellDepends = [ - aeson base bytestring file-embed-lzma servant servant-server - servant-swagger-ui-core text - ]; - description = "Servant swagger ui"; - license = lib.licenses.bsd3; - }) {}; - - "servant-swagger-ui_0_3_5_4_5_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, file-embed-lzma, servant - , servant-server, servant-swagger-ui-core, text - }: - mkDerivation { - pname = "servant-swagger-ui"; version = "0.3.5.4.5.0"; sha256 = "12w75z23bnygyr3ki9w3zfy9nhxyjawf9pyzhfg6rp2mq3nji9gg"; libraryHaskellDepends = [ @@ -247963,7 +247979,6 @@ self: { ]; description = "Servant swagger ui"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-swagger-ui-core" = callPackage @@ -259879,12 +259894,12 @@ self: { }) {}; "st2" = callPackage - ({ mkDerivation, base, gdp, ghc-prim, primitive }: + ({ mkDerivation, base, gdp, primitive }: mkDerivation { pname = "st2"; - version = "0.1.0.2"; - sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz"; - libraryHaskellDepends = [ base gdp ghc-prim primitive ]; + version = "0.1.1"; + sha256 = "1agmrzdgil899zjighm946syf41v3ygddbqsg1659n6s4hl5k96k"; + libraryHaskellDepends = [ base gdp primitive ]; description = "shared heap regions between local mutable state threads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -259987,6 +260002,8 @@ self: { pname = "stache"; version = "2.3.0"; sha256 = "1gfmr9gcq9zm7ljp2nqmc41lpig11d19xsqzazr2mvm5ddsi69cr"; + revision = "1"; + editedCabalFile = "0akyrm2zf2aq73fqi07fnkns3waxqciyzawv0nmr8yhkdaqj6plj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -260020,8 +260037,8 @@ self: { pname = "stache"; version = "2.3.1"; sha256 = "1a26pwg6y90588yf9sp18w4b2ahr64fxdhy1c3zv0c9pw7bv6k6q"; - revision = "1"; - editedCabalFile = "0yfy56ax3zbikvmdyplx5l3rzq50fjwz6rcb9l8iwz167h7gzjpr"; + revision = "2"; + editedCabalFile = "1bmnpm7galndl2a87vhbbrhxn1wn09x2l6bqwasfmczyjisn78a8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -263262,28 +263279,6 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.2.2.3"; - sha256 = "12zhy0nk9cxijhc66sjg1zgyv5qrvvrpxwzfvjpdxncv3v606w32"; - libraryHaskellDepends = [ - array async base bytestring directory network process random stm - text transformers unix zlib - ]; - testHaskellDepends = [ - array async base bytestring deepseq hspec network QuickCheck text - unix zlib - ]; - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; - description = "Common lower-level functions needed by various streaming data libraries"; - license = lib.licenses.mit; - }) {}; - - "streaming-commons_0_2_2_4" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, directory - , gauge, hspec, network, process, QuickCheck, random, stm, text - , transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; version = "0.2.2.4"; sha256 = "1wnc2hi90djilj1m0la3h3xri723pbpmfdyp0kxxs33irs6418an"; libraryHaskellDepends = [ @@ -263297,7 +263292,6 @@ self: { benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -264278,27 +264272,12 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.4"; - sha256 = "06fyf58kl3c5xpfdd5h7368ggbfadm5n67h3kqajrsgh3yl84hrq"; - revision = "1"; - editedCabalFile = "127byff30qm6vfnpdb2jfhag6dfv8zz306hkdnlkryx4gf5aab86"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_5" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; version = "0.1.5"; sha256 = "1n0rw1vvvsgznx4i21480qzzs44iw35hcdiw0d160war7nf2pyp5"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -265062,18 +265041,19 @@ self: { }) {}; "strong-path" = callPackage - ({ mkDerivation, base, exceptions, filepath, hspec, path, tasty - , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path + , tasty, tasty-discover, tasty-hspec, tasty-quickcheck + , template-haskell }: mkDerivation { pname = "strong-path"; - version = "1.1.2.0"; - sha256 = "1rz3rxdq3apah0ixj9dzd1wlicjj0l5lspv9bz79kfjvlxn15yib"; + version = "1.1.3.0"; + sha256 = "0jy8qmyixsi3d71qkrj4v3r9nrppb2hs4p5pbpj7yq964ryyg9am"; libraryHaskellDepends = [ - base exceptions filepath path template-haskell + base exceptions filepath hashable path template-haskell ]; testHaskellDepends = [ - base filepath hspec path tasty tasty-discover tasty-hspec + base filepath hashable hspec path tasty tasty-discover tasty-hspec tasty-quickcheck ]; testToolDepends = [ tasty-discover ]; @@ -266851,7 +266831,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "swagger2_2_8_1" = callPackage + "swagger2_2_8_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -266862,8 +266842,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.8.1"; - sha256 = "19y7krvgx5vdrr0wx3jkkwvdncn3gzyn168sqs333dxs4l3jnxvx"; + version = "2.8.2"; + sha256 = "0vxqmc3wx01fx04cqq9l0gvcas7njsj6q2r960rb1gbmggydpysc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat-batteries bytestring containers @@ -267182,7 +267162,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_7_0_1" = callPackage + "sydtest_0_8_0_0" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base , bytestring, containers, Diff, dlist, envparse, filepath , MonadRandom, mtl, optparse-applicative, path, path-io @@ -267192,8 +267172,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.7.0.1"; - sha256 = "09qvl0j8bx5v1i8mvvmzkfaxj7jrcbpbkxrnjcanml60dfp0s444"; + version = "0.8.0.0"; + sha256 = "1b2i4w58k0mrb5lk4hjbwfmm065gmmll6jm3k6jydjjkkpf1zfap"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path @@ -267269,6 +267249,23 @@ self: { license = "unknown"; }) {}; + "sydtest-hedgehog" = callPackage + ({ mkDerivation, base, containers, hedgehog, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-hedgehog"; + version = "0.0.0.0"; + sha256 = "0kxx2r4hjqzkrhplgfby2x7zcya05n42hna86zk27k2i9hkabhnh"; + libraryHaskellDepends = [ base containers hedgehog sydtest ]; + testHaskellDepends = [ base hedgehog sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "A Hedgehog companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-hedis" = callPackage ({ mkDerivation, base, bytestring, hedis, network, path, path-io , port-utils, sydtest, sydtest-discover, sydtest-typed-process @@ -267729,13 +267726,13 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.3.0.20211007"; - sha256 = "1ia79d3ih3yr6fpm85hvn42jpq0d41qvm96v58b2rsxlivrnibsq"; + version = "0.4.0.20211106"; + sha256 = "0fbw0fg78b8wh3fcbvcm9v3qrsvpyymhwd7f9a70yqj90mggl7sc"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers ]; - description = "Basic symantics combinators for Embedded Domain-Specific Languages (EDSL)"; + description = "Basic symantic combinators for Embedded Domain-Specific Languages (EDSL)"; license = lib.licenses.agpl3Plus; }) {}; @@ -271435,8 +271432,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "2"; - editedCabalFile = "13f0rmdyfd8wx9w9d6vj40akskq763gjj89p7dzy6zyaiyllgk64"; + revision = "3"; + editedCabalFile = "1bjmzxnrypv1nqhc37rwwcgilnrrjm8scwnb4ca6z99bldi95b27"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -274445,21 +274442,19 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) icu;}; - "text-icu_0_8_0" = callPackage + "text-icu_0_8_0_1" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, directory - , ghc-prim, HUnit, icu, icu-i18n, icu-uc, QuickCheck, random + , ghc-prim, HUnit, icu, icu-i18n, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 , text, time }: mkDerivation { pname = "text-icu"; - version = "0.8.0"; - sha256 = "1dpnh5izvjma0i3diqjdyag389cbnsv9fysyla2jy1nrpfrf9z8m"; - revision = "1"; - editedCabalFile = "0mz894ykvyb9ziprnwx3s9lcda6lsy60s0dgrh5silgsym99r3s9"; + version = "0.8.0.1"; + sha256 = "1bxhaxyvhag26airz870lc6rjlf14xigdx3cml13kp7bshwgl7wi"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; - libraryPkgconfigDepends = [ icu-i18n icu-uc ]; + libraryPkgconfigDepends = [ icu-i18n ]; testHaskellDepends = [ array base bytestring deepseq directory ghc-prim HUnit QuickCheck random test-framework test-framework-hunit @@ -274468,7 +274463,7 @@ self: { description = "Bindings to the ICU library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) icu; icu-i18n = null; icu-uc = null;}; + }) {inherit (pkgs) icu; icu-i18n = null;}; "text-icu-normalized" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, containers @@ -279110,6 +279105,7 @@ self: { description = "Easy-to-use TODOs manager"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tofromxml" = callPackage @@ -282828,10 +282824,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.23"; - sha256 = "02g0a6az01lfikrinx2027zqrp8wyivldwi36s2yqk9a5qm3ap5c"; - revision = "3"; - editedCabalFile = "1zc1djz1xi5pmw58rjwmxb7kkzxssnkng9qx93wz9n6bdjiyc2gd"; + version = "1.5.24"; + sha256 = "06n9k8cchmy090k6azl6ld8ygkljw8wrpw3cigsgz48hqchq8c2p"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -287592,8 +287586,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.20.1"; - sha256 = "13fv7wfq7g1pilpk1vprbf2mbdj7qfm2y9v8glwr6dqyswv8z9dn"; + version = "0.2.21.0"; + sha256 = "0z3g4hnwzianh8a564zfwj4rvs1ayggxm0wcwi97hc1g0ndz5hic"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -289049,7 +289043,9 @@ self: { ]; description = "A pragmatic time and date library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ sternenseemann ]; + broken = true; }) {}; "utf" = callPackage @@ -291523,6 +291519,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "velma" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , hspec, text + }: + mkDerivation { + pname = "velma"; + version = "0.2022.2.13"; + sha256 = "0dzq9py5k6hz9pqfv8cnfaj84q3y4j8p6pmpncd1crj1nkl10mr5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal containers directory filepath + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base Cabal filepath hspec text ]; + description = "Automatically add files to exposed-modules and other-modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "venzone" = callPackage ({ mkDerivation, ansi-terminal-game, base, containers, directory , file-embed, filepath, fsnotify, hspec, line-drawing, megaparsec @@ -292178,6 +292195,29 @@ self: { license = lib.licenses.mit; }) {}; + "vinyl_0_14_1" = callPackage + ({ mkDerivation, aeson, array, base, criterion, deepseq, ghc-prim + , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random + , primitive, should-not-typecheck, tagged, text + , unordered-containers, vector + }: + mkDerivation { + pname = "vinyl"; + version = "0.14.1"; + sha256 = "06qyy3g1msnwl8491rp0pabr7g7xk4jjidsixigd8if4kxl7dcdk"; + libraryHaskellDepends = [ array base deepseq ghc-prim ]; + testHaskellDepends = [ + aeson base hspec lens lens-aeson microlens mtl should-not-typecheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion linear microlens mwc-random primitive tagged vector + ]; + description = "Extensible Records"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vinyl-generics" = callPackage ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core , QuickCheck, records-sop, text, vinyl @@ -292954,8 +292994,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.16.1"; - sha256 = "1cm5ws9kp2dcrknj4vsw92xnl35gq33k9ijhf5aclpm95q1dw0hc"; + version = "3.16.2"; + sha256 = "1wawlq1x9nw9g5iynf8mhlv36876skpvfalfpnvdh55hfw4qznzh"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -295213,39 +295253,6 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.18"; - sha256 = "1m93s3p2zz00fdgkisl6sbnqnc6vvq0vz997i5y4mk9a3ssjflqw"; - libraryHaskellDepends = [ - array 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 unliftio 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 network - process QuickCheck simple-sendfile stm streaming-commons text time - time-manager unix unix-compat unliftio vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat unliftio x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - }) {}; - - "warp_3_3_19" = 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, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, unliftio, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; version = "3.3.19"; sha256 = "1wq63wrxk4p6ziig9qgqimmd1mx167868qiczd1avh8896p1f6rb"; libraryHaskellDepends = [ @@ -295267,7 +295274,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -295840,21 +295846,21 @@ self: { "web-rep" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, box, box-socket - , clay, concurrency, generic-lens, interpolatedstring-perl6 - , language-javascript, lens, lucid, mtl, optparse-generic, scotty + , clay, concurrency, interpolatedstring-perl6, language-javascript + , lucid, mtl, optics-core, optics-extra, optparse-generic, scotty , text, transformers, unordered-containers, wai-middleware-static , wai-websockets, websockets }: mkDerivation { pname = "web-rep"; - version = "0.8.0"; - sha256 = "1ri1sczacxy351jsdaiz7iwsl8b19a1jvzppyxf56grm6zr94dmg"; + version = "0.9.0"; + sha256 = "1xcrmm5yk19nh08gllnfg6ck0jijkxzl3ma4klwlnxp2ky75q7ds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bifunctors box box-socket clay concurrency - generic-lens interpolatedstring-perl6 language-javascript lens - lucid mtl scotty text transformers unordered-containers + interpolatedstring-perl6 language-javascript lucid mtl optics-core + optics-extra scotty text transformers unordered-containers wai-middleware-static wai-websockets websockets ]; executableHaskellDepends = [ base optparse-generic ]; @@ -297588,8 +297594,8 @@ self: { pname = "wide-word"; version = "0.1.1.2"; sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; - revision = "3"; - editedCabalFile = "15k9saqnib9vc9s4dsvamvnb3m6cjmnlwsy1brwfnd90vzzxmwjz"; + revision = "4"; + editedCabalFile = "150ikl5cf15lbk383pv1w8smpwbp0dzc0vby653fbzm8a2svcx76"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -297927,6 +297933,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "wireguard-hs" = callPackage + ({ mkDerivation, base, clock, cryptonite, ip, memory, network, text + , time, vector, vector-sized, wide-word + }: + mkDerivation { + pname = "wireguard-hs"; + version = "0.1.0"; + sha256 = "0nh1vjmz74i4c7254whp8d8si1bvzyq8s6x0ljcidahd1w0hv3i0"; + revision = "1"; + editedCabalFile = "0vf7akywcdh1k9x4d5kvlqrzkxz124lhg1l9547gfcsirlrhlb3n"; + libraryHaskellDepends = [ + base clock cryptonite ip memory network text time vector + vector-sized wide-word + ]; + description = "API for Linux Kernel Wireguard device management"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wires" = callPackage ({ mkDerivation, base, deepseq, mtl, profunctors, semigroupoids , these @@ -298253,6 +298279,8 @@ self: { pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; + revision = "1"; + editedCabalFile = "1qizgsiqsraj8w0qndcyw7grcmiylx63vp3lgw2dplchva8p3hp7"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq tasty tasty-hunit text @@ -301203,8 +301231,8 @@ self: { }: mkDerivation { pname = "xml-parser"; - version = "0.1.0.1"; - sha256 = "079ggb9bhad9px6gqbjhbir423hds389p42jc853caz7232dc6vx"; + version = "0.1.1"; + sha256 = "06a8pci3jr3mdrsh8708i61rqd2rsgqyf86s269ycca6xlbrgwzh"; libraryHaskellDepends = [ attoparsec base bytestring containers hashable text text-builder transformers unordered-containers xml-conduit @@ -303929,8 +303957,8 @@ self: { }: mkDerivation { pname = "yesod"; - version = "1.6.1.2"; - sha256 = "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f"; + version = "1.6.2"; + sha256 = "0krvg1ykzqg1aaj385rnrqr0a5ga3z5xl1s422q05y9csj0w1ami"; libraryHaskellDepends = [ aeson base bytestring conduit data-default-class directory fast-logger file-embed monad-logger shakespeare streaming-commons @@ -304016,6 +304044,7 @@ self: { description = "Automatically generate article previews for a yesod site"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-auth" = callPackage @@ -304031,8 +304060,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.10.5"; - sha256 = "11nywgjnivbfrbn8mg3lfr8r8lfpygn30vhnn0bzy9pa07nvgxnz"; + version = "1.6.11"; + sha256 = "0fdahk5mc63g0zsafk8axry01qaxahmclpmmwygp2lhfsjy8mby2"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -304533,22 +304562,22 @@ self: { }) {}; "yesod-bin" = 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 + ({ mkDerivation, aeson, 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"; + version = "1.6.2"; + sha256 = "12dwix5q3xk83d0d4715h680dbalbz4556wk3r89gps3rp9pib7f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal conduit conduit-extra containers + aeson 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 diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 51314db3f9fca..ca2391ebd25d2 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-GphF32CFxZYaoTG1k9pP+cRNs/PIKtwevTcIyjG7CpQ="; + sha256 = "sha256-ap6YCRUqtIgh36eTIk5BSjUildvYhqkC48Y4dxNMU8c="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index e2ab96d41b3fd..a66f0422b6db2 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1075"; + version = "1.10.3.1082"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "5uJtr6uz6mrkoFfzUmUb6vy5H4s1Lag3CNCsGwsQZ9Q="; + sha256 = "sha256-8hW8zgP+D72MtXYFPXx9FfkThQuCBo1Y6CU5w7xPE7c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 89c81e2b4a24a..bd96562d9e5dd 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -78,6 +78,13 @@ stdenv.mkDerivation rec { # fail to detect its variant at runtime. # See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 ./force-cs-variant.patch + + # The entry point binary $out/bin/racket is codesigned at least once. The + # following error is triggered as a result. + # (error 'add-ad-hoc-signature "file already has a signature") + # We always remove the existing signature then call add-ad-hoc-signature to + # circumvent this error. + ./force-remove-codesign-then-add.patch ]; preConfigure = '' @@ -90,10 +97,34 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm \ --replace /bin/true ${coreutils}/bin/true done + + # The configure script forces using `libtool -o` as AR on Darwin. But, the + # `-o` option is only available from Apple libtool. GNU ar works here. + substituteInPlace src/ChezScheme/zlib/configure \ + --replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' + mkdir src/build cd src/build - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) + '' + lib.optionalString stdenv.isLinux '' + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) + '' + lib.optionalString stdenv.isDarwin '' + gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) + '' + ; + + preBuild = lib.optionalString stdenv.isDarwin '' + # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic + # linker environment variables like this are purged. + # See: https://apple.stackexchange.com/a/212954/167199 + + # Make builders feed it to dlopen(...). Do not expose all of $libPath to + # DYLD_LIBRARY_PATH as the order of looking up symbols like + # `__cg_jpeg_resync_to_restart` will be messed up. Our libJPEG.dyllib + # expects it from our libTIFF.dylib, but instead it could not be found from + # the system `libTIFF.dylib`. DYLD_FALLBACK_LIBRARY_PATH has its own problem + # , too. + export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" ''; shared = if stdenv.isDarwin then "dylib" else "shared"; @@ -119,6 +150,6 @@ stdenv.mkDerivation rec { homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch new file mode 100644 index 0000000000000..c34457ceb9506 --- /dev/null +++ b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch @@ -0,0 +1,11 @@ +--- old/src/mac/codesign.rkt 2022-01-08 18:25:53.000000000 -0500 ++++ new/src/mac/codesign.rkt 2022-02-15 15:49:51.000000000 -0500 +@@ -17,6 +17,5 @@ + #:args (file) + file)) + +-(if remove? +- (remove-signature file) +- (add-ad-hoc-signature file)) ++(remove-signature file) ++(add-ad-hoc-signature file) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index ac15cd24e5097..e56945ed651d1 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -14,7 +14,7 @@ racket.overrideAttrs (oldAttrs: rec { as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. ''; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; broken = false; # Minimal build does not require working FFI }; }) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index b188754607d55..9776e85b4350d 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - sha256 = "sha256-GEbaKYXsZCU+zEGlTxR3cx60dQ/oQKndn9/uiOXJQlI="; + sha256 = "sha256-+OBNioEBQbOGpcnDlgtfAej+c0YfTJmxkeEV1JOEBwE="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1cb253774d4e1..57bf47f3abf17 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] @@ -38,7 +39,15 @@ stdenv.mkDerivation rec { "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; - propagatedBuildInputs = [ makeWrapper apr expat libiconv ] + # For some reason, db version 6.9 is selected when cross-compiling. + # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that. + # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now. + postConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile \ + --replace "-ldb-6.9" "-ldb" + ''; + + propagatedBuildInputs = [ apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ea0f67ce8c7f5..274a35c6ccfbc 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -162,6 +162,7 @@ stdenv.mkDerivation rec { "-DARROW_ENGINE=ON" "-DARROW_FILESYSTEM=ON" "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" + "-DARROW_HDFS=ON" "-DARROW_IPC=ON" "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix index ffbc99f79f7da..2c86bf981b701 100644 --- a/pkgs/development/libraries/boca/default.nix +++ b/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo="; + sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 3eae15c58d0af..a3de08a838bc9 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.12.0"; + version = "5.13.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rpbD3x7zIJCDZuu4K0wDkaBKSBh36amtza/wE3rb0HM="; + sha256 = "sha256-R22nWkI778LpCK3a5C6tvuIsEXU49wPya1fFQxdpocg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 5ef3bfa2ac408..d970f376d0997 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -11,13 +11,14 @@ , graphviz , libxslt , libiconv +, removeReferencesTo }: stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.5"; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; src = fetchFromGitHub { owner = "exiv2"; @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { gettext graphviz libxslt + removeReferencesTo ]; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -94,8 +96,15 @@ stdenv.mkDerivation rec { rm * mv .exiv2 exiv2 ) + + mkdir -p $static/lib + mv $lib/lib/*.a $static/lib/ + + remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a ''; + disallowedReferences = [ stdenv.cc.cc ]; + meta = with lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 2f02698f3abfc..f6dfa9695281d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.02.07.00"; + version = "2022.02.14.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-C/PQBXhOELNxQFfQhgQeU+QmsdtFeBESyWerC+QZBEI="; + sha256 = "sha256-tJuHzEi4nrj5jb6tmJeG21ggl4F+wvQyssEPNp/t6Ww="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix deleted file mode 100644 index 35ef9fba1051e..0000000000000 --- a/pkgs/development/libraries/git2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3 -, zlib, libssh2, openssl, pcre, http-parser -, libiconv, Security -}: - -stdenv.mkDerivation rec { - pname = "libgit2"; - version = "1.3.0"; - # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; - }; - - cmakeFlags = [ - "-DTHREADSAFE=ON" - "-DUSE_HTTP_PARSER=system" - ]; - - nativeBuildInputs = [ cmake python3 pkg-config ]; - - buildInputs = [ zlib libssh2 openssl pcre http-parser ] - ++ lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = "https://libgit2.github.com/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index e575173d72572..0e17e13e58189 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -272,7 +272,6 @@ stdenv.mkDerivation rec { "-Ddirectfb=disabled" "-Dflite=disabled" "-Dkms=disabled" # renders to libdrm output - "-Dofa=disabled" "-Dlv2=disabled" "-Dsbc=disabled" "-Dspandsp=disabled" diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 2b6dfc8fb52c7..6da3fc769ea67 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.0"; + version = "4.6.1"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw="; + sha256 = "2FUI0hy7zWPVaKeGKvXs1juXjX1XmcvkBMkdI4nQ7F8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 85163daad0a14..d2ac5ef214cef 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -59,17 +59,17 @@ let "aarch64-linux" = { platformStr = "linuxarm64"; projectArch = "arm64"; - sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081"; + sha256 = "01ny1k10dklsqrrqmxqd9433413wmpk4ddsmkjp9dzv52dvpcl08"; }; "i686-linux" = { platformStr = "linux32"; projectArch = "x86"; - sha256 = "0ki4zr8ih06kirgbpxbinv4baw3qvacx208q6qy1cvpfh6ll4fwb"; + sha256 = "000j6pc336c43xczl1rs5zf8nsf17y76f1kpy14gqgpwyzl8my0w"; }; "x86_64-linux" = { platformStr = "linux64"; projectArch = "x86_64"; - sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; + sha256 = "1ydjckld89dkpy5zrvk7jjpz70mnlmbm8yinkfpzgcwbkcakk6k7"; }; }; @@ -77,9 +77,9 @@ let in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "90.6.7"; - gitRevision = "19ba721"; - chromiumVersion = "90.0.4430.212"; + version = "96.0.18"; + gitRevision = "fe551e4"; + chromiumVersion = "96.0.4664.110"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 8e9fe4de88ae9..0b5531d70c543 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -7,14 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; - in "libdbusmenu-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "16.04"; - versionMinor = "0"; + pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; + version = "16.04.0"; src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; + url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 48c20c8b7ca5f..8d506efef89d7 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.72.0"; + version = "1.75.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-/StX22pSQtfOYbBTFL7vh0Y0V038Ohyq+qoDECITD80="; + hash = "sha256-3oYQwV1Srnq8VfS+M+BwIznXRxQFXr78SwXO3Xu08ws="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Jwf95oTyGsOikVMKAg+EaDNY78VW+kECD+lhNePSKWE="; + hash = "sha256-jti1aY8a9YB8x6fz7UqTY4uDj6gkMnG1hTN/Mgc+mHs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix new file mode 100644 index 0000000000000..dc12e643cb75e --- /dev/null +++ b/pkgs/development/libraries/libgit2/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, python3 +, zlib +, libssh2 +, openssl +, pcre +, http-parser +, libiconv +, Security +}: + +stdenv.mkDerivation rec { + pname = "libgit2"; + version = "1.4.0"; + # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch"; + sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk="; + }) + ]; + + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" + ]; + + nativeBuildInputs = [ cmake python3 pkg-config ]; + + buildInputs = [ zlib libssh2 openssl pcre http-parser ] + ++ lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + + doCheck = false; # hangs. or very expensive? + + meta = { + description = "Linkable library implementation of Git that you can use in your application"; + homepage = "https://libgit2.org/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 1ad302e439f89..49e76a94b0016 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper +, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson , getopt, perlPackages, ocamlPackages @@ -12,11 +12,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.44.1"; + version = "1.46.2"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj"; + sha256 = "0sq092irlj2jf64m7hjx23hn5k4iypqxmlyn9g2z0q0xab56ksp6"; }; strictDeps = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ ncurses jansson - pcre augeas libxml2 acl libcap libcap_ng libconfig + pcre2 augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex db numactl libapparmor perlPackages.ModuleBuild libtirpc @@ -53,13 +53,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!javaSupport) [ "--without-java" ]; patches = [ ./libguestfs-syms.patch - # Set HAVE_RPM, HAVE_DPKG, HAVE_PACMAN - (fetchpatch { - url = "https://github.com/libguestfs/libguestfs/commit/210959cc344d6a4a1e3afa26d276b130651def74.patch"; - sha256 = "121l58mk2mwhhqc3rcisdw3di7y729b30hyffc8a50mq5k7fvsdb"; - }) ]; - NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index f027fbe3cb8bf..f40898d11815f 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.7"; + version = "0.1.10"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-WYCYRFjjy9nr1p1SqzBGCBZ5vkhFybddXpHUcwdEDIQ="; + sha256 = "sha256-6fqcP8LWvRoDf5gJz+kW0w5+3PP/luuoPMak1QLKzzM="; }; patches = [ @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { gobject-introspection vala gtk-doc - (python3.withPackages (pkgs: with pkgs; [ - setuptools - ])) + python3 ]; buildInputs = [ @@ -60,10 +58,6 @@ stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - postPatch = '' - patchShebangs contrib/generate-version-script.py - ''; - doCheck = true; passthru = { diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index f79f82e9a782d..5303dbed6ca87 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c="; + sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index c9b346936f497..01cdc96e39cd6 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { description = "Fast and flexible C++ library for working with OpenStreetMap data"; homepage = "https://osmcode.org/libosmium/"; license = licenses.boost; + changelog = [ + "https://github.com/osmcode/libosmium/releases/tag/v${version}" + "https://github.com/osmcode/libosmium/blob/v${version}/CHANGELOG.md" + ]; maintainers = with maintainers; [ das-g ]; }; } diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 0f7757007005f..bb70ffcd32a5a 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.22.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-yj6adBP9nZLXZVg62bYenfuiMeyULEql25KbDen9ljA="; + sha256 = "sha256-aRHwkdAbM164diIAIyBp1Kt6u/GLyCWTtwF4eFaWbGU="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 6d9de18562374..1de6090b146c5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -14,6 +14,7 @@ , libobjc , rustPlatform , rustc +, rust , cargo , gnome , vala @@ -78,7 +79,8 @@ stdenv.mkDerivation rec { "--enable-installed-tests" "--enable-always-build-tests" - ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; makeFlags = [ "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 1bd22b2f7901d..68ef1afd2eef6 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libscrypt"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "technion"; repo = "libscrypt"; rev = "v${version}"; - sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng"; + sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; }; buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index d1a99fb88ab48..b7e02a62fa996 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtins"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "09ah1a7ska7xiki7625mn1d8i96il3hxbkc39ba8fn1a5383kmqa"; + sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; }; postPatch = '' diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 4ddd3b40d3641..8ca137e66119e 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OrM/zljmrPlUDMGlImS+aGPvgPVawocZTMmM2kjnH+Y="; + sha256 = "sha256-EyEfLy44fvO3TXOh3O5Soa1c4G34+OZkdnnfknijEWo="; }; postInstall = '' diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index bb62a9b3b2ba4..1fb737ed7a758 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { - name = "minizip-${zlib.version}"; + pname = "minizip"; + version = zlib.version; inherit (zlib) src; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 44f78daec72d0..e1eaa1d924b73 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6BWWYliZqs8dC/J8zC/Mfzc0BexIc1yhxyc8D7zcHvU="; + sha256 = "6VTAm0MJp++T4TtpJgrNxXOMkHR36zgbeLseQU7m29g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index a45884f72dc6f..2e8a997299f1b 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ndpi"; - version = "4.0"; + version = "4.2"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x"; + sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; }; configureScript = "./autogen.sh"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nDPI is a library for deep-packet inspection based on OpenDPI. ''; homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; - license = with licenses; lgpl3; + license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/nv-codec-headers/11_x.nix b/pkgs/development/libraries/nv-codec-headers/11_x.nix index a4bdd600282d7..284905cd4aa36 100644 --- a/pkgs/development/libraries/nv-codec-headers/11_x.nix +++ b/pkgs/development/libraries/nv-codec-headers/11_x.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "nv-codec-headers"; - version = "11.1.5.0"; + version = "11.1.5.1"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "5d6LCKQB31UZ0veanSeKJVrPkJ8o2nvQWRfIG8YuekM="; + sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU="; }; makeFlags = [ diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix new file mode 100644 index 0000000000000..1ba000a8103b0 --- /dev/null +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchFromGitHub +, lib +, meson +, ninja +, pkg-config +, libGL +, gst_all_1 +, nv-codec-headers-11 +, libva +, addOpenGLRunpath +}: + +stdenv.mkDerivation rec { + pname = "nvidia-vaapi-driver"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "elFarto"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + addOpenGLRunpath + ]; + + buildInputs = [ + libGL + gst_all_1.gstreamer + gst_all_1.gst-plugins-bad + nv-codec-headers-11 + libva + ]; + + postFixup = '' + addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" + ''; + + meta = with lib;{ + homepage = "https://github.com/elFarto/nvidia-vaapi-driver"; + description = "A VA-API implemention using NVIDIA's NVDEC"; + license = licenses.mit; + maintainers = with maintainers;[ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 661fd734d8863..879a916d3ea6d 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "opencl-headers-${version}"; + pname = "opencl-headers"; version = "2021.06.30"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index d785146ecb070..fa9fc1f87eeb7 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "sha256-Os5PRYTZMVekQrbwNODWsHANTx6RSC5vzGJ5JoYtvtE="; + sha256 = "sha256-LevS9euBAFkI1ll79uqmVaRR/6FH6Z4cypHqvCIWxgU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 2d6951301a116..43699291d3628 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,66 +1,27 @@ -{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "portmidi"; - version = "234"; + version = "2.0.2"; - src = fetchurl { - url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip"; - sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "zOmzJ2MLGhGXiN0XjcmnnUrk/uqxP9IaZbqCG5XchC4="; }; - prePatch = '' - cd portmidi/trunk - ''; - - cmakeFlags = let - #base = "${jdk}/jre/lib/${jdk.architecture}"; - in [ - "-DPORTMIDI_ENABLE_JAVA=0" - /* TODO: Fix Java support. - "-DJAVA_AWT_LIBRARY=${base}/libawt.so" - "-DJAVA_JVM_LIBRARY=${base}/server/libjvm.so" - */ + cmakeFlags = [ "-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release" "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release" "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release" - ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_ARCHITECTURES=${if stdenv.isAarch64 then "arm64" else "x86_64"}" - "-DCOREAUDIO_LIB=${CoreAudio}" - "-DCOREFOUNDATION_LIB=${CoreFoundation}" - "-DCOREMIDI_LIB=${CoreMIDI}" - "-DCORESERVICES_LIB=${CoreServices}" - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [ - "-framework CoreAudio" - "-framework CoreFoundation" - "-framework CoreMIDI" - "-framework CoreServices" ]; patches = [ - # XXX: This is to deactivate Java support. - (fetchurl { - url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; - sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; - }) - ] ++ lib.optionals stdenv.isDarwin [ - # Remove hardcoded variables so we can set them properly - ./remove-darwin-variables.diff + # Add missing header include + ./missing-header.diff ]; - postPatch = '' - sed -i -e 's|/usr/local/|'"$out"'|' -e 's|/usr/share/|'"$out"'/share/|' \ - pm_common/CMakeLists.txt pm_dylib/CMakeLists.txt pm_java/CMakeLists.txt - sed -i \ - -e 's|-classpath .|-classpath '"$(pwd)"'/pm_java|' \ - -e 's|pmdefaults/|'"$(pwd)"'/pm_java/&|g' \ - -e 's|jportmidi/|'"$(pwd)"'/pm_java/&|g' \ - -e 's/WORKING_DIRECTORY pm_java//' \ - pm_java/CMakeLists.txt - ''; - postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' ln -s libportmidi${ext} "$out/lib/libporttime${ext}" ''; @@ -75,7 +36,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - homepage = "http://portmedia.sourceforge.net/portmidi/"; + homepage = "https://github.com/PortMidi/portmidi"; description = "Platform independent library for MIDI I/O"; license = licenses.mit; maintainers = with maintainers; [ emilytrau ]; diff --git a/pkgs/development/libraries/portmidi/missing-header.diff b/pkgs/development/libraries/portmidi/missing-header.diff new file mode 100644 index 0000000000000..1fa1f147014e7 --- /dev/null +++ b/pkgs/development/libraries/portmidi/missing-header.diff @@ -0,0 +1,12 @@ +diff --git a/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c +index 10c3554..712a974 100755 +--- a/porttime/ptmacosx_mach.c ++++ b/porttime/ptmacosx_mach.c +@@ -12,6 +12,7 @@ + + #include "porttime.h" + #include "sys/time.h" ++#include "sys/qos.h" + #include "pthread.h" + + #ifndef NSEC_PER_MSEC diff --git a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff deleted file mode 100644 index 15ed874f172fb..0000000000000 --- a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4919b78..758eccb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,8 +36,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - --set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE) -- - PROJECT(portmidi) - - if(UNIX) -diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt -index cbeeade..f765430 100644 ---- a/pm_common/CMakeLists.txt -+++ b/pm_common/CMakeLists.txt -@@ -22,7 +22,7 @@ else(APPLE OR WIN32) - endif(APPLE OR WIN32) - - if(APPLE) -- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE -+ set(CMAKE_OSX_SYSROOT / CACHE - PATH "-isysroot parameter for compiler") - set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE - STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE) -@@ -54,10 +54,6 @@ if(UNIX) - - include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon) - set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks) -- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework") -- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework") -- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework") -- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework") - set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB} - ${COREMIDI_LIB} ${CORESERVICES_LIB} - CACHE INTERNAL "") -diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt -index f693dd6..1dc5cd6 100644 ---- a/pm_dylib/CMakeLists.txt -+++ b/pm_dylib/CMakeLists.txt -@@ -49,10 +49,6 @@ if(UNIX) - - include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon) - set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks) -- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework") -- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework") -- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework") -- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework") - set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB} - ${COREMIDI_LIB} ${CORESERVICES_LIB} - CACHE INTERNAL "") diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 57335fa3d9705..6a8baae5c9a27 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.11.4"; + version = "1.12"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-pXadPs2Dlht3BMNYDVxWZqnVv0umDgYVcqH5YVxr+uA="; + sha256 = "sha256-FLemG9T17n6l7vgb01OmO22BK59jv5uozVHeUnILEEQ="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 909903c2c34ce..5a747fd910633 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0yvxj7r9z890nfq5cadw7ys144c2mnvaplvx4v4ndv7238b741l8"; + sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index dd7719c8c838e..3f50c0665fa80 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.28.2"; + version = "6.29.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0T/ANHTRzk0ymezRQbvJt6aL350Z004gcj4JapAyAnQ="; + sha256 = "sha256-O0nIPRKj0ZOEjynh7h9kM6V965hQKs+4GgIbN+Os0I4="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 13a326581117d..e2ed679d2128c 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { buildInputs = [ clang lld llvm ]; - cmakeBuildType = "Release"; - cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang" "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 3d4d4c21e5a1e..663d61494c76d 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,60 +1,77 @@ -{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 -, cudatoolkit_11_3, cudatoolkit_11_4 +# The following version combinations are supported: +# * cuDNN 7.4.2, cudatoolkit 10.0 +# * cuDNN 7.6.5, cudatoolkit 10.2 +# * cuDNN 8.1.1, cudatoolkit 11.0-11.2 +# * cuDNN 8.3.0, cudatoolkit 11.0-11.5 +{ callPackage +, cudatoolkit_10_0 +, cudatoolkit_10_2 +, cudatoolkit_11_0 +, cudatoolkit_11_1 +, cudatoolkit_11_2 +, cudatoolkit_11_3 +, cudatoolkit_11_4 +, cudatoolkit_11_5 }: let - generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + generic = args: callPackage (import ./generic.nix (removeAttrs args [ "cudatoolkit" ])) { inherit (args) cudatoolkit; }; - -in rec { - cudnn_cudatoolkit_10_0 = generic rec { +in +rec { + # cuDNN 7.x + # Still used by libtensorflow-bin. It should be upgraded at some point. + cudnn_7_4_cudatoolkit_10_0 = generic rec { version = "7.4.2"; cudatoolkit = cudatoolkit_10_0; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.4.2.24.tgz"; sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf"; }; - cudnn_cudatoolkit_10_1 = generic rec { - version = "7.6.3"; - cudatoolkit = cudatoolkit_10_1; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.3.30.tgz"; - sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m"; - }; - - cudnn_cudatoolkit_10_2 = generic rec { + # The `cudnn` alias still points to this in all-packages.nix. It should be + # upgraded at some point. + cudnn_7_6_cudatoolkit_10_2 = generic rec { version = "7.6.5"; cudatoolkit = cudatoolkit_10_2; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz"; sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0"; }; - cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; + cudnn_7_6_cudatoolkit_10 = cudnn_7_6_cudatoolkit_10_2; - cudnn_cudatoolkit_11_0 = generic rec { + # cuDNN 8.x + # cuDNN 8.1 is still used by tensorflow at the time of writing (2022-02-17). + # See https://github.com/NixOS/nixpkgs/pull/158218 for more info. + cudnn_8_1_cudatoolkit_11_0 = generic rec { version = "8.1.1"; cudatoolkit = cudatoolkit_11_0; - # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: - # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions + # 8.1.0 is compatible with CUDA 11.0-11.2: + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html srcName = "cudnn-11.2-linux-x64-v8.1.1.33.tgz"; hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; }; + cudnn_8_1_cudatoolkit_11_1 = cudnn_8_1_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_1; }; + cudnn_8_1_cudatoolkit_11_2 = cudnn_8_1_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_2; }; + cudnn_8_1_cudatoolkit_11 = cudnn_8_1_cudatoolkit_11_2; - cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_1; - }; - - cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_2; - }; - - cudnn_cudatoolkit_11_3 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_3; - }; - - cudnn_cudatoolkit_11_4 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_4; + # cuDNN 8.3 is necessary for the latest jaxlib, esp. jaxlib-bin. See + # https://github.com/google/jax/discussions/9455 for more info. + cudnn_8_3_cudatoolkit_11_0 = generic rec { + # 8.3.0 is the last version to respect the folder structure that generic.nix + # expects. Later versions have files in a subdirectory `local_installers`. + # See eg https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.1/. + version = "8.3.0"; + cudatoolkit = cudatoolkit_11_0; + # 8.3.0 is compatible with CUDA 11.0-11.5: + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-830/support-matrix/index.html + srcName = "cudnn-11.5-linux-x64-v8.3.0.98.tgz"; + hash = "sha256-RMb1rVyxL7dPoMmh58qvTwTXVa3xGi5bbJ5BfaN2srI="; }; - - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_4; + cudnn_8_3_cudatoolkit_11_1 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_1; }; + cudnn_8_3_cudatoolkit_11_2 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_2; }; + cudnn_8_3_cudatoolkit_11_3 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_3; }; + cudnn_8_3_cudatoolkit_11_4 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_4; }; + cudnn_8_3_cudatoolkit_11_5 = cudnn_8_3_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_5; }; + cudnn_8_3_cudatoolkit_11 = cudnn_8_3_cudatoolkit_11_5; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index f5a4fac1a908c..13fc0b6799702 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -35,12 +35,15 @@ stdenv.mkDerivation { nativeBuildInputs = [ addOpenGLRunpath ]; + # Some cuDNN libraries depend on things in cudatoolkit, eg. + # libcudnn_ops_infer.so.8 tries to load libcublas.so.11. So we need to patch + # cudatoolkit into RPATH. See also https://github.com/NixOS/nixpkgs/blob/88a2ad974692a5c3638fcdc2c772e5770f3f7b21/pkgs/development/python-modules/jaxlib/bin.nix#L78-L98. installPhase = '' runHook preInstall function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1 + patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc cudatoolkit.lib ]}:${cudatoolkit}/lib:\$ORIGIN/" $1 } for lib in lib64/lib*.so; do diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index b756109aa8fc8..cd9f06499de77 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.02r5"; - pname = "llibhomfly"; + pname = "libhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index da79f6d624993..41deec25d454e 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, cmake }: stdenv.mkDerivation rec { - name = "metis"; + pname = "metis"; version = "5.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 12eb03b6d63ff..d7800859d057a 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spice-protocol"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz"; - sha256 = "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr"; + sha256 = "sha256-BP+6YQ2f1EHPxH36oTXXAJbmCxBG0hGdjbL46g0X2RI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 92ecf3e494e18..cbe5e13a7007e 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "sha256-HTDOSgdWo9MWmKeXOkOHAJjgvihUAkSXoYTeMz9XXLI="; + sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 40ae88bf71bb8..c795d783894e9 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -5,10 +5,13 @@ , python3 , enableModTool ? true , removeReferencesTo +, fetchpatch }: stdenv.mkDerivation rec { pname = "volk"; + # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: + # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A version = "2.5.0"; src = fetchFromGitHub { @@ -19,6 +22,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index a46ed1adee7ce..4010ee684590b 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e598d2c864be6..077f881e722d6 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: +, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "vulkan-loader"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; + buildInputs = [ vulkan-headers ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; - cmakeFlags = [ - "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" - "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] + ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 0894457f98163..b5a16df21add6 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.5"; + version = "2.34.6"; outputs = [ "out" "dev" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-aJMGQ696R6OvBfRtZueEQiQzdT2rM10ygvMZqFpWKbQ="; + sha256 = "sha256-a8j9A0qtBDKiRZzk/H7iWtZaSSTGGL+Nk7UrDBqEwfY="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 9f9f330443c6d..ed70951441895 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,23 +8,25 @@ , setfile , rez , derez +, wxmac }: stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.7.3"; + version = "4.7.6"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "sha256-t8y4oq4p7ZMDELAkRVmoNguYRNG8spcW7MHnpdINN8g="; + hash = "sha256-QoICP66eluD5phYVi1iK8tg1FL04EQjY29/4n6SIz3s="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK sqlite ] - ++ lib.optionals stdenv.isDarwin [ Cocoa setfile rez derez ]; + buildInputs = [ sqlite ] + ++ lib.optionals (!stdenv.isDarwin) [ wxGTK ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez wxmac ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix index f8301ebb4880f..d32a9543cf206 100644 --- a/pkgs/development/nim-packages/build-nim-package/default.nix +++ b/pkgs/development/nim-packages/build-nim-package/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (attrs // { installPhase; meta = meta // { + platforms = meta.platforms or nim.meta.platforms; maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ]; }; }) diff --git a/pkgs/development/nim-packages/karax/default.nix b/pkgs/development/nim-packages/karax/default.nix index 35a5c78ee56a1..8e8f11b228a4e 100644 --- a/pkgs/development/nim-packages/karax/default.nix +++ b/pkgs/development/nim-packages/karax/default.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "karaxnim"; repo = "karax"; - rev = "1.1.2"; - sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j"; + rev = "fa4a2dc"; + sha256 = "0xl83jsfb9l8kb0nfan9h5y6v96iz4psng2fx06a0qmig4993408"; } diff --git a/pkgs/development/nim-packages/redpool/default.nix b/pkgs/development/nim-packages/redpool/default.nix index 6c4c8a8e193cb..76b222739caee 100644 --- a/pkgs/development/nim-packages/redpool/default.nix +++ b/pkgs/development/nim-packages/redpool/default.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "zedeus"; repo = "redpool"; - rev = "f880f49"; - sha256 = "01n73bpgfdz2a3qvcfxsq4a6gxbhabf2n5np1ilzgdqkzcd4jf9b"; + rev = "8b7c1db"; + sha256 = "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6"; } diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 4412f568508c7..0770f3a48d484 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,11 +2,12 @@ , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 -, version ? "1.13.7" +, version ? "1.14.1" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index 2e62669571483..0f3b5377fc519 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-stdcompat"; - version = "15"; + version = "18"; src = fetchurl { url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "1xcwb529m4lg9cbnxa9m3x2nnl9nxzz1x5lxpvdfflg4zxl6yx2y"; + sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 52ecac90b10b4..a93137f136b86 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.5"; + version = "3.19.6"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-vbiMD0En11VDJUGnEc5ww0AhQ12vkbTCm/pqF7wnywI="; + sha256 = "sha256-Y9g0A9pVjEVcITyaQsyAew6rraTPwZuevSsDD46c0DM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f347ed5cd1bfb..f00a75961b9c3 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -8,17 +8,21 @@ , haversine , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.15"; + version = "0.16"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3"; + hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_client" ]; + pythonImportsCheck = [ + "aio_geojson_client" + ]; meta = with lib; { description = "Python module for accessing GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index b42ba55bfa747..f3076160f9c61 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -7,17 +7,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.13"; + version = "0.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "v${version}"; - sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; + hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; }; propagatedBuildInputs = [ @@ -32,7 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + pythonImportsCheck = [ + "aio_geojson_geonetnz_quakes" + ]; meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 3cc46ae3afb97..3ba2b430801eb 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -8,17 +8,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.6"; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "v${version}"; - sha256 = "0n97kij2fprzajh57sy1z57kaqiil7pd5y67lq2hqm2cnvkar5ci"; + sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + pythonImportsCheck = [ + "aio_geojson_geonetnz_volcano" + ]; meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 792f91bc7f112..c790188ea2699 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -8,17 +8,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.4"; + version = "0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "v${version}"; - sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew="; + sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + pythonImportsCheck = [ + "aio_geojson_nsw_rfs_incidents" + ]; meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 2b40028721a7c..586cc6b74a827 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -15,14 +15,16 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.8"; + version = "0.9"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "v${version}"; - sha256 = "0447scp5n906p8kfzy0lwdq06f6hkq71r2zala6g3vr6b3kla6h8"; + sha256 = "sha256-cnOW9Ey6WdL2bAqPop5noETn12OeeKsMkWHKGmYCjJU="; }; propagatedBuildInputs = [ @@ -40,7 +42,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_georss_client" ]; + pythonImportsCheck = [ + "aio_georss_client" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 6b6d295f8b86e..ed8b0ce2a8131 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_georss_gdacs" ]; + pythonImportsCheck = [ + "aio_georss_gdacs" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 2b0061875b758..ece6d6140b3bf 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -3,15 +3,19 @@ , fetchPypi , aiohttp , asyncio-throttle +, pythonOlder }: buildPythonPackage rec { pname = "aiohue"; - version = "4.0.1"; + version = "4.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wPqEubd+vUpdj7tM0CTPkW5kV4qlF19T+djlGrtA5h8="; + hash = "sha256-bcSCYNJt9xYBMmuZYM6s+PWV0TAUFOn3ibHE0KRX+iw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asterisk-mbox/default.nix b/pkgs/development/python-modules/asterisk-mbox/default.nix new file mode 100644 index 0000000000000..0da70911a17c0 --- /dev/null +++ b/pkgs/development/python-modules/asterisk-mbox/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "asterisk-mbox"; + version = "0.5.0"; + + src = fetchPypi { + pname = "asterisk_mbox"; + inherit version; + sha256 = "0624f9ab85ce9c4d43655f8653e8539fa10c81b60fd7b94b1a15dce306c20888"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "asterisk_mbox" ]; + + meta = with lib; { + description = "The client side of a client/server to interact with Asterisk voicemail mailboxes"; + homepage = "https://github.com/PhracturedBlue/asterisk_mbox"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 224b8bec4015f..94a0044d3ac47 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -4,16 +4,20 @@ , mock , pyjwt , pytestCheckHook +, pythonOlder , requests }: buildPythonPackage rec { pname = "auth0-python"; - version = "3.19.0"; + version = "3.20.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ed33557f252cf8b022b788ebd2b851c681979f200171498acde2b92d760db026"; + sha256 = "sha256-WIH2lMPehrqkXCh+JbEI5nf99nt61OwLhP/pF6BbsnQ="; }; propagatedBuildInputs = [ @@ -33,7 +37,9 @@ buildPythonPackage rec { "test_options_are_used_and_override" ]; - pythonImportsCheck = [ "auth0" ]; + pythonImportsCheck = [ + "auth0" + ]; meta = with lib; { description = "Auth0 Python SDK"; diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix index 9a2ca722a62bc..0bb5c09f4104a 100644 --- a/pkgs/development/python-modules/autopage/default.nix +++ b/pkgs/development/python-modules/autopage/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "autopage"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42"; + sha256 = "sha256-UwW0PMB5gXDXEk5aL+7Plp5F9KC691yzUROBFOr3a4M="; }; pythonImportsCheck = [ "autopage" ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 24de88aeca12a..c5565500a3212 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.11.0"; + version = "1.12.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "sha256-3zlEpPo35K9R3uyUUsvsCx45E93Ih9VVhdRhNwIvZ7k="; + sha256 = "sha256-3Of3E32+Txe2844pl0sWxj46EgaTG2aEfbAELlxIT/E="; }; # Package is not compatible with Python 3.5 diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 8e7d1b203097b..3038f8720e703 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "25.0.0"; + version = "26.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; + sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 0d3a4bfb2b33b..e65d454a35a58 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a848ac1d99c935e61dfb91ca3e1577904a3eff5820fce179eb6937df8e1019ec"; + sha256 = "sha256-gJncKsR1A6ntewOBH0nGhcjMjOkWJEPpWGN//qoEHyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index e889fff9688aa..42203a43da46d 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , nose +, pythonOlder }: let @@ -19,11 +20,14 @@ let in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.24"; + version = "0.3.30"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ="; + hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs="; }; # Nose is required during build process, so can not use `checkInputs`. diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 665fd6806bfa0..d4ced793f8304 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { - version = "2.3.4"; + version = "2.3.5"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA="; + sha256 = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o="; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 6f0370f044c64..e8e9962f9b4fd 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "833e01e9eaff4c01aa6e049bbc1e6acb9eca6ee513d7b35b5bf135d49705ad33"; + sha256 = "sha256-/pexD2ihx7VMDlS+rahOGPTvto3UDJBvuHSPURR0PsY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bme280spi/default.nix b/pkgs/development/python-modules/bme280spi/default.nix new file mode 100644 index 0000000000000..a7a1e0fb920ef --- /dev/null +++ b/pkgs/development/python-modules/bme280spi/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, spidev +}: + +buildPythonPackage rec { + pname = "bme280spi"; + version = "0.2.0"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "51682acefda6f29eaaf9f37815edbfdd48ef0e9f1509419eceafe7b440eddc6e"; + }; + + propagatedBuildInputs = [ + spidev + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Library for BME280 sensor through spidev"; + homepage = "https://github.com/Kuzj/bme280spi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index b56ebbf50a7e4..109487b88b948 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.2.1"; + version = "1.3.1"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; + sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 8cf820edbfec3..c88f6712f7967 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -1,22 +1,43 @@ -{ lib, - fetchPypi, - requests, - buildPythonPackage +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "braintree"; - version = "4.13.1"; + version = "4.14.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "4f6addf89f5cd6123243ddc89db325e50fceec825845901dad553fde115bd938"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = "braintree_python"; + rev = version; + hash = "sha256-qeqQX+qyy78sLe+46CA4D6VAxNHUVahS4LMYdGDzc2k="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ + "braintree" + ]; - # pypi release does not include tests - doCheck = false; + disabledTestPaths = [ + # Don't test integrations + "tests/integration" + ]; meta = with lib; { description = "Python library for integration with Braintree"; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 9d1324053b39d..976a8b60dfb3b 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "breathe"; - version = "4.32.0"; + version = "4.33.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "michaeljones"; repo = pname; rev = "v${version}"; - hash = "sha256-U85iLVS6bmA2Ty0AC4z2qODy9u4rWg6Nb42/k2Ix+kk="; + hash = "sha256-S4wxlxluRjwlRGCa5Os/J3EpdekI/CEPMWw6j/wlZbw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index f157f291f7fbf..ace2e2166d7ea 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -2,29 +2,36 @@ , buildPythonPackage , fetchPypi , pythonOlder -, six , webob }: buildPythonPackage rec { pname = "bugsnag"; - version = "4.1.1"; + version = "4.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "cdbdb3e02ef0c0655bb55be8b05ec1cb830b5ec629923ccb24bfd71dede3d1c3"; + hash = "sha256-NnTn4m9we40Ww2abP7mbz1CtdypZyN2GYBvj8zxhOpI="; }; - propagatedBuildInputs = [ six webob ]; + propagatedBuildInputs = [ + webob + ]; + + pythonImportsCheck = [ + "bugsnag" + ]; # no tests doCheck = false; meta = with lib; { - description = "Automatic error monitoring for django, flask, etc."; - homepage = "https://www.bugsnag.com"; + description = "Automatic error monitoring for Python applications"; + homepage = "https://github.com/bugsnag/bugsnag-python"; license = licenses.mit; - platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix new file mode 100644 index 0000000000000..3410789c21cc3 --- /dev/null +++ b/pkgs/development/python-modules/chispa/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchFromGitHub, lib, poetry-core, pyspark }: + +buildPythonPackage rec { + pname = "chispa"; + version = "0.8.3"; + format = "pyproject"; + + src = fetchFromGitHub { + repo = "chispa"; + owner = "MrPowers"; + rev = "v${version}"; + sha256 = "sha256-1ePx8VbU8pMd5EsZhFp6qyMptlUxpoCvJfuDm9xXOdc="; + }; + + checkInputs = [ pyspark ]; + + nativeBuildInputs = [ poetry-core ]; + + pythonImportsCheck = [ "chispa" ]; + + meta = with lib; { + homepage = "https://github.com/MrPowers/chispa"; + description = "PySpark test helper methods with beautiful error messages"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; +} diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 0eebbb449e1d2..39c5a497c8d8a 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "c68aac08d0d25853234a38fdbf1f33503849af3d5d677a4d0aacd42b0be6a4a1"; + sha256 = "sha256-BFruPzxkRxll161QfOhHSk4vIIFfu1QFp3D4WWoqAKA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 0f171e2643978..d75df29421d30 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "concurrent-log-handler"; - version = "0.9.19"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - hash = "sha256-sS95q+0/lBIcJc6cJM21fYiSguxv9h9VNasgaNw31Ak="; + hash = "sha256-n6KtYUdKE3tWQnAr0z8hgVWYqsuh51E5s3zrLO3aj58="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 465bee6664dfa..a077b828264cf 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.11.1"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zalando"; repo = pname; rev = version; - sha256 = "sha256-m/r09VNp/AMssOJH9RKMhPcObGHl9uIAoS1PwrjpKaE="; + sha256 = "sha256-kFNKRWl/Q8vxIELQURfzCRbVs2JYUwbKro/zKlzNcHU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index c36e353e3bf21..e19255c4479df 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.14"; + version = "0.0.15"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "041sx7ph8vfx8ivvm6hjj6s83p9lni2agwyrrncqwhcbjy9pbdf1"; + sha256 = "sha256-i2Lf7YQ9Ht4AlmfIBvJTWNPgEk8Kv92rs5VxuPgvR5U="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index ed8f127ff2745..1b122f9b5e414 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.2.0"; + version = "1.3.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-CUQi9q657WRnFDk1A/o4iv5PhG4RDhmX/qV5TiCFwtc="; + hash = "sha256-MWk2WRaDS+ZUwsrFfqFNcQ50L464pfzoBPbOVI2oC/I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 5fcdd02aa8fbb..004d42a81df39 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qEHB90xzettkX/9ojCQ8AZYnTJaL+8n87SmlBOBSDWQ="; + sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index e85bdd7868c90..518d2066853ad 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; + hash = "sha256-NOXK1UCQzqvJRfzsgIfpihuD9oF52sMD+BxqUHWF8Rk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index df3d78394605d..1915b64aca801 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "debtcollector"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c7a9fac814ab5904e23905516b18356cc907e7d27c05da58d37103f001967846"; + sha256 = "sha256-G8A+LZAX3kgMQc8+Wg2MyV8bDI8TOSgbTsqKIqz3aiM="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index d519aa76c8b1b..5655e18bae10f 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "diceware"; - version = "0.9.6"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; + sha256 = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 457e9d3e530bd..a51ec5303cd2e 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi, buildPythonPackage, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.0"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; + hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY="; }; - propagatedBuildInputs = [ six ]; + pythonImportsCheck = [ + "dict2xml" + ]; meta = with lib; { - description = "Super simple library to convert a Python dictionary into an xml string"; + description = "Library to convert a Python dictionary into an XML string"; homepage = "https://github.com/delfick/python-dict2xml"; license = licenses.mit; maintainers = with maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index c1d26bac0f450..c7c66fceaa7cd 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "doit"; - version = "0.34.1"; + version = "0.34.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "49467c1bf8850a292e5fd0254ee1b219f6fd8202a0d3d4bf33af3c2dfb58d688"; + sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM="; }; propagatedBuildInputs = [ cloudpickle ] diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix new file mode 100644 index 0000000000000..dafbcfc2f5cd0 --- /dev/null +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asynctest +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dynalite-devices"; + version = "0.1.46"; + + src = fetchFromGitHub { + owner = "ziv1234"; + repo = "python-dynalite-devices"; + rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 + hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo="; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "dynalite_devices_lib" ]; + + meta = with lib; { + description = "An unofficial Dynalite DyNET interface creating devices"; + homepage = "https://github.com/ziv1234/python-dynalite-devices"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix new file mode 100644 index 0000000000000..2aee132e294fc --- /dev/null +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -0,0 +1,53 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, libjpeg +, numba +, opencv4 +, pandas +, pkgconfig +, pytorch-pfn-extras +, terminaltables +, tqdm +}: + +buildPythonPackage rec { + pname = "ffcv"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "libffcv"; + repo = pname; + # See https://github.com/libffcv/ffcv/issues/158. + rev = "131d56235eca3f1497bb84eeaec82c3434ef25d8"; + sha256 = "0f7q2x48lknnf98mqaa35my05qwvdgv0h8l9lpagdw6yhx0a6p2x"; + }; + + # See https://github.com/libffcv/ffcv/issues/159. + postPatch = '' + substituteInPlace setup.py \ + --replace "'assertpy'," "" \ + --replace "'fastargs'," "" \ + --replace "'imgcat'," "" \ + --replace "'matplotlib'," "" \ + --replace "'psutil'," "" \ + --replace "'sklearn'," "" \ + --replace "'webdataset'," "" + ''; + + buildInputs = [ libjpeg pkgconfig ]; + propagatedBuildInputs = [ opencv4 numba pandas pytorch-pfn-extras terminaltables tqdm ]; + + # `ffcv._libffcv*.so` cannot be loaded in the nix build environment for some + # reason. See https://github.com/NixOS/nixpkgs/pull/160441#issuecomment-1045204722. + doCheck = false; + + pythonImportsCheck = [ "ffcv" ]; + + meta = with lib; { + description = "FFCV: Fast Forward Computer Vision"; + homepage = "https://ffcv.io"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 875de68facdc0..dd517a2f547ed 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.1.2"; + version = "2022.2.14.1"; format = "wheel"; disable = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-lYAWv+E4fB6N31udcWlracTqpc2K/JSSq/sAirotMAw="; + sha256 = "sha256-18uBJgNGNyEjMjUOyEkMuVcy02UGsCQxiljO4ufeD9o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 37cd3629db4fe..180624ea8168e 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.2.1"; + version = "4.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X3onSr8PN3D24lMtKG2Y/RiKbD1qSq2n0YVO8Y5H5K4="; + sha256 = "sha256-KswYue892Mlpa8wnPf9bt8MEJGtjGaMjlDt0TXGoEdE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdtoolkit/default.nix b/pkgs/development/python-modules/gdtoolkit/default.nix new file mode 100644 index 0000000000000..5323e12e4c557 --- /dev/null +++ b/pkgs/development/python-modules/gdtoolkit/default.nix @@ -0,0 +1,46 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, lark, docopt, pyyaml, setuptools }: + +let lark080 = lark.overrideAttrs (old: rec { + # gdtoolkit needs exactly this lark version + version = "0.8.0"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "lark"; + rev = version; + sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4="; + }; +}); + +in +buildPythonPackage rec { + pname = "gdtoolkit"; + version = "3.3.1"; + + propagatedBuildInputs = [ + lark080 + docopt + pyyaml + setuptools + ]; + + # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) + src = fetchFromGitHub { + owner = "Scony"; + repo = "godot-gdscript-toolkit"; + rev = version; + sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; + }; + + disabled = pythonOlder "3.7"; + + # Tests cannot be run because they need network to install additional dependencies using pip and tox + doCheck = false; + pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; + + meta = with lib; { + description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; + homepage = "https://github.com/Scony/godot-gdscript-toolkit"; + license = licenses.mit; + maintainers = with maintainers; [ shiryel ]; + }; +} diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix new file mode 100644 index 0000000000000..019c1e1a21bce --- /dev/null +++ b/pkgs/development/python-modules/geniushub-client/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +}: + +buildPythonPackage rec { + pname = "geniushub-client"; + version = "0.6.30"; + + src = fetchPypi { + inherit pname version; + sha256 = "390932b6e5051e221d104b2683d9deb6e352172c4ec4eeede0954bf2f9680211"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # tests only implemented after 0.6.30 + doCheck = false; + + pythonImportsCheck = [ "geniushubclient" ]; + + meta = with lib; { + description = "Aiohttp-based client for Genius Hub systems"; + homepage = "https://github.com/zxdavb/geniushub-client"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 2e5fc5da9e83e..09365ff585860 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.14"; + version = "0.15"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; + sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_client" ]; + pythonImportsCheck = [ + "georss_client" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index e87c766c0caf0..ae923138d2959 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.4"; + version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; + hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ign_sismologia_client" ]; + pythonImportsCheck = [ + "georss_ign_sismologia_client" + ]; meta = with lib; { description = "Python library for accessing the IGN Sismologia GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index dc253dafe1e2f..512db4d8deeec 100644 --- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ingv-centro-nazionale-terremoti-client"; - version = "0.5"; + version = "0.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; rev = "v${version}"; - sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0"; + sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ingv_centro_nazionale_terremoti_client" ]; + pythonImportsCheck = [ + "georss_ingv_centro_nazionale_terremoti_client" + ]; meta = with lib; { description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix index 089a72ef81121..344c74b057f40 100644 --- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-nrcan-earthquakes-client"; - version = "0.3"; + version = "0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-nrcan-earthquakes-client"; rev = "v${version}"; - sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l"; + hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_nrcan_earthquakes_client" ]; + pythonImportsCheck = [ + "georss_nrcan_earthquakes_client" + ]; meta = with lib; { description = "Python library for accessing Natural Resources Canada Earthquakes feed"; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index 954e4a6237fbc..e7ecd23b3c6e5 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "v${version}"; - sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; + hash = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_qld_bushfire_alert_client" ]; + pythonImportsCheck = [ + "georss_qld_bushfire_alert_client" + ]; meta = with lib; { description = "Python library for accessing Queensland Bushfire Alert feed"; diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index 5428dfcbc53a3..9328ac17aa5f1 100644 --- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-tfs-incidents-client"; version = "0.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; rev = "v${version}"; - sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m"; + hash = "sha256-9fDFm9GLXxy814wR75TjP3pfQPU+nCSV8Z509WXm24Y="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_tfs_incidents_client" ]; + pythonImportsCheck = [ + "georss_tfs_incidents_client" + ]; meta = with lib; { description = "Python library for accessing Tasmania Fire Service Incidents feed"; diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix index ec6a5cd5f2e39..ff6c3a13ea7e8 100644 --- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-wa-dfes-client"; version = "0.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-wa-dfes-client"; rev = "v${version}"; - sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7"; + hash = "sha256-R7so5EYsKGrOdEXVZ44A+kgTA3pIW6W/R4hzw+Yx0wU="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_wa_dfes_client" ]; + pythonImportsCheck = [ + "georss_wa_dfes_client" + ]; meta = with lib; { description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed"; diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix index 99a878700d7f9..e1ca84e218616 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -1,9 +1,9 @@ -{ buildPythonApplication +{ lib +, buildPythonApplication , click , fetchPypi , git , httpretty -, lib , qrcode , pygments , pyopenssl @@ -11,42 +11,53 @@ , requests , rollbar , stripe +, pythonOlder , sure }: buildPythonApplication rec { pname = "gigalixir"; version = "1.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; + hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "cryptography==" "cryptography>=" - ''; - propagatedBuildInputs = [ click - requests - stripe - rollbar pygments - qrcode pyopenssl + qrcode + requests + rollbar + stripe ]; checkInputs = [ + git httpretty - sure pytestCheckHook - git + sure + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "cryptography==" "cryptography>=" + ''; + + disabledTests = [ + # Test requires network access + "test_rollback_without_version" ]; - pythonImportsCheck = [ "gigalixir" ]; + pythonImportsCheck = [ + "gigalixir" + ]; meta = with lib; { description = "Gigalixir Command-Line Interface"; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index dc229b0da277a..98339c851cd42 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = version; - hash = "sha256-0TXBw2ZTZwPzuGnWda26MiK5V5oU85PoGAsn7uJw6fk="; + hash = "sha256-QdeEaOP+gPWMqtUofTwrHRqLBtjG8Kta0LfZtccTjCQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index d6dedff38e7bc..468b2476de9b5 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss="; + sha256 = "sha256-8zhjpnCWUXA7ixi2cJNRSDjHnysE0CqlASAwefJLgBg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 9249b949b6e66..c7fcb1a48ed18 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.3.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e"; + sha256 = "sha256-rRYPweqPGeMxoWoUp589ZD2BOmlTS6lhHSyA3BBDna0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 96a10e1a22212..1d5d1b9a68906 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.32.0"; + version = "2.34.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70="; + sha256 = "sha256-K3XhnlPIWSRBIBgMcqGqmehJFW48BBMHGkv7rgt0xTA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 555017bd48588..6ef36c17796d4 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R7HGbURhqOxPXUlKN3+mk5+qP6Em5HmxBAa7LHsjJJk="; + sha256 = "sha256-zqyLJX3ufjIpdiS7Qw85R6K/2p2m1KbYtmH2DH/r0nE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index bf1c37c4a3c4d..c99d5d0a8bff9 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.4"; + version = "2.10.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YQ7VahPxoAM87RNCkFOUmMrLdKs0uHJ4e0dFgA4twpY="; + sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index c8edb677c64bb..06c4d9e23696a 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "4a72a65586178daaacf6bbc4b718db0765b99a719fce88a95c2be4f82689b7c1"; + sha256 = "sha256-qvhZU7T2fHA2uRyXJjRxqeEAFwShH+TpGwICczgX7Sk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index be1ba4c48ab14..2c1e308af66cb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.33.0"; + version = "0.34.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-6EgdTVEvDeCwTEOL5JGXzRFh0U2GjC4KIiDGrHXOD5Y="; + sha256 = "sha256-S2zbm0S6LhQSRW6wFdbvqZdXHqIqLRSkqxVTQdIRGT4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 89d86ee4eb43f..18a5f0cd82aac 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.7"; + version = "1.14.8"; src = fetchPypi { inherit pname version; - sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f"; + sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 3600e173f9449..e45e6a85487a5 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { "httpx_socks" ]; + disabledTests = [ + # Tests don't work in the sandbox + "test_proxy" + "test_secure_proxy" + ]; + meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; homepage = "https://github.com/romis2012/httpx-socks"; diff --git a/pkgs/development/python-modules/i2csense/default.nix b/pkgs/development/python-modules/i2csense/default.nix new file mode 100644 index 0000000000000..475e77c218410 --- /dev/null +++ b/pkgs/development/python-modules/i2csense/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, smbus-cffi +}: + +buildPythonPackage rec { + pname = "i2csense"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f9c0a37d971e5b8a60c54982bd580cff84bf94fedc08c097e603a8e5609c33f"; + }; + + propagatedBuildInputs = [ + smbus-cffi + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "i2csense.bme280" + "i2csense.bh1750" + "i2csense.htu21d" + ]; + + meta = with lib; { + description = "A library to handle i2c sensors with the Raspberry Pi"; + homepage = "https://github.com/azogue/i2csense"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index b91835954b1c7..61b944b488369 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -14,6 +14,7 @@ , numpy , pandas , parsy +, poetry-core , pyarrow , pytest , pytest-mock @@ -49,7 +50,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; version = "2.1.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -60,6 +61,8 @@ buildPythonPackage rec { sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ atpublic cached-property @@ -77,7 +80,7 @@ buildPythonPackage rec { sqlalchemy tables toolz - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [ importlib-metadata ]; @@ -90,8 +93,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace "atpublic>=2.3,<3" "atpublic>=2.3" + substituteInPlace pyproject.toml \ + --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' + ''; + + preBuild = '' + # setup.py exists only for developer convenience and is automatically generated + rm setup.py ''; disabledTests = [ @@ -135,7 +143,7 @@ buildPythonPackage rec { done wait - + '' + lib.optionalString (lib.versionOlder version "3.0.0") '' export PYTEST_BACKENDS="${backendsString}" ''; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 28fed3bcb7887..81fd7c8a693a7 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "47e00e3f4e8477996e7dc420b6fa8ba53f8ced17de65320fedb5b15997b76589"; + sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 3437dd902bcd5..59de3b3f3ff05 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.50.2"; + version = "0.51.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ki38Kr+eDEIQPRuoQePR7dCRDSgq2ZLXws1pq2gtQrI="; + hash = "sha256-ZJen+hpNpeZjScD7aqdaW796KRlJ8K1JBXPOagpceXk="; }; checkInputs = [ @@ -25,9 +25,10 @@ buildPythonPackage rec { disabledTests = [ # tests require a network connection "test_action" - "test_folders" - "test_connection" "test_attributes" + "test_connection" + "test_folders" + "test_idle" "test_live" ]; diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index b1438f29a017f..12cf40a6764e0 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,14 +16,16 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.7"; + version = "1.8"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-Ih2l6bGM7i5TUkzJPkgx8EOOL4a3/qE28SUZS6M4sQc="; + hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index c80629960d33f..c91b6e4852268 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jax"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "${pname}-v${version}"; - sha256 = "0ndpngx5k6lf6jqjck82bbp0gs943z0wh7vs9gwbyk2bw0da7w72"; + sha256 = "0bpqmyc4hg25i8cfnrx3y2bwgp6h5rri2a1q9i8gb6r0id97zvcn"; }; patches = [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 6e70b24f67da7..3504c6bf32043 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -97,7 +97,8 @@ buildPythonPackage rec { done ''; - # pip dependencies and optionally cudatoolkit. + # pip dependencies and optionally cudatoolkit. Note that cudatoolkit is + # necessary since jaxlib looks for "ptxas" in $PATH. propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11; pythonImportsCheck = [ "jaxlib" ]; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index c78d5c7baeea9..23146a4f5a7ce 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.11"; + version = "4.1.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PmPl2P72K9VYby+Kkt4LOGXYPt7nhu43LEmuv4ha1yA="; + hash = "sha256-AqpT2Mqo5bjmKsu6WzVw/+AUOaSwlDfmXO0ufB6uc8A="; }; # Module has no tests diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index ad717e9d0c8f8..1b452850161b9 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "b150ad5fe4260539b4ef184657e552ef81307fbbe60ae1f258bc814549ea90f8"; + sha256 = "sha256-5wPXjIimcau4FwNRZEhQAV2bv6sxUwo7QNEkgaZ3mhE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index deb47b0b6660f..0af337bc13ff9 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.83"; + version = "1.2.85"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-QOTRmr7x4vB8shyxSNt6HX9+JnQ9vODGSR9aVQu+WSM="; + sha256 = "sha256-DFRnyWBQ3/g5NwZH5hoVYJfj3gN/UP57JvNSnNaqws4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 2ea41e61541bc..b8399bebef469 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mwparserfromhell"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "1ad779f1bc0808d280ec1026c9de74f424de535568e21debd12830b5b0fa097e"; + sha256 = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/net2grid/default.nix b/pkgs/development/python-modules/net2grid/default.nix index 47e41b8b7aa71..05b5321a69cfa 100644 --- a/pkgs/development/python-modules/net2grid/default.nix +++ b/pkgs/development/python-modules/net2grid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "net2grid"; - version = "2.0.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-net2grid"; rev = "v${version}"; - hash = "sha256-2hjWQaktx7XUS7gf7A+9QNSZSujyVZUka/SwEnEu2dg="; + hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 73819188c49c3..d4d9cf1811e04 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,40 +1,59 @@ { lib +, aiohttp +, appdirs , buildPythonPackage +, docutils , fetchFromGitHub -, pythonOlder +, flaky +, installShellFiles +, packaging +, pycurl +, pytest-asyncio +, pytest-httpbin , pytestCheckHook +, pythonOlder , setuptools -, packaging -, tomli , structlog -, appdirs -, pytest-asyncio -, flaky +, tomli , tornado -, pycurl -, aiohttp -, pytest-httpbin -, docutils -, installShellFiles }: buildPythonPackage rec { pname = "nvchecker"; - version = "2.6.1"; + version = "2.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lfo/VzsklEbv/kiKV5GbzvycwekqykRLrZBhehC1MjY="; + hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A="; }; - nativeBuildInputs = [ installShellFiles docutils ]; - propagatedBuildInputs = [ setuptools packaging tomli structlog appdirs tornado pycurl aiohttp ]; - checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; + nativeBuildInputs = [ + docutils + installShellFiles + ]; - disabled = pythonOlder "3.7"; + propagatedBuildInputs = [ + aiohttp + appdirs + packaging + pycurl + setuptools + structlog + tomli + tornado + ]; + + checkInputs = [ + flaky + pytest-asyncio + pytest-httpbin + pytestCheckHook + ]; postBuild = '' patchShebangs docs/myrst2man.py @@ -45,7 +64,13 @@ buildPythonPackage rec { installManPage docs/_build/man/nvchecker.1 ''; - pytestFlagsArray = [ "-m 'not needs_net'" ]; + pythonImportsCheck = [ + "nvchecker" + ]; + + pytestFlagsArray = [ + "-m 'not needs_net'" + ]; meta = with lib; { homepage = "https://github.com/lilydjwg/nvchecker"; diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix new file mode 100644 index 0000000000000..5e9a86acc6bdd --- /dev/null +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, pythonOlder +, zeep +}: + +buildPythonPackage rec { + pname = "onvif-zeep-async"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM="; + }; + + propagatedBuildInputs = [ + httpx + zeep + ]; + + pythonImportsCheck = [ + "onvif" + ]; + + # Tests are not shipped + doCheck = false; + + meta = with lib; { + description = "ONVIF Client Implementation in Python"; + homepage = "https://github.com/hunterjm/python-onvif-zeep-async"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 98fc412869de5..d639f65672938 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -15,20 +15,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.6.6"; + version = "3.6.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - sha256 = "00s8pwvq830h2y77pwx1i2vfvnzisvp41qhzqcp1piyc3pwxfc13"; + sha256 = "1a55f1ipii7hg42bvsii053xczbgwwv8w6wgdb14qyirm5c9szd3"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0l1zvkr06kwclgxy1qz9fxa1gjrpf5nnx6hb12j4ymyyxpcmn8rz"; + sha256 = "1piy0b1gh56n8srzhyd1n971a6pqpgmwhr4v9a81wg0xkbva8gdk"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index fee9af147154e..d5b9b7cf88e82 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -1,37 +1,39 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core -, databases -, pydantic -, sqlalchemy -, asyncpg -, psycopg2 , aiomysql +, aiopg , aiosqlite +, asyncpg +, buildPythonPackage , cryptography -, orjson -, typing-extensions +, databases +, fastapi +, fetchFromGitHub , importlib-metadata -, aiopg , mysqlclient +, orjson +, poetry-core +, psycopg2 +, pydantic , pymysql -, pytestCheckHook , pytest-asyncio -, fastapi +, pytestCheckHook +, pythonOlder +, sqlalchemy +, typing-extensions }: buildPythonPackage rec { pname = "ormar"; - version = "0.10.23"; + version = "0.10.24"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "collerek"; repo = pname; rev = version; - sha256 = "sha256-ILJvJyd56lqlKq7+mUz26LvusYb5AOOfoA7OgNq2fT0="; + hash = "sha256-zKugeGDcYDI4VKspJPWeZCBubTqMxxfOVQCuF4pC49E="; }; nativeBuildInputs = [ @@ -39,16 +41,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - databases - pydantic - sqlalchemy - asyncpg - psycopg2 aiomysql aiosqlite + asyncpg cryptography - + databases orjson + psycopg2 + pydantic + sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata @@ -56,24 +57,35 @@ buildPythonPackage rec { checkInputs = [ aiomysql - aiosqlite aiopg + aiosqlite asyncpg - - psycopg2 + fastapi mysqlclient + psycopg2 pymysql - - pytestCheckHook pytest-asyncio - fastapi + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"' + ''; + + disabledTests = [ + # TypeError: Object of type bytes is not JSON serializable + "test_bulk_operations_with_json" ]; - pythonImportsCheck = [ "ormar" ]; + pythonImportsCheck = [ + "ormar" + ]; meta = with lib; { homepage = "https://github.com/collerek/ormar"; - description = "A simple async ORM with fastapi in mind and pydantic validation."; + description = "Async ORM with fastapi in mind and pydantic validation"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 560c8869b00f8..95c5e5d6a328e 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "osc-lib"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d6b530e3e50646840a6a5ef134e00f285cc4a04232c163f28585226ed40cc968"; + sha256 = "sha256-2PikUPqyoSlOCu+M3JolWhvMW1jhsvYJjjXm2x4T6dE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 125481d1e026e..f7e09692945a7 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "8.7.1"; + version = "8.8.0"; src = fetchPypi { pname = "oslo.config"; inherit version; - sha256 = "a0c346d778cdc8870ab945e438bea251b5f45fae05d6d99dfe4953cca2277b60"; + sha256 = "sha256-lpM9MBHa4VYIoRYWv7ANlH4i2jywm2/zfd11dqvUdkw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index e6b8d0d0c422a..e59258dda782e 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83"; + sha256 = "sha256-OqRy9DSu6LvMByUxK39AmqH6VLvBNJBBJM9JsOhrkRU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 35a3447243f5a..aeea9b742a930 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "4.12.1"; + version = "4.12.2"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-zzEhx2/jwpY+1WOo68PJ/TvDy6XUT76K7LVAfUMMMJI="; + sha256 = "sha256-Qf0sT/bS6No4qttaW/JCWKhlDg4KaYprI51IuOQXfDs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 7c94302c9489d..ba6fd3cb7f8e9 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.65"; + version = "2.1.66"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1LCTfspM/wdgDntJnjYh9nMHwIyrx4dJ64AXdSk2kl0="; + sha256 = "sha256-FYDudoCgxk2wkjPVXTnzHzCQRwtHmgJS+2mwoKbj3Ms="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix new file mode 100644 index 0000000000000..6f359d3bc9a70 --- /dev/null +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, poetry +, rich +, setuptools +}: + +buildPythonPackage rec { + version = "0.2.0"; + pname = "pipenv-poetry-migrate"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "yhino"; + repo = "pipenv-poetry-migrate"; + rev = "v${version}"; + hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM="; + }; + + propagatedBuildInputs = [ + poetry + rich + setuptools + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"' + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "This is simple migration script, migrate pipenv to poetry"; + homepage = "https://github.com/yhino/pipenv-poetry-migrate"; + license = licenses.asl20; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 3297dbc091bb8..03e3c255d3e38 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.16.2"; + version = "0.16.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "sha256-//0M5eNWJoviHWuZnHO6hCEP3g2dA8utJeoS5Lp0Hy8="; + sha256 = "sha256-qvzocaqWIkhSdVm4x/pUIVtNBC0D5FRFEkonH7F6Oaw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index abe7ce6982089..357ca815407fa 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.3.2"; + version = "2.4.0"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f"; + sha256 = "sha256-pkitdhuOonNwy1kVNQEizYB7gg0hk+1cnMKPFj32N/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index c47cdaa02b701..cfe63a34d85aa 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,24 @@ -{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: +{ lib +, stdenv +, buildPythonPackage +, python +, isPy3k +, arrow-cpp +, cffi +, cloudpickle +, cmake +, cython +, fsspec +, hypothesis +, numpy +, pandas +, pytestCheckHook +, pytest-lazy-fixture +, pkg-config +, scipy +, setuptools-scm +, six +}: let zero_or_one = cond: if cond then 1 else 0; @@ -15,21 +35,23 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkg-config setuptools-scm ]; - propagatedBuildInputs = [ numpy six ]; - checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; + propagatedBuildInputs = [ numpy six cloudpickle scipy fsspec cffi ]; + checkInputs = [ + hypothesis + pandas + pytestCheckHook + pytest-lazy-fixture + ]; PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_DATASET = zero_or_one true; PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; PYARROW_WITH_PARQUET = zero_or_one true; + PYARROW_WITH_HDFS = zero_or_one true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - - # This doesn't use setup hook to call cmake so we need to workaround #54606 - # ourselves - "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; ARROW_HOME = _arrow-cpp; @@ -51,9 +73,6 @@ buildPythonPackage rec { # enabled in nixpkgs. # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # Deselect a parquet dataset test because it erroneously fails to find the - # pyarrow._dataset module. - "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" @@ -61,12 +80,21 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preCheck = '' - mv pyarrow/tests tests - rm -rf pyarrow - mkdir pyarrow - mv tests pyarrow/tests + shopt -s extglob + rm -r pyarrow/!(tests) ''; + pythonImportsCheck = map (module: "pyarrow.${module}") [ + "compute" + "csv" + "dataset" + "flight" + "fs" + "hdfs" + "json" + "parquet" + ]; + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 320e6d51c7aca..5918c1feb751f 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.13.0"; + version = "0.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + hash = "sha256-hOe6BH8aSGJ7YeraiCsJ10mbeGbFGaR3Bt5fh6M8iWI="; }; propagatedBuildInputs = [ @@ -33,6 +33,9 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_cloudformation_actions" + "test_auxiliar_cast" + "test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built" + "test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index eb57096b9813c..fc930d0e11976 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycoin"; - version = "0.91.20210515"; + version = "0.92.20220213"; src = fetchPypi { inherit pname version; - sha256 = "d2231a8d11b2524c26472d08cf1b76569849ab44507495d0510165ae0af4858e"; + sha256 = "sha256-qb2jtb/bHJSmtnQbYTFgCgBY0OCsrxsWJ7SJFeEDytc="; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycritty/default.nix b/pkgs/development/python-modules/pycritty/default.nix index 3e5f24290257f..e02a69933f694 100644 --- a/pkgs/development/python-modules/pycritty/default.nix +++ b/pkgs/development/python-modules/pycritty/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pycritty"; - version = "0.3.5"; + version = "0.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1lrmd4a1ps3h9z0pndfjfrd2qa7v3abd6np75fd2q2ffsqv7ar6x"; + sha256 = "sha256-Lh2zAEJTyzI8dJTNuyaf7gzhySMpui+CF9qRiubwFhE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 1072a4e24422a..8ac9eeca2a83c 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,5 +1,7 @@ { lib , buildPythonPackage +, cython +, devtools , email_validator , fetchFromGitHub , pytest-mock @@ -7,7 +9,6 @@ , python-dotenv , pythonOlder , typing-extensions -, ujson }: buildPythonPackage rec { @@ -22,11 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM="; }; + nativeBuildInputs = [ + cython + ]; + propagatedBuildInputs = [ + devtools email_validator python-dotenv typing-extensions - ujson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index bf878fd5acbc2..581238c90ac67 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -3,15 +3,19 @@ , buildPythonPackage , fetchPypi , aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.14"; + version = "0.1.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg="; + sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY="; }; propagatedBuildInputs = [ @@ -21,7 +25,10 @@ buildPythonPackage rec { # Tests require credentials doCheck = false; - pythonImportsCheck = [ "pyeconet" ]; + + pythonImportsCheck = [ + "pyeconet" + ]; meta = with lib; { description = "Python interface to the EcoNet API"; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 6f8a9fa696870..b8b405a8ecf03 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - preCheck = '' + disabledTestPaths = [ # disable tests that require networking - rm test/test_repository.py - rm test/test_credentials.py - rm test/test_submodule.py - ''; + "test/test_repository.py" + "test/test_credentials.py" + "test/test_submodule.py" + ]; # Tests require certificates # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 @@ -44,11 +44,10 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 doCheck = false; - disabled = !isPy3k; - meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; homepage = "https://pypi.python.org/pypi/pygit2"; license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 3b6dd18665b58..51d5b8bce5ec9 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -28,11 +29,14 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/nficano/humps/pull/240 - substituteInPlace pyproject.toml \ - --replace 'version = "3.0.2"' 'version = "${version}"' - ''; + patches = [ + # Fix naming, https://github.com/nficano/humps/pull/246 + (fetchpatch { + name = "fix-naming.patch"; + url = "https://github.com/nficano/humps/commit/118f6bce785d170b10dd3afee467d26dcc8b425d.patch"; + sha256 = "sha256-oQxkLsihnHZlHiZEupwG9Dr1Ss1w+KjDsBtbEVDced4="; + }) + ]; pythonImportsCheck = [ "humps" diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index fbf1fbce7931c..0dc1c5be49c25 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,36 +1,36 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiofiles , aiohttp , async_generator +, buildPythonPackage +, fetchFromGitHub , pypubsub , pyserial , pyserial-asyncio -, pyyaml -, pytestCheckHook -, pythonOlder -, pytest-cov , pytest-asyncio , pytest-timeout +, pytestCheckHook +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.15"; + version = "1.0.16"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-bR+2885JdGoVHBIZQG8iF0OXsECew7m5N9vopKtGp3I="; + hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc="; }; propagatedBuildInputs = [ aiofiles aiohttp - async_generator pypubsub pyserial pyserial-asyncio @@ -38,13 +38,15 @@ buildPythonPackage rec { ]; checkInputs = [ + async_generator pytest-asyncio - pytest-cov pytest-timeout pytestCheckHook ]; - pythonImportsCheck = [ "pyinsteon" ]; + pythonImportsCheck = [ + "pyinsteon" + ]; meta = with lib; { description = "Python library to support Insteon home automation projects"; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix new file mode 100644 index 0000000000000..00380f341fcb4 --- /dev/null +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, attrs +, backoff +, boto3 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyhumps +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, warrant-lite +}: + +buildPythonPackage rec { + pname = "pyoverkiz"; + version = "1.3.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iMicknl"; + repo = "python-overkiz-api"; + rev = "v${version}"; + hash = "sha256-KxZYluXa15RojAyNe5hA8Yf/Q9/mVl+b0TrDGRE6iuM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + aiohttp + backoff + pyhumps + boto3 + warrant-lite + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyoverkiz" + ]; + + meta = with lib; { + description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs"; + homepage = "https://github.com/iMicknl/python-overkiz-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index ae297389bb158..724be70163abf 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.13"; + version = "0.7.14"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "sha256-Gbz+3Hq4yStlTI7UxB4NBZigUzZjSJFFcwdzWtbGnio="; + sha256 = "sha256-v8eCCbSnAmJUmHSNS+lz8JRhDFrqyxgAkgcZ2bzfOTg="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index ecc396d1b0fef..d645a068d291c 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.56.0"; + version = "4.57.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5"; + sha256 = "sha256-+Dcrv+esnthI74AFLK47sS2qI4sPvihuQlL54Zo32RM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 8e436b4eb7e5f..6425869243ef1 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-keycloak"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; rev = version; - sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo="; + sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 21f29efb28f3a..a2da2e4f4a761 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonApplication , fetchPypi +, installShellFiles , pbr +, openstackdocstheme , oslo-config , oslo-log , oslo-serialization @@ -9,6 +11,8 @@ , prettytable , requests , simplejson +, sphinx +, sphinxcontrib-programoutput , Babel , osc-lib , python-keystoneclient @@ -25,6 +29,13 @@ buildPythonApplication rec { sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; }; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + sphinxcontrib-programoutput + ]; + propagatedBuildInputs = [ pbr oslo-config @@ -40,6 +51,12 @@ buildPythonApplication rec { debtcollector ]; + postInstall = '' + export PATH=$out/bin:$PATH + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/python-manilaclient.1 + ''; + # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 0655d29f6af7f..35d11e981e4d6 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.5"; + version = "1.6"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f"; + sha256 = "sha256-GJzxqWv5/NhtADYPFa12qDzgiJuK6NHLD9srKZXlocg="; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index e11f5ff1eb536..49dc1589ad760 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index ba17dd81166d9..715bf164a4b32 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , poetry-core , aiohttp , async-upnp-client @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.13"; + version = "0.14"; format = "pyproject"; @@ -23,24 +22,9 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = version; - sha256 = "124w6vfn992845k09bjv352havk8pg590b135m37h1x1m7fmbpwa"; + hash = "sha256-yuCtz1B5bj3mWz4eP2GXzoaHuIQ47tIWn19jkZN54lw="; }; - patches = [ - # https://github.com/rytilahti/python-songpal/pull/90 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/rytilahti/python-songpal/commit/56b634790d94b2f9788d5af3d5cedff47f1e42c2.patch"; - sha256 = "0yc0mrb91ywk77nd4mxvyc0p2kjz2w1p395755a32ls30zw2bs27"; - }) - ]; - - postPatch = '' - # https://github.com/rytilahti/python-songpal/issues/91 - substituteInPlace pyproject.toml \ - --replace 'click = "^7"' 'click = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix new file mode 100644 index 0000000000000..46bd35b9cfb85 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -0,0 +1,55 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, numpy +, onnx +, pytestCheckHook +, pytorch +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pytorch-pfn-extras"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "pfnet"; + repo = pname; + rev = "v${version}"; + sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g"; + }; + + propagatedBuildInputs = [ numpy pytorch typing-extensions ]; + + checkInputs = [ onnx pytestCheckHook ]; + + pythonImportsCheck = [ "pytorch_pfn_extras" ]; + + disabledTestPaths = [ + # Requires optuna which is currently (2022-02-16) marked as broken. + "tests/pytorch_pfn_extras_tests/test_config_types.py" + + # Requires CUDA access which is not possible in the nix environment. + "tests/pytorch_pfn_extras_tests/cuda_tests/test_allocator.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_batchnorm.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_linear.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy.py" + "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py" + "tests/pytorch_pfn_extras_tests/runtime_tests/test_to.py" + "tests/pytorch_pfn_extras_tests/test_handler.py" + "tests/pytorch_pfn_extras_tests/test_logic.py" + "tests/pytorch_pfn_extras_tests/test_reporter.py" + "tests/pytorch_pfn_extras_tests/training_tests/test_trainer.py" + "tests/pytorch_pfn_extras_tests/utils_tests/test_checkpoint.py" + "tests/pytorch_pfn_extras_tests/utils_tests/test_comparer.py" + "tests/pytorch_pfn_extras_tests/utils_tests/test_new_comparer.py" + ]; + + meta = with lib; { + description = "Supplementary components to accelerate research and development in PyTorch"; + homepage = "https://github.com/pfnet/pytorch-pfn-extras"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 91dabf40e93dc..9bfb0ec1fb0cb 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.8"; + version = "0.5.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8VDneIfZ2o96fOdSRxDbbGg6rEsqdNTyfT7amnEYvBI="; + sha256 = "sha256-G895roPIa7XZUJ/kHBmBmggdWtdPvbdFk3gHaR/R2jU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 2798ff3153d9e..ba892f2228b18 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.13.2"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - hash = "sha256-TWjONAGUwcCaWiaCxgR1xV1R+Ouy7FvMUewZa3z1mBc="; + hash = "sha256-B8tcYcBtgPkT6REDC7vhHmfO/MjMRQgR3PkF0pfjbyk="; }; nativeBuildInputs = [ @@ -56,6 +56,8 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/ctalkington/python-rokuecp/issues/249 "test_resolve_hostname" + # Assertion issue + "test_guess_stream_format" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index e62581057d04c..61baf3724e1a1 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "713f117413bbd616a1a7da8f07db9adcd835ce73d8585fb469ea5b5785f92e4d"; + sha256 = "sha256-LQNJpUAIHdJGyBQeRWmfP4Y/LVOswISr0H0+OHox5cc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index bc02e81e2ba67..25b1773472fff 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.5"; + version = "1.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "farfar"; repo = pname; rev = version; - hash = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk="; + hash = "sha256-8ZqqNDLygHgtUzTgdb34+4BHuStXJXnl9fBfo0WSNZw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 6e498ebeaea81..fc241ce278ac6 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simplefix"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; rev = "v${version}"; - sha256 = "1qccb63w6swq7brp0zinkkngpazmb25r21adry5cq6nniqs5g5zx"; + sha256 = "sha256-GQHMotxNRuRv6zXhrD02T+aFgfYe3RnvUGADsBeSPbA="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 3c88cc9e7fad6..196d3641eeb44 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.14.1"; + version = "3.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-KhEfD8k7qQMfY2ErqApn1K1lhIJgBiVBjjWKL2DjNdg="; + sha256 = "sha256-ndJdf8BGYfJsLVWqp00YD4vndS3n24UBm06ibcVRMpY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index ac95384fb6ce8..0922f8c10d2b6 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -15,14 +15,16 @@ buildPythonPackage rec { pname = "soco"; - version = "0.26.2"; + version = "0.26.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-VOGdv3g11OzNeTlBwm8hRy6fThDKVKIlgQxR4b07y/8="; + hash = "sha256-tMW5SCsO1XMQdbasMw3qIMwj+Y6wTQHAmTZ+9r8Mffs="; }; propagatedBuildInputs = [ @@ -39,15 +41,17 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "soco" ]; + pythonImportsCheck = [ + "soco" + ]; passthru.updateScript = nix-update-script { attrPath = "python3Packages.${pname}"; }; meta = with lib; { + description = "CLI and library to control Sonos speakers"; homepage = "http://python-soco.com/"; - description = "A CLI and library to control Sonos speakers"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix new file mode 100644 index 0000000000000..676f72c3f14bd --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, sphinxcontrib-serializinghtml +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-programoutput"; + version = "0.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; + }; + + buildInputs = [ + sphinx + ]; + + # fails to import sphinxcontrib.serializinghtml + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + + meta = with lib; { + description = "Sphinx extension to include program output"; + homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; + license = licenses.bsd2; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 07a7fa04485f8..439f155491251 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.23"; + version = "3.24"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BNlOP/gWDERh4Rzth5zjeghHr7ozyAGeRJxoeE6baWY="; + sha256 = "sha256-0bkvh1L+HqyH5/GKaw4J+OPJ/yR882JgWI4vBH6v0lM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c808fe6acd2d9..5b1ff139ff9cb 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,20 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: buildPythonPackage rec { pname = "stripe"; - version = "2.65.0"; + version = "2.66.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6"; + hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests require network connectivity and there's no easy way to disable them doCheck = false; - pythonImportsCheck = [ "stripe" ]; + pythonImportsCheck = [ + "stripe" + ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index 592e083567a27..b61e998c3c9f3 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.28.0"; + version = "2.29.0"; src = fetchPypi { inherit pname version; - sha256 = "79a216498a842226f71e9dfbbce4dba4a5718cda9b2be92b6e0aa21df977f70d"; + sha256 = "sha256-sGHARvi1PAFajz82GAegDVpy6A98QEyMfrDHZjNtDGQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index df2c00ad7c0f9..b1fc4d128cfbf 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -1,26 +1,24 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, requests -, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 }: +, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 +, poetry-core }: buildPythonPackage rec { pname = "SwSpotify"; - version = "1.2.2"; + version = "1.2.3"; disabled = isPy27; + format = "pyproject"; src = fetchFromGitHub { owner = "SwagLyrics"; repo = "SwSpotify"; rev = "v${version}"; - sha256 = "sha256-571knnY8LegIbqyPeKUfl+d0suTWAMQHYLN7edKFNdI="; + sha256 = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY="; }; - propagatedBuildInputs = [ - requests flask flask-cors dbus-python - ]; + nativeBuildInputs = [ poetry-core ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'flask==2.0.1' 'flask' - ''; + propagatedBuildInputs = [ requests flask flask-cors ] + ++ lib.optionals stdenv.isLinux [ dbus-python ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index 0e7bcb303f30e..ae08cceab1ee5 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.6.1"; + version = "4.7.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "17m8g6xzwa0k8qb4k4p9hjcyv58gmxz1lkvr2ckc5csa0ydvv91a"; + sha256 = "sha256-cAIo/qdIOIpPt9vPan5oJfKtH2Gmrm03aLuAHpfUfLY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index efbb23fae0b48..7846525f65fd7 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.2"; + version = "2022.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-k8ljkdNjYMIXMF2HFTks+kdOX9dwHSawjT8dsK706Eg="; + hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index d0a192fcc57b5..c20723e8d6e25 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "jsonschema>=0.7,<4" "jsonschema" + sed -i "/--cov/d" pytest.ini + ''; + propagatedBuildInputs = [ jsonpatch jsonschema @@ -32,11 +38,10 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "jsonschema>=0.7,<4" "jsonschema" - sed -i "/--cov/d" pytest.ini - ''; + disabledTests = [ + # https://github.com/bcwaldon/warlock/issues/64 + "test_recursive_models" + ]; pythonImportsCheck = [ "warlock" diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix new file mode 100644 index 0000000000000..8ba7974494947 --- /dev/null +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, netifaces +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wsdiscovery"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andreikop"; + repo = "python-ws-discovery"; + rev = version; + hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk="; + }; + + propagatedBuildInputs = [ + click + netifaces + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "wsdiscovery" + ]; + + meta = with lib; { + description = "WS-Discovery implementation for Python"; + homepage = "https://github.com/andreikop/python-ws-discovery"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 89796500e04ee..71f8b2847e3be 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -13,29 +13,59 @@ , wxGTK , pillow , numpy +, libXinerama +, libSM +, libXxf86vm +, libXtst +, libGLU +, libGL +, xorgproto +, gst_all_1 +, libglvnd +, mesa +, webkitgtk +, autoPatchelfHook }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in buildPythonPackage rec { pname = "wxPython"; - version = "4.1.0"; + version = "4.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f"; + sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80"; }; # https://github.com/NixOS/nixpkgs/issues/75759 # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; + nativeBuildInputs = [ + which + doxygen + wxGTK.gtk + pkg-config + autoPatchelfHook + ]; buildInputs = [ wxGTK.gtk ncurses + libXinerama + libSM + libXxf86vm + libXtst + xorgproto + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libGLU + libGL + libglvnd + mesa + webkitgtk ]; propagatedBuildInputs = [ pillow numpy ]; @@ -44,22 +74,16 @@ buildPythonPackage rec { preConfigure = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' - substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"), ("appsvc", None) ]}' - - # https://github.com/wxWidgets/Phoenix/pull/1584 - # It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699 - substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \ - "os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()" ''; buildPhase = '' - ${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py + ${python.interpreter} build.py -v build_wx dox etg --nodoc sip build_py ''; installPhase = '' @@ -67,8 +91,6 @@ buildPythonPackage rec { wrapPythonPrograms ''; - passthru = { inherit wxGTK; }; - meta = with lib; { description = "Cross platform GUI toolkit for Python, Phoenix version"; homepage = "http://wxpython.org/"; diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index e9a8ae0323d04..1a8d561d5de25 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.7"; + version = "0.3.8"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "sha256-LcHXw4rZhQ942EhiGrRTf3MpT7G5OFSX8QbpxVjvTTo="; + sha256 = "sha256-CWL1uvmUGLaa2Ho0Ka4wTWstebhe1nQr9R821mweE60="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "yalesmartalarmclient" ]; + pythonImportsCheck = [ + "yalesmartalarmclient" + ]; meta = with lib; { description = "Python module to interface with Yale Smart Alarm Systems"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 6c9ff9f8789f5..6224a10ca7c23 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.845"; + version = "2.0.873"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-vF09H2fnMYWxUnadOCfLfAdcWNSVASLvHYLJIhD+Y/4="; + hash = "sha256-81gNvfaFqTEGReOP7LgcN5OLU3xeO62r/45b5lEEgow="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 33dc9267eaba5..8bf2ed7c04ec8 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.7.5"; + version = "2.8.0"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-qTLpvb0yPB0+hR0Kkb7d3APlwdkkn6uNM0A80nPmjB4="; + sha256 = "sha256-IcYD9o6rv1ti4IvTEEJ5iV1OdJP7cHN0vetrvabxeas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0b1b3dfb8ef83..36c8528570419 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.171.0"; + version = "0.172.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-g/i2ZeIzitL35x3QoL+Rng3M0AiYgsBQ8TQY35Jmboc="; + sha256 = "sha256-N3mP1dhul7Ljn278CJmge4IrVllQJsc73A3/7mTSU70="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index edad1f0dd9ee9..3752fa8e251db 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oclgrind"; - version = "19.10"; + version = "21.10"; src = fetchFromGitHub { owner = "jrprice"; repo = "oclgrind"; rev = "v${version}"; - sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn"; + sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 64ab4a315de11..da73737530ed7 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.41.0"; + version = "6.42.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k="; + sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; + license = with licenses; [ bsdOriginal asl20 ]; }; } diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a55a5f09b7d89..1bef8cd075869 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.6.0"; + version = "5.6.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw="; + sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g="; }; preBuild = '' @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString stdenv.isDarwin '' - for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib; do + for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib $out/lib/libr_anal.${version}.dylib; do install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $file done ''; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 5ea43e5555bc1..4c33ef57a47d0 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.6"; + version = "4.3.0"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; + sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index c71df0842cc13..87e7676da8991 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "1.1.5"; + version = "1.2.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-33NrUav+JljP4keivnVirP7uWojD91cPb+uvOyQDKqs="; + sha256 = "sha256-KIS2o2pLus5aohRYsabWRxZs4KfYM6PXSNp0JZhhlZk="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix new file mode 100644 index 0000000000000..8fe1dbaa4bea2 --- /dev/null +++ b/pkgs/development/tools/bingo/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, bingo }: + +buildGoModule rec { + pname = "bingo"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "bwplotka"; + repo = "bingo"; + rev = "v${version}"; + sha256 = "sha256-4D8YaA/AH1gIp5iwD7WEAdBl73sqwHpfOe7bnxVcRcw="; + }; + + vendorSha256 = "sha256-xrz9FpwZd+FboVVTWSqGHRguGwrwE9cSFEEtulzbfDQ="; + + patches = [ + # Do not execute `go` command when invoking `bingo version`. + ./version_go.patch + ]; + + postPatch = '' + rm get_e2e_test.go get_e2e_utils_test.go + ''; + + CGO_ENABLED = 0; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testVersion { + package = bingo; + command = "bingo version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules."; + homepage = "https://github.com/bwplotka/bingo"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/development/tools/bingo/version_go.patch b/pkgs/development/tools/bingo/version_go.patch new file mode 100644 index 0000000000000..2898326a0547b --- /dev/null +++ b/pkgs/development/tools/bingo/version_go.patch @@ -0,0 +1,17 @@ +diff --git a/main.go b/main.go +index 5600f7e..662ed1b 100644 +--- a/main.go ++++ b/main.go +@@ -201,10 +201,8 @@ func main() { + return pkgs.PrintTab(target, os.Stdout) + } + case "version": +- cmdFunc = func(ctx context.Context, r *runner.Runner) error { +- _, err := fmt.Fprintln(os.Stdout, version.Version) +- return err +- } ++ _, _ = fmt.Fprintln(os.Stdout, version.Version) ++ return + default: + exitOnUsageError(flags.Usage, "No such command", flags.Arg(0)) + } diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 67c132bd9e082..60d8d8f58b8cb 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,15 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.0.0-rc12"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UqyWQdlCDTSjW348f87W7g2kwB5nzIOviSE5/1T1soY="; + sha256 = "sha256-jJaob2eaozMFRsXwW6ulgM5De3UmpLZddTHwq6PnaeE="; }; - vendorSha256 = "sha256-qBgGZTok3G0Pgku76uiV9bZperhiSNoWSrzxrHe4QXw="; + + vendorSha256 = "sha256-wPnrkfv6pJB6tkZo2oeMbWHbF9njGh1ZEWu8tkHDhGo="; patches = [ # Skip a test that requires networking to be available to work. @@ -27,12 +28,15 @@ buildGoModule rec { ./skip_test_requiring_dotgit.patch ]; - nativeBuildInputs = [ protobuf installShellFiles ]; - # Required for TestGitCloner - checkInputs = [ git ]; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" ]; + checkInputs = [ + git # Required for TestGitCloner + protobuf # Required for buftesting.GetProtocFilePaths + ]; + preCheck = '' # The tests need access to some of the built utilities export PATH="$PATH:$GOPATH/bin" @@ -55,9 +59,9 @@ buildGoModule rec { # Completions installShellCompletion --cmd buf \ - --bash <($GOPATH/bin/buf bash-completion) \ - --fish <($GOPATH/bin/buf fish-completion) \ - --zsh <($GOPATH/bin/buf zsh-completion) + --bash <($GOPATH/bin/buf completion bash) \ + --fish <($GOPATH/bin/buf completion fish) \ + --zsh <($GOPATH/bin/buf completion zsh) # Man Pages mkdir man && $GOPATH/bin/buf manpages man diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 10d3dca84123a..11b25bec3816d 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.12"; + version = "1.4.13"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA=" - else if stdenv.isDarwin && stdenv.isx86_64 then "15m2rahf9kihw29hp6bwd9xqav6dcr17w5c2rsw0ijpchr2av72q" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-WJytRIbsygi4zoIVfkJmzWyFe2p8mQuT4DDO5KDKopY=" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e8da9733ae907..78376b639c44b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -3,7 +3,7 @@ rec { gen = - { version, nativeVersion, sha256, defaultJava ? jdk8 }: + { version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }: { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava , javaToolchains ? [ ], ncurses5, ncurses6 }: @@ -87,7 +87,7 @@ rec { changelog = "https://docs.gradle.org/${version}/release-notes.html"; downloadPage = "https://gradle.org/next-steps/?version=${version}"; license = licenses.asl20; - platforms = platforms.unix; + platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix; maintainers = with maintainers; [ lorenzleutgeb liff ]; }; }; @@ -100,6 +100,9 @@ rec { nativeVersion = "0.22-milestone-23"; sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc"; defaultJava = jdk17; + # Gradle 7 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; gradle_6 = gen { @@ -107,6 +110,9 @@ rec { nativeVersion = "0.22-milestone-20"; sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb"; defaultJava = jdk11; + # Gradle 6 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; # NOTE: No GitHub Release for the following versions. `update.sh` will not work. diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 3f52f6ca1ba21..759c9f6815930 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "031e092829365768db7f07cb676ef3642e24c1f4"; - version = "2021-10-21"; + rev = "8ccccd8a1d7efa097b7f30e0ec76e39b3aa0f3df"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "5e/tvRP6oqlstESY8NH752fujFcGZ9rF/rYW9ZFg0Gk="; + sha256 = "376yaucqzoe36VKaJmCz+5vQHc+KNQG4iamAdOb/YQU="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 979cbae99a206..8e8503227e88b 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.1.0"; + version = "0.1.1"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "sha256-YoMwtaif7q7Ht8fWRQRGeP03Pl5KTIUk8fGGKhelc68="; + sha256 = "sha256-wULC0/n0ZFdBXOjxVe/VYsdsGBorNd51HczCK20Pmwc="; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "sha256-YjMdhuo9hQCGtq1qYFKUY8S6nz8dpZt+PsngbF6r/C8="; + sha256 = "sha256-tXcg+FOm+Ig61/Jw9ibEp0sHeXI9tpt+ya3Z/yS7MCk="; }; }; in diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index ec3f4de5e11e3..ea6f866a48b12 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-Dl1ZTYzwZ3tl5k9uPnnKHObmTP6Xsw0P1LdPqCfd/d0="; + sha256 = "sha256-gBO+H26YGmOtP3CUHZjynAaOb0h+MJbJnWqxOZdif6w="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index d0e727d0af29b..b620fa20e4609 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; src = fetchFromGitHub { owner = "adafruit"; repo = pname; rev = version; - hash = "sha256-1UNruZgA7Z0G1t3GLffiA/p+gjPYBPpdn5QqQk6D/o0="; + hash = "sha256-qX3kSlqA2qP8+XiLYx/hKYfyeB6p3tnXEhESox0c/lY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index d293caaba6aee..fdc15a9256dda 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-07se1eMnyhnccaIMtNHv9NPFGqR+WWvIsmjwUGrsQSI="; + sha256 = "sha256-M9fJFdwNyNOolXFknzEPG7pNDVrqKv/WOQZUHmr8B84="; }; - vendorSha256 = "sha256-+LNLhUfWyLD9a0fj7M5OjR9CUMQ+XjOxNa5n3mn2X9U="; + vendorSha256 = "sha256-d6h0LK4zbrfkUum7FXHIP+hqBx5A0mQmvW5GOi+EMVQ="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 717a6d7c6951a..7c95565487d88 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE="; + hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 5175a02876018..0220e2d61f9df 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-pNcmIey50nWZghoXVGnm0EFzGoqBpAaJ2lhYvVzjWto="; + sha256 = "sha256-Xh6JLfk0xDqEBJiEG3WBKBEqad/O0D8aeJk5s5w8PTI="; }; nativeBuildInputs = [ makeWrapper unzip ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Universal SQL Client"; homepage = "http://squirrel-sql.sourceforge.net/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ khumba ]; }; diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 8d58e990ce2f7..b50d348d7dbb6 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "datree"; - version = "0.15.5"; + version = "0.15.16"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - sha256 = "sha256-u4bv9sKTeDX2VOG4hUUz0JpF6woGC4/44STij/tYi1I="; + sha256 = "sha256-FIFsx6iSirUY14cn6E7CPhZQKtcgnyZ2fYghrMUx3Lw="; }; vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 31174ea7a1af6..91ce1bb087197 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QLJB2WcnguknEMdgwJzltp++mJCL4cFOWU568aTk0sc="; + sha256 = "sha256-urls47jS9Vu64PC/Ie+UTDfg17krs+UegqKub1QaYK4="; }; vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 5b63f290226b9..cd324ae387d22 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-H+gIN3I0qC2UeBow2N6KjECFiroeZACvrS3vo8+H6jY="; + sha256 = "sha256-VXBDgBcByONEOznUVbzxySE7rcevIwCk8rVxRxhF0Gc="; }; vendorSha256 = "sha256-6lzusbfedDJESJIxsTVGoRnjdtPnMSDdL2OjXIFFL04="; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 2b07543b98640..df55b51a0adaa 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -73,43 +73,43 @@ rec { headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc"; }; - electron_14 = mkElectron "14.2.5" { - armv7l-linux = "d6f7e2fe6088f57ecd455035e0815c20dd1d84b4cbf669e5fa355b96f36eaf2e"; - aarch64-linux = "c8a1a7c5c04462bbe6e148587a72b002ab4bb90aecb9686546b22580c0f9fa52"; - x86_64-linux = "5820ea6c9cfe02096a75df43cab7cdfe5947d6d90207e98c563bd50c400f8110"; - i686-linux = "8099fc3b137e80c5e65493dea2cf3dfb923e86693f3b082429f6fd949560f540"; - x86_64-darwin = "258eb29426a5f275c49284be6818f856ffc29d04fa9cef6fafcdcd207092281d"; - aarch64-darwin = "38a19828c1d7ff5fb49c5db5a706482f4afbae9fecaedaf9ebea0a5765bf952d"; - headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8"; + electron_14 = mkElectron "14.2.6" { + armv7l-linux = "fd115652f491fff6a28bf39dc41e3c7f1b638e7dcc7856c33b6a97c7763ea9a3"; + aarch64-linux = "530df3030aeb2c0f67ba4bc210c0f0fe77670001d2ba30ad6858f74952528df2"; + x86_64-linux = "c3f91ced7e429079d43c182f47cea1eceef17ab65c390e15f9c6af56e58ed3d9"; + i686-linux = "d66881d0747c99618c500b46e044eb4e97442400624fbcf9a6af114743e6e8db"; + x86_64-darwin = "15db43c17a33bf9e31f66f5025e0810dfbd2b237f7645eda51409de7930cc9d1"; + aarch64-darwin = "a5f7b8cc5f6dfc7561368d2f09745967bb553a29a22ef74af8f795225483338a"; + headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8"; }; - electron_15 = mkElectron "15.3.6" { - armv7l-linux = "4c105be3dc38ea8899f9fe58c05dfbf20e0d43e9b35ca815c43329d17b714d36"; - aarch64-linux = "3d06de32f02e38039c3c9deb418e3b9dbcda30f387f27e54fb1f1be068b80989"; - x86_64-linux = "5a9a3e37e92ad67d2a4ebb5ac85cb817d682fe2ca0b37b924d7f40085d246cc9"; - i686-linux = "32ff47793c8123fa6220ff9e7c524e3b89c0411e94bdb4d9391038cc58449b5f"; - x86_64-darwin = "faff636a6deedc3b7a3c900aef187baaeec2b83ccc405c56e3ea18d68894b82c"; - aarch64-darwin = "ae7350a7daa6eb2d21fa001c38217bc46a3894f843962c5cca192b837cc9d81c"; - headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x"; + electron_15 = mkElectron "15.3.7" { + armv7l-linux = "1cc5ce2ab6d795271f54e67a78eec607c0a14761ee1177078a157abad7aa61e6"; + aarch64-linux = "caf7146c738207b78ea63e95fa055f36829bb360e2d81fce10513fae238f2750"; + x86_64-linux = "e424dded1ac545634128bfb5c6195807aa96b7761be95f52ed760886f42874cc"; + i686-linux = "9f1898f9c96672076a87ca559dd11788964347fd17316f0c24f75c9c53985ce5"; + x86_64-darwin = "282f8737fdc73a3ddc82f56b4affc9f6fefec1b233e532e08d206344b657cd8a"; + aarch64-darwin = "d64e12c680d60b535fea7de4322504db04a83e63e8557d8e9b3677a334911752"; + headers = "0nfk75r72p5dgz0rdyqfqjmlwn2wlgn7h93a1v5ghjpwn1rp89m7"; }; - electron_16 = mkElectron "16.0.8" { - armv7l-linux = "be3a598d5f7c677c11831b78a8a82d95132ea760bb643e526426b91fdf27aff7"; - aarch64-linux = "465cd93d69ea2e3273339d48bef58e7359b692da5535bff5882e803c22535ec5"; - x86_64-linux = "25767a94d4b0927616ed5008889cd65bb073c7005209671b34045f91d698c857"; - i686-linux = "1cedf35f501ea1512fe9ae5cae47a72e093b6eb7297f76b726551e4a33a593a5"; - x86_64-darwin = "a3c5e5368165304fc9392e3a5b59480965cf0f91f7d889257e6a622f48051cbf"; - aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a"; - headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4"; + electron_16 = mkElectron "16.0.9" { + armv7l-linux = "7071f18230f5d4bbf84d3f1955056f2a6952e5487dfdecb51708e419c0b1a594"; + aarch64-linux = "a7873d1cb2b632c9c48a6942bf4a436463c07cc488f4b0b4575e0e4a496c357d"; + x86_64-linux = "06d57bc1e59ebe046d5731d64eb67c41e793731e67aefbf33f4e3c23139285d4"; + i686-linux = "8603545bdaec512380050ce6f9f1ef283514b960c8d6c8682eaa6563d93705b2"; + x86_64-darwin = "d092af5e5fddb295e9ebb9b639006deec125b1f6b30896d22e98b84e5a74af40"; + aarch64-darwin = "62fd4d033fd0ad62d1c13ac219bd68e76b1625c305097c7aa2ab799f45c9e879"; + headers = "0d0jkjjfq32j09bjlpmx1hvi20rh8yfkfm7hfcv3xs831physbj5"; }; - electron_17 = mkElectron "17.0.0" { - armv7l-linux = "29b31c5e77d4d6d9e1a4340fdf08c28ae6698ea9e20d636cec8a59dc758815ef"; - aarch64-linux = "e7bf2ec09b8a7018ba417fc670a15594fb8f3e930626485f2423e9a89e2dcbd0"; - x86_64-linux = "dc74e28719a79f05dd741cda8c22c2bb164dec178c6d560af085910b37cf000b"; - i686-linux = "6f6fe5fa0452e871abe82dbd25d7cf92ab7011995b3b2b15d04d8691ddc9e9de"; - x86_64-darwin = "c35d81af3a3f156059a53436d7874a46770cbf6e4e5087f7caee269e66abb636"; - aarch64-darwin = "7dc5eabc7e582a031d5bd079eeadc9582f5605446085b4cbd1dc7e7c9e978c45"; - headers = "1i3sx1xy62i4f68zbsz1a7jgqw7shx0653w9fyvcdly2nraxldil"; + electron_17 = mkElectron "17.0.1" { + armv7l-linux = "0867f74427152c3b4110e11c9ce38e351531554868f62665b064f3d1dae5fd00"; + aarch64-linux = "7715f7eaaa287f83b945f491c2ca1eb0befed93725d81c85d06f8584db3a6cc4"; + x86_64-linux = "de789f548d6cc2ddff8db53b3bbfaac5631e90f14506935d2d7fafedf82e5adf"; + i686-linux = "4e81ce43552f22e271527d5f7ab84db6dda61c0922f8b6350e44fa52967f2dd9"; + x86_64-darwin = "d270858938e2f0e68479d91384e6f4d01be1d4e22b305dc2023ecd1a5e113d17"; + aarch64-darwin = "aecf14a88ede956e93fee5b48b773ad4d8d6605424c9d69a45950b673c89f8ca"; + headers = "1c3fl9fxmhkhvm825vmyxm8dm89xfy4iwqrb4ifmv5cz9dh9b9a8"; }; } diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 58f7de000bec7..82e69c2d91eef 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.21"; + version = "0.14.23"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-O+S8oj9gthrJ+OXSP5b/RRczLuRVFsA3u26ii2bcagk="; + sha256 = "sha256-7J8l4PCXDSddlUdMYaTo3KQjhUl1IRpks0iMiYxJzD4="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 14667191b2efd..c83966c7d6d3d 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.30.1"; + version = "1.31.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gazpjsGC5qEVeSqN+SleWWmr44CxJAJGqRNoQB38hjI="; + sha256 = "sha256-8A6MKDeyuk0bzyoDydcOy4LzyYe/S+x+ZJMTOo59UA8="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-mgBi0O7sqS0XtNM++S6fDjDoJSFVCr0wWYfzkAdQspw="; + cargoSha256 = "sha256-oiGYkRqxN6e5EG6EDQalIK0tOekyIVQ+GhxCKK0Sd3g="; doCheck = false; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 715c237f494b2..f0e125245efa5 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.13"; + version = "3.14.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-apX4MFzeR7+5gWauw5HXPK0c7N4uTSqkE2vqnYB5LJs="; + sha256 = "sha256-1ie/pkg0pv8bJphQ8PXceRd2WALYaVxBAW1O/s4kKHA="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-4Ak+mh9ege38iO1QyxvGkYvRyU11QjphfLrit1qfu58="; + vendorSha256 = "sha256-vWqj2fRtaDextDstIb5GrdRn4nxQpCfjegYiVbPILuM="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index e0d8149c40d5a..6719d71039211 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-/VJ1r1t/V2YkZGJUrJR3S6NPVP6EADIH9E6jmki8QRI="; + sha256 = "sha256-q+m1NDl9zd6ueyBTzbzlvHIQyoIul5dAfUQ6UK4wlrc="; }; vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI="; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 122b4e0831eb3..6334c00fc0bbc 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.44.0"; + version = "1.44.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-2hEru7fnc8v7F/RrOB3jFdfLPYLpm0OupzJP6iORs+U="; + sha256 = "sha256-RMZZLvCJcTMzHOzUfT6aEC21T5dCwu1YOUuQ9PLS3fc="; }; - vendorSha256 = "sha256-DLvhkTYCaXfNfehEgCNKSKlKaGHo623wBnEhNeTJbmQ="; + vendorSha256 = "sha256-X2hZ4BQgYHI1mx/Ywky0oo7IMtrppu+rLq2LRLPH3fY="; doCheck = false; diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index 563002e9fcb95..1bb45925ed02a 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "A command-line pager for JSON data"; homepage = "https://github.com/PaulJuliusMartinez/jless"; license = licenses.mit; - maintainers = with maintainers; [ jfchevrette ]; + maintainers = with maintainers; [ jfchevrette zowoq ]; }; } diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 69ba88905ffa7..59b61135fae66 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-QQ0qRzbbH6lGjW50T67dXU7MLnEw3C9dcJ6ZlnSeh/U="; + sha256 = "sha256-9lC3vegfxEACoX25ebcLQU453IYy1zQf1K84YyLEnlU="; }; - cargoSha256 = "sha256-ZTfaRU1f0K/wprbDxba07cesgP70ZGR1xwwuyhdtTKw="; + cargoSha256 = "sha256-cTAbAnSqvrc6e9NtbiV7caj1JnQReWMUhCQoFXZ7Nbs="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index ab206a090bb12..a7562429db59d 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cIrlhhk5Lt0Qt7q7rKw8EXrJqZWZEjrEUyHOvHiT6bs="; + sha256 = "sha256-Xhe5WNHQ+Oa1m/6VwC3zCwWzXRc1spSfPp4jySsOcuU="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 21ab6ddf188f7..73fdb3dff8f28 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.43.2"; + version = "0.44.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-HXTkYwN6U8xyxgFnj69nLSpbDCqWUWeSuqlZbquRD6o="; + sha256 = "1l2pmvqw8rjl2xmsdp31j8015clshab6p81i3i05h40rjjz57mvr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 5eb03edd6d02e..1902d9e969c10 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.32.2"; + version = "0.33"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tawsBfHz6gq8va9YLtCwp9Ec8EWcvhdbYwdVtvvtJeY="; + sha256 = "sha256-ltkBzhlxgNzioSBnlkBu9UtBHZlxFtnYlUhg/+lV0gc="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 25ab4ceab5f58..ed1b80787c4ec 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jakedeichert"; repo = pname; rev = "v${version}"; - sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + sha256 = "sha256-qRN9M/DxkxcF1/dmYqmf3qB8yHzuaN3LRENy1ehgg0c="; }; - cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + cargoSha256 = "sha256-7ts63n9aGtaK8INBh11TShOQCVpV+82VADmNbKURv+g="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 0163b616f14bc..a52a2a141c39a 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,15 +2,19 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ekwucff12FIjaZ8qDvonhTdz7+DRpPLMGz2yqaCy+Bc="; + sha256 = "sha256-PsTQuEbo1ReWwZV4D14mEGsU99j49kleiL/6Xyk+g9s="; }; + ldflags = [ + "-X github.com/equinix/metal-cli/cmd.Version=${version}" + ]; + vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; doCheck = false; diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/development/tools/nodenv/default.nix new file mode 100644 index 0000000000000..d1e38d7bda744 --- /dev/null +++ b/pkgs/development/tools/nodenv/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "nodenv"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "nodenv"; + repo = "nodenv"; + rev = "v${version}"; + sha256 = "0fgc23jd95rjll3dy5hnli8ksfc7rwscw53sdgss4yaharwlg8l2"; + }; + + buildPhase = '' + runHook preBuild + + bash src/configure + make -C src + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r libexec $out/ + cp -r bin $out/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Manage multiple NodeJS versions"; + homepage = "https://github.com/nodenv/nodenv/"; + changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ alexnortung ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix new file mode 100644 index 0000000000000..59ea9c43512f6 --- /dev/null +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, ocaml, findlib, darwin }: + +if lib.versionOlder ocaml.version "4.08" +then throw "dune 3 is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + pname = "dune"; + version = "3.0.2"; + + src = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; + sha256 = "sha256-o108qIeWMOX0VU/wWdc5bg/UDCT2CCcw/Xx3nFiDbes="; + }; + + nativeBuildInputs = [ ocaml findlib ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + strictDeps = true; + + buildFlags = "release"; + + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; + + installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + + meta = { + homepage = "https://dune.build/"; + description = "A composable build system"; + changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; + maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + license = lib.licenses.mit; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 74341c0a7b492..4acf2264fc9c5 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, python3 +}: + stdenv.mkDerivation rec { pname = "omniorb"; - - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; + hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; }; - buildInputs = [ python2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ python3 ]; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with lib; { - description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; + description = "A robust high performance CORBA ORB for C++ and Python"; + longDescription = '' + omniORB is a robust high performance CORBA ORB for C++ and Python. + It is freely available under the terms of the GNU Lesser General Public License + (for the libraries),and GNU General Public License (for the tools). + omniORB is largely CORBA 2.6 compliant. + ''; homepage = "http://omniorb.sourceforge.net/"; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix new file mode 100644 index 0000000000000..f0b66467c630d --- /dev/null +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -0,0 +1,24 @@ +{ cmake, fetchFromGitHub, lib, ninja, stdenv }: + +stdenv.mkDerivation rec { + pname = "quick-lint-js"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "quick-lint"; + repo = "quick-lint-js"; + rev = version; + sha256 = "sha256-F21eli4HdLw3RComvocwBrcGfruIjO23E6+7a4+6vbs="; + }; + + nativeBuildInputs = [ cmake ninja ]; + doCheck = true; + + meta = with lib; { + description = "Find bugs in Javascript programs"; + homepage = "https://quick-lint-js.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ratsclub ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index e1f26dc02b2e6..97f3d4d4b3b66 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = version; - sha256 = "sha256-PltYUU2O/D1PrU+K8JN4+aUVLzHCeNyIsXMU6HLodXE="; + sha256 = "sha256-yKmm24X+5P5UATjWn0LJqby9lKRhwlvDK5suTPxKGwU="; }; - cargoSha256 = "sha256-XiQGkZ6pfyGkNPjpcPoY66qBl7ABTcRHCBjgmXSRrL0="; + cargoSha256 = "sha256-8n2WryAWi/bIL0XCSlNYcxXN2ld1tis435ScuU0QcBs="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 3cbf9c404c686..204654eb0e782 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.11.3"; + version = "0.12.9"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-jWkrjFQg0EqM+e/IT2n2E4lGL2kT/Wz7r5BLlzvWSO0="; + hash = "sha256-FskCBviLl1yafPOlsp/IjaEOlGUuWLcGlxDrNA/qf8k="; }; - cargoHash = "sha256-+kXwMGeE2HD59EU0Dzvg8I6LcHiPV7SKSFqnCTfkKwY="; + cargoHash = "sha256-zakSQptKK/X/8MDJxRUHTDIGPh77cq5PrOmPEneD0YM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix new file mode 100644 index 0000000000000..4978c4a3c3e65 --- /dev/null +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "probe-rs-cli"; + version = "0.12.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU="; + }; + + cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "CLI tool for on-chip debugging and flashing of ARM chips"; + homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ xgroleau ]; + }; +} diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 3ec4163ac442d..c1c5bbee0ac38 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.32"; + version = "1.0.40"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA="; + sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU="; }; - vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; + vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 5ec2ff7ac4593..213a8da8ce027 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-SXwIwBlajzcXJaB90aesPk6BTRUNLRXtx4FPuM7pcyU="; + sha256 = "sha256-L3dHkF7yKnwXpXxCEswwA0TxVfjTzc89l0rpT7EYpIU="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 7d88df2feb036..aa58b37773efd 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 5d185dd153e02..7db111a50f265 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nry6P4nwcCmvJ4kdzeGEkaP1fm2LgnAwrINTBFK23tY="; + sha256 = "sha256-bgfG1cPhauU85FG/ZX1n2KqfydMeh92q347UsREkOGo="; }; - cargoSha256 = "sha256-i5wOGPOe1lDZknrVzZGxC8dUgTGiZJSzLqkxSRt0mQ8="; + cargoSha256 = "sha256-njZTD6O67v787Z1tJ7G0QzxJLhqU2sfpOVw6r4woE9s="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 99b51854e7d4d..4ec62ed4d29db 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Lua Language Server coded by Lua "; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; }; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index b6f6dd2abb6d8..9ce8a9494dd3c 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XFx8M9cQ7uXm4LS983FOZ6hz3zffLahhwrBjytbwEWk="; + sha256 = "sha256-dQ+FLKf+zNrUabrXWvdYqpNXzS+j92zQcaZXPTxxB/E="; }; - cargoSha256 = "sha256-ngWvbNx41K3PfGbzJfH8uBUl0cuI/Abj6EbX8YANk6Q="; + cargoSha256 = "sha256-ud2Hb8EoOiPyzp7qPUeQi8FZ49RXbrDsk8ZEBI6lPtk="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/pkgs/development/tools/uniffi-bindgen/Cargo.lock new file mode 100644 index 0000000000000..4de3b80928aa5 --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -0,0 +1,837 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "askama" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" +dependencies = [ + "askama_derive", + "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" +dependencies = [ + "askama_shared", + "proc-macro2", + "syn", +] + +[[package]] +name = "askama_escape" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" + +[[package]] +name = "askama_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" +dependencies = [ + "askama_escape", + "nom 6.2.1", + "proc-macro2", + "quote", + "serde", + "syn", + "toml", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "callbacks" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "camino" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "semver-parser", + "serde", + "serde_json", +] + +[[package]] +name = "cdylib-dependency" +version = "0.17.0" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "coverall" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "crate_one" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "crate_two" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "custom-types" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "uniffi", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "ext-types-guid" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "ext-types-lib" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "custom-types", + "ext-types-guid", + "uniffi", + "uniffi-one", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "external_types_lib" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "crate_two", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "ffi-crate" +version = "0.17.0" +dependencies = [ + "cdylib-dependency", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "i1015-fully-qualified-types" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "i356-enum-without-int-helpers" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "kotlin-experimental-unsigned-types" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "omit_argument_labels" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + +[[package]] +name = "paste" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "proc-macro2" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099a24e67e2b4083a6d0beb5a98e274c3160edfb879d71cd2cd14da93786a93b" +dependencies = [ + "glob", + "once_cell", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + +[[package]] +name = "unicode-bidi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "uniffi" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "cargo_metadata", + "lazy_static", + "log", + "paste", + "static_assertions", + "trybuild", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi-example-arithmetic" +version = "0.17.0" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-callbacks" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-geometry" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-rondpoint" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-sprites" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-todolist" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-time" +version = "0.17.0" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-one" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi_bindgen" +version = "0.17.0" +dependencies = [ + "anyhow", + "askama", + "cargo_metadata", + "clap", + "heck", + "paste", + "serde", + "toml", + "weedle", +] + +[[package]] +name = "uniffi_build" +version = "0.17.0" +dependencies = [ + "anyhow", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi_macros" +version = "0.17.0" +dependencies = [ + "glob", + "proc-macro2", + "quote", + "syn", + "uniffi_build", +] + +[[package]] +name = "uniffi_uitests" +version = "0.17.0" +dependencies = [ + "trybuild", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "weedle" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" +dependencies = [ + "nom 5.1.2", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix new file mode 100644 index 0000000000000..59ecd71a4114b --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, ktlint +, yapf +, rubocop +, rustfmt +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "uniffi-bindgen"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "uniffi-rs"; + rev = "v${version}"; + hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y="; + }; + + cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI="; + + cargoBuildFlags = [ "-p uniffi_bindgen" ]; + cargoTestFlags = [ "-p uniffi_bindgen" ]; + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + postFixup = '' + wrapProgram "$out/bin/uniffi-bindgen" \ + --suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] } + ''; + + meta = with lib; { + description = "Toolkit for building cross-platform software components in Rust"; + homepage = "https://mozilla.github.io/uniffi-rs/"; + license = licenses.mpl20; + maintainers = with maintainers; [ vtuan10 ]; + }; +} diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index a58a0e95a38f8..e80bb0f14cdfb 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4="; + sha256 = "sha256-3l0ezObZK/QEmpBlqSm3R3e4pFM7KUnsxDrzvEYExnk="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 4eb1c055daf58..fb13244daf716 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-OzH974FowU68blLLi9l+o7JPSuY+9Bkz13Q10QOuHWA="; + sha256 = "sha256-Oc4hNeSDsGHsA7V05LHFAJ5xvxWth2wEd3ag2ltVR10="; }; vendorSha256 = null; diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 94a5c3de37ad8..1c9ed7c2e10ef 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }: let pname = "bloomrpc"; @@ -13,9 +13,15 @@ let appimageContents = appimageTools.extractType2 { inherit pname src version; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname src version; + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + multiPkgs = null; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9a4c9affaa7f3..c05737d1c86ed 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.18.2"; + version = "1.19.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vWA2Y1y5KatodTqr1+YwUXA2WYqQPMIMgXPuyRzmQW4="; + sha256 = "sha256-FLT4O542Q3qFjrsIsF9O/dgQQNAWhsZq+MaLqF8lLPA="; }; - cargoSha256 = "sha256-Go0Rj/NI56CZnRaR8QvOtOFNq/qpyujzpzVr3IHkEcg="; + cargoSha256 = "sha256-mKmMgAoEavv5kb2fo+X5dfpw0ftAho6aU3/wCTgwXao="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 340f50c64e436..a1ea206fabdcb 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.38.1"; + version = "0.40.0"; shas = { - x86_64-linux = "sha256-vRkb5ZrIOYSKa84UbsJD+Oua0wve7f1Yf3kMg/kkYSY="; - aarch64-linux = "sha256-o9btdXct/HpUTXlJc2Ydzj2yo2lSV87uo/VyxaxN0fk="; - x86_64-darwin = "sha256-/J/MpXnzvBv70o8Zjc46yPzBrY309o4kDQ9kZzDfhb4="; - aarch64-darwin = "sha256-y4MJIA2HKPm9iLJSxDw43VHsoY5v2WGp7zEsll/EHhI="; + x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y="; + aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w="; + x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA="; + aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA="; }; } diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index df343f30785bb..a87892c5f1471 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.26.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; + sha256 = "sha256-OmvKd35jR003qQnA/NBI4MjGRw044bYUYa59RKbz+lI="; }; # the integration tests will try to clone a remote repos @@ -35,6 +35,7 @@ crystal.buildCrystalPackage rec { meta = with lib; { description = "A Crystal library for creating and running tasks. Also generates Lucky projects"; + homepage = "https://luckyframework.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index f0808622bcf16..854a755b0df89 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -2,13 +2,13 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 0.14.2 + version: 0.14.3 - future: - git: https://github.com/crystal-community/future.cr.git - version: 0.1.0 + lucky_task: + git: https://github.com/luckyframework/lucky_task.git + version: 0.1.1 teeplate: git: https://github.com/luckyframework/teeplate.git - version: 0.8.2 + version: 0.8.5 diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index b4f100518b3fd..78c0b4b133854 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -2,19 +2,19 @@ ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.14.2"; - sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2"; + rev = "v0.14.3"; + sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; }; - future = { - owner = "crystal-community"; - repo = "future.cr"; - rev = "v0.1.0"; - sha256 = "1p88mfn1ab5hz4r81vjfm1vn9rww0lbbii8lyzfx9pkxanh9rp98"; + lucky_task = { + owner = "luckyframework"; + repo = "lucky_task"; + rev = "v0.1.1"; + sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7"; }; teeplate = { owner = "luckyframework"; repo = "teeplate"; - rev = "v0.8.2"; - sha256 = "1v7njslcpir52nnyd30mfnxvqmb7ycqnlq80qnx6myw20iy9dcww"; + rev = "v0.8.5"; + sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj"; }; } diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7f0f508817686..1663e17b14d29 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "15.8.1"; + version = "15.9.1"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-ZxLaGAKBACR65CRCjt3NPSjMNm7GQkESxF6sLv3q4lQ="; + sha256 = "sha256-QGtXI4Dbua5LBXSvB17tnSTGEvCCoopvg1XKBuDIEoQ="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index aacc15d19b975..46ae45b2202b3 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,5 +1,25 @@ -{ fetchFromGitHub, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, libsecret, qtmultimedia, qttools, yajl, libzip, hunspell -, boost, libGLU, lua, cmake, which, pkg-config, }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, git +, pkg-config +, qttools +, which +, wrapQtAppsHook +, boost +, hunspell +, libGLU +, libsForQt5 +, libsecret +, libzip +, lua +, pcre +, pugixml +, qtbase +, qtmultimedia +, yajl +}: let luaEnv = lua.withPackages(ps: with ps; [ @@ -8,25 +28,46 @@ let in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.12.0"; + version = "4.15.1"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "023plm5mwm15xikmdh1mq3gx1n7y4a0r0kw9fvk3rvm9brm78hzp"; + hash = "sha256-GnTQc0Jh4YaQnfy7fYsTCACczlzWCQ+auKYoU9ET83M="; }; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook git qttools which ]; + nativeBuildInputs = [ + cmake + git + pkg-config + qttools + which + wrapQtAppsHook + ]; + buildInputs = [ - pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libsecret libzip libGLU yajl boost hunspell + boost + hunspell + libGLU + libsForQt5.qtkeychain + libsecret + libzip + luaEnv + pcre + pugixml + qtbase + qtmultimedia + yajl ]; WITH_FONTS = "NO"; WITH_UPDATER = "NO"; installPhase = '' + runHook preInstall + mkdir -pv $out/lib cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib mkdir -pv $out/bin @@ -41,15 +82,19 @@ stdenv.mkDerivation rec { cp -r ../mudlet.png $out/share/pixmaps/ makeQtWrapper $out/mudlet $out/bin/mudlet \ + --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \ --run "cd $out"; + + runHook postInstall ''; meta = with lib; { description = "Crossplatform mud client"; - homepage = "https://mudlet.org"; + homepage = "https://www.mudlet.org/"; maintainers = [ maintainers.wyvie maintainers.pstn ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 35564704f68be..5ddbabe042ea3 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.118.0"; + version = "2022.205.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk="; + sha256 = "sha256-CzXgj3990qWOwIjhbU8vO29nDO/7HrGDtsc67VIenPI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 7bf9a89e50f39..6ff9f6dfaf802 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -111,8 +111,10 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) @@ -153,14 +155,16 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.204.0"; sha256 = "1dwg45k1qhxj4mhxw49djmab800yi7z7qnvl8ipicli4lg9k5lvf"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.204.0"; sha256 = "1v4kfphjbkcxswx11c7xh93jwpsyvnskc0zia91d5bp5d11y3z32"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.501-alpha"; sha256 = "03ixv0nhszsyyf0bvyd25nkyn3c3cndzbxnva19lagvf0l9gnvjg"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; }) (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; }) @@ -298,6 +302,7 @@ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 213f2c8e4f489..e0bd6909fb946 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "19.1"; + version = "20.0"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "sha256-opJPMvaE8fDoGaBNHySqr/LRU/UPP6292G+nYyBBL08="; + sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8="; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "A computer opponent for the board game Blokus"; homepage = "https://pentobi.sourceforge.io"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 82879d0a9d2d6..b70ef8c3dab69 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,37 +1,68 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL -, glew +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, assimp +, curl +, freetype +#, glew +, libGL +, libGLU +, libpng +, libsigcxx +, libvorbis +, lua5_2 +, mesa +, SDL2 +, SDL2_image }: stdenv.mkDerivation rec { pname = "pioneer"; - version = "20210723"; + version = "20220203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI="; + hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})' + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng - assimp libGLU libGL glew + assimp + curl + freetype + libGL + libGLU + libpng + libsigcxx + libvorbis + lua5_2 + mesa + SDL2 + SDL2_image ]; - preConfigure = '' - export PIONEER_DATA_DIR="$out/share/pioneer/data"; - ''; + cmakeFlags = [ + "-DPIONEER_DATA_DIR:PATH=${placeholder "out"}/share/pioneer/data" + "-DUSE_SYSTEM_LIBLUA:BOOL=YES" + ]; - makeFlags = [ "build-data" ]; + makeFlags = [ "all" "build-data" ]; meta = with lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = "https://pioneerspacesim.net"; license = with licenses; [ - gpl3 cc-by-sa-30 + gpl3Only cc-by-sa-30 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/games/tetrio-desktop/default.nix b/pkgs/games/tetrio-desktop/default.nix index c700aba72fc9c..93d80314c6619 100644 --- a/pkgs/games/tetrio-desktop/default.nix +++ b/pkgs/games/tetrio-desktop/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , alsa-lib , cups +, libpulseaudio , libX11 , libXScrnSaver , libXtst @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { version = "8.0.0"; src = fetchurl { - url = "https://web.archive.org/web/20211130172544/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; + url = "https://web.archive.org/web/20211228025517if_/https://tetr.io/about/desktop/builds/TETR.IO%20Setup.deb"; name = "tetrio-desktop.deb"; sha256 = "1nlblfhrph4cw8rpic9icrs78mzrxyskl7ggyy2i8bk9i07i21xf"; }; @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ alsa-lib cups + libpulseaudio libX11 libXScrnSaver libXtst diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index dd9e1c827c46f..b6085fdce3911 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.19.7"; + version = "3.19.8"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-I6qU/qojUjwCQf7DLoeUwoYROo4N5SEtWCs1DazaZXw="; + sha256 = "sha256-ubMREVcislhkA3pzxuqI+HpBHq9vbMa8nyq0qhTh2x8="; }; dontUnpack = true; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 1ff9f9d36d152..905d51438b687 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.4"; + version = "3.6.5"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-WUEpYxzNcH9kJRn4nROoaeXTe1+D4/0VRqTwc7ac1hc="; + sha256 = "sha256-wnaT0+r599/RboeUfpCZTNd/M2kaCsckI9F+7r7leEE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/vassal $out/doc cp CHANGES LICENSE README.md $out @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/vassal \ --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \ VASSAL.launch.ModuleManager" + + runHook postInstall ''; # Don't move doc to share/, VASSAL expects it to be in the root @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free, open-source boardgame engine"; - homepage = "http://www.vassalengine.org/"; + homepage = "https://vassalengine.org/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index d0b0ae118443f..49fdc7a829c58 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }: +{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages + +# Warning: this blob runs on the main CPU (not the GPU) at privilege +# level EL3, which is above both the kernel and the hypervisor. +, unfreeIncludeHDCPBlob ? true +}: let buildArmTrustedFirmware = { filesToInstall @@ -20,6 +25,11 @@ let sha256 = "sha256-qT9DdTvMcUrvRzgmVf2qmKB+Rb1WOB4p1rM+fsewGcg="; }; + patches = lib.optionals (!unfreeIncludeHDCPBlob) [ + # this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch + ./remove-hdcp-blob.patch + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # For Cortex-M0 firmware in RK3399 @@ -50,7 +60,7 @@ let meta = with lib; { homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; - license = licenses.bsd3; + license = (if unfreeIncludeHDCPBlob then [ licenses.unfreeRedistributable ] else []) ++ [ licenses.bsd3 ]; maintainers = with maintainers; [ lopsided98 ]; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); diff --git a/pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch b/pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch new file mode 100644 index 0000000000000..7f99fbdcabfdc --- /dev/null +++ b/pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch @@ -0,0 +1,47 @@ +diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c +index a8773f4f6..8e28c4830 100644 +--- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c ++++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c +@@ -13,17 +13,6 @@ + + #include <cdn_dp.h> + +-__asm__( +- ".pushsection .text.hdcp_handler, \"ax\", %progbits\n" +- ".global hdcp_handler\n" +- ".balign 4\n" +- "hdcp_handler:\n" +- ".incbin \"" HDCPFW "\"\n" +- ".type hdcp_handler, %function\n" +- ".size hdcp_handler, .- hdcp_handler\n" +- ".popsection\n" +-); +- + static uint64_t *hdcp_key_pdata; + static struct cdn_dp_hdcp_key_1x key; + +@@ -38,7 +27,7 @@ uint64_t dp_hdcp_ctrl(uint64_t type) + return 0; + case HDCP_KEY_DATA_START_DECRYPT: + if (hdcp_key_pdata == (uint64_t *)(&key + 1)) +- return hdcp_handler(&key); ++ return PSCI_E_DISABLED; + else + return PSCI_E_INVALID_PARAMS; + assert(0); /* Unreachable */ +diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk +index a658fb286..5edb6a25b 100644 +--- a/plat/rockchip/rk3399/platform.mk ++++ b/plat/rockchip/rk3399/platform.mk +@@ -88,11 +88,6 @@ $(eval $(call add_define_val,RK3399M0PMUFW,\"$(RK3399M0PMUFW)\")) + ifdef PLAT_RK_DP_HDCP + BL31_SOURCES += ${RK_PLAT_SOC}/drivers/dp/cdn_dp.c + +-HDCPFW=${RK_PLAT_SOC}/drivers/dp/hdcp.bin +-$(eval $(call add_define_val,HDCPFW,\"$(HDCPFW)\")) +- +-${BUILD_PLAT}/bl31/cdn_dp.o: CCACHE_EXTRAFILES=$(HDCPFW) +-${RK_PLAT_SOC}/drivers/dp/cdn_dp.c: $(HDCPFW) + endif + + # CCACHE_EXTRAFILES is needed because ccache doesn't handle .incbin diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 72a2f8a71bcfc..395fb6711d4dd 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -195,6 +195,30 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; + asyncrun-vim = buildVimPluginFrom2Nix { + pname = "asyncrun.vim"; + version = "2022-02-03"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asyncrun.vim"; + rev = "fc6d524b9d81850c15b9b374a1b4a1374e243ec3"; + sha256 = "/144rx2txz+VnPI8y4w1z9DY5nBEmp64arApRGiHQXU="; + }; + meta.homepage = "https://github.com/skywind3000/asyncrun.vim"; + }; + + asynctasks-vim = buildVimPluginFrom2Nix { + pname = "asynctasks.vim"; + version = "2022-01-12"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asynctasks.vim"; + rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; + sha256 = "cw61N5K6GHwdT011oeFV+jzFw9tk4xahPcTnx5jwqPA="; + }; + meta.homepage = "https://github.com/skywind3000/asynctasks.vim"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; @@ -735,6 +759,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + pname = "cmp-nvim-ultisnips"; + version = "2022-01-31"; + src = fetchFromGitHub { + owner = "quangnguyen30192"; + repo = "cmp-nvim-ultisnips"; + rev = "0e8f501facdcc5bfdb5664ee185e040464a79625"; + sha256 = "tQ3xkJ34q5+ioi6lQY7F/ZjGngzmv4FDkpNeU5sRqK0="; + }; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips"; + }; + cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; version = "2022-01-08"; @@ -6423,6 +6459,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + pname = "telescope-asynctasks.nvim"; + version = "2021-10-22"; + src = fetchFromGitHub { + owner = "GustavoKatel"; + repo = "telescope-asynctasks.nvim"; + rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; + sha256 = "Ow7iSmosMs/hGEfnKKorZhS4tKVKal+pkZ52LIFsEu4="; + }; + meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim"; + }; + telescope-cheat-nvim = buildVimPluginFrom2Nix { pname = "telescope-cheat.nvim"; version = "2021-12-05"; @@ -6604,6 +6652,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ultisnips.nvim"; + version = "2021-09-27"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "telescope-ultisnips.nvim"; + rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; + sha256 = "h2PfstopgjCMFYVOnzEX7gkkIHCamcJPJux5B+qYYww="; + }; + meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; @@ -11686,6 +11746,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winshift-nvim = buildVimPluginFrom2Nix { + pname = "winshift.vim"; + version = "2021-11-15"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "winshift.vim"; + rev = "aaa04b97640165eb0877bfc04943f4282887470b"; + sha256 = "g5v/qd1FNg7mMZif7Liga3BAnZV7Mi7hkqnCUEFk52U="; + }; + meta.homepage = "https://github.com/sindrets/winshift.nvim"; + }; + wmgraphviz-vim = buildVimPluginFrom2Nix { pname = "wmgraphviz.vim"; version = "2018-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 547c59ee2cb4f..098530dcf31fc 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -169,6 +169,7 @@ FelikZ/ctrlp-py-matcher feline-nvim/feline.nvim fenetikm/falcon fhill2/floating.nvim +fhill2/telescope-ultisnips.nvim fiatjaf/neuron.vim filipdutescu/renamer.nvim fisadev/vim-isort @@ -223,6 +224,7 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +GustavoKatel/telescope-asynctasks.nvim gyim/vim-boxdraw haringsrob/nvim_context_vt hashivim/vim-packer @@ -654,6 +656,7 @@ pwntester/octo.nvim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill +quangnguyen30192/cmp-nvim-ultisnips Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim @@ -756,10 +759,13 @@ simnalamburt/vim-mundo simrat39/rust-tools.nvim simrat39/symbols-outline.nvim sindrets/diffview.nvim +sindrets/winshift.nvim SirVer/ultisnips sjl/gundo.vim sjl/splice.vim sk1418/last256 +skywind3000/asyncrun.vim +skywind3000/asynctasks.vim slashmili/alchemist.vim smiteshp/nvim-gps sodapopcan/vim-twiggy diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 3db0f9d952671..3e5bf42dd958c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1417,6 +1417,23 @@ let }; }; + ms-pyright.pyright = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pyright"; + publisher = "ms-pyright"; + version = "1.1.222"; + sha256 = "sha256-QMX/SawDEnG1xVrug8mvN7EvRrRDkJffcXBUFpQi1XE="; + }; + meta = with lib; { + description = "VS Code static type checking for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; + homepage = "https://github.com/Microsoft/pyright#readme"; + changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + ms-python.python = callPackage ./python { extractNuGet = callPackage ./python/extract-nuget.nix { }; }; diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch new file mode 100644 index 0000000000000..abbb3b8fb0e1a --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch @@ -0,0 +1,146 @@ +diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +index c23afce4..12ac12f4 100644 +--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj ++++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +@@ -365,13 +365,6 @@ + /* End PBXBuildFile section */ + + /* Begin PBXContainerItemProxy section */ +- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD; +- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS"; +- }; + 2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +@@ -400,20 +393,6 @@ + remoteGlobalIDString = A93903C71C57E9ED00FE90DC; + remoteInfo = "MVKSPIRVToMSLConverter-macOS"; + }; +- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A93903B81C57E9D700FE90DC; +- remoteInfo = "MVKSPIRVToMSLConverter-iOS"; +- }; +- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A9092A8C1A81717B00051823; +- remoteInfo = MoltenVKShaderConverter; +- }; + /* End PBXContainerItemProxy section */ + + /* Begin PBXFileReference section */ +@@ -1019,7 +998,6 @@ + buildRules = ( + ); + dependencies = ( +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */, + ); + name = "MoltenVK-tvOS"; + productName = MoltenVK; +@@ -1039,7 +1017,6 @@ + buildRules = ( + ); + dependencies = ( +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */, + ); + name = "MoltenVK-iOS"; + productName = MoltenVK; +@@ -1059,7 +1036,6 @@ + buildRules = ( + ); + dependencies = ( +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */, + ); + name = "MoltenVK-macOS"; + productName = MoltenVK; +@@ -1476,24 +1452,6 @@ + }; + /* End PBXSourcesBuildPhase section */ + +-/* Begin PBXTargetDependency section */ +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MoltenVKSPIRVToMSLConverter-tvOS"; +- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */; +- }; +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MVKSPIRVToMSLConverter-iOS"; +- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */; +- }; +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = MoltenVKShaderConverter; +- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */; +- }; +-/* End PBXTargetDependency section */ +- + /* Begin XCBuildConfiguration section */ + 2FEA0AB824902F9F00EEF3AD /* Debug */ = { + isa = XCBuildConfiguration; +@@ -1586,11 +1544,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1600,6 +1559,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; +@@ -1658,11 +1621,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1672,6 +1636,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch new file mode 100644 index 0000000000000..7a7ec7afa2ee6 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch @@ -0,0 +1,180 @@ +diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +index c7842b63..d55f73ed 100644 +--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj ++++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +@@ -3,7 +3,7 @@ + archiveVersion = 1; + classes = { + }; +- objectVersion = 52; ++ objectVersion = 48; + objects = { + + /* Begin PBXBuildFile section */ +@@ -33,9 +33,6 @@ + A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; + A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; }; + A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; + A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; +@@ -55,12 +52,6 @@ + A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; }; + A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; + A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; + A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; }; + A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; }; + A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; }; +@@ -115,9 +106,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -134,9 +122,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -144,9 +129,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -313,7 +295,7 @@ + A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */, + ); + name = MoltenVKShaderConverter; +- productName = MetalGLShaderConverterTool; ++ productName = MoltenVKShaderConverter; + productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */; + productType = "com.apple.product-type.tool"; + }; +@@ -349,7 +331,7 @@ + dependencies = ( + ); + name = "MoltenVKShaderConverter-macOS"; +- productName = "MetalGLShaderConverter-macOS"; ++ productName = MoltenVKShaderConverter; + productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; + productType = "com.apple.product-type.library.static"; + }; +@@ -536,6 +518,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -548,6 +541,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -624,15 +628,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; +@@ -683,15 +696,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; diff --git a/pkgs/os-specific/darwin/moltenvk/createDylib.patch b/pkgs/os-specific/darwin/moltenvk/createDylib.patch new file mode 100644 index 0000000000000..b4a990cd98916 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/createDylib.patch @@ -0,0 +1,13 @@ +diff --git a/Scripts/create_dylib.sh b/Scripts/create_dylib.sh +index 5ba75f67..a0405067 100755 +--- a/Scripts/create_dylib.sh ++++ b/Scripts/create_dylib.sh +@@ -57,6 +57,8 @@ ${MVK_SAN} \ + -framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework CoreGraphics ${MVK_IOKIT_FWK} -framework Foundation \ + --library-directory ${MVK_USR_LIB_DIR} \ + -o "${MVK_BUILT_PROD_DIR}/dynamic/${MVK_DYLIB_NAME}" \ ++-L@@sourceRoot@@/outputs/lib -L@@glslang@@/lib -L@@spirv-tools@@/lib -L@@spirv-cross@@/lib \ ++-lobjc -lMoltenVKShaderConverter -lGenericCodeGen -lMachineIndependent -lOGLCompiler -lOSDependent -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lspirv-cross-core -lspirv-cross-glsl -lspirv-cross-msl -lspirv-cross-reflect \ + -force_load "${MVK_BUILT_PROD_DIR}/lib${PRODUCT_NAME}.a" + + if test "$CONFIGURATION" = Debug; then diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix new file mode 100644 index 0000000000000..243bc657c9bc2 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -0,0 +1,200 @@ +{ lib +, stdenv +, stdenvNoCC +, fetchurl +, fetchFromGitHub +, cctools +, sigtool +, cereal +, glslang +, spirv-cross +, spirv-headers +, spirv-tools +, vulkan-headers +, AppKit +, Foundation +, Metal +, QuartzCore +}: + +# Even though the derivation is currently impure, it is written to build successfully using +# `xcbuild`. Once the SDK on x86_64-darwin is updated, it should be possible to switch from being +# an impure derivation. +# +# The `sandboxProfile` was copied from the iTerm2 derivation. In order to build you at least need +# the `sandbox` option set to `relaxed` or `false`. Xcode should be available in the default +# location. +let + libcxx.dev = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr"; +in +stdenvNoCC.mkDerivation rec { + pname = "MoltenVK"; + version = "1.1.7"; + + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + ]; + + outputs = [ "out" "bin" ]; + + # MoltenVK requires specific versions of its dependencies. + # Pin them here except for cereal, which is four years old and has several CVEs. + passthru = { + glslang = (glslang.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "2742e959347ae2fac58acd0d022c92a0ff1f24bf"; + hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE="; + }; + })).override { + inherit (passthru) spirv-headers spirv-tools; + }; + spirv-cross = spirv-cross.overrideAttrs (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" + ]; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Cross"; + rev = "131278458ea8eebe6a6e9c476fbcf71278726e1a"; + hash = "sha256-LrRYDFGv3Zxfy4qRNLwM2OOa8jbcq0ttPxDamCH21xU="; + }; + }); + spirv-headers = spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-headers"; + rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"; + hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0"; + }; + }); + spirv-tools = (spirv-tools.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-tools"; + rev = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"; + hash = "sha256-DSqZlwfNTbN4fyIrVBKltm5U2U4GthW3L+Ksw4lSVG8="; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + })).override { + inherit (passthru) spirv-headers; + }; + vulkan-headers = vulkan-headers.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "1dace16d8044758d32736eb59802d171970e9448"; + hash = "sha256-C6YgxWcinI3QumcWmoJaiTAf0u6jSDc8sCIarn2t04k"; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + }); + }; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "MoltenVK"; + rev = "v${version}"; + hash = "sha256-I9QcjyE09qclWPCLAVfKEaifP89q1ftLh9cXWy9m7kw="; + }; + + patches = [ + # Specify the libraries to link directly since XCFrameworks are not being used. + ./createDylib.patch + # Move `mvkGitRevDerived.h` to a stable location + ./gitRevHeaderStability.patch + # Fix the Xcode projects to play nicely with `xcbuild`. + ./MoltenVKShaderConverter.xcodeproj.patch + ./MoltenVK.xcodeproj.patch + ]; + + postPatch = '' + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-headers@@ "${passthru.glslang.spirv-headers}" + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@cereal@@ "${cereal}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@vulkan-headers@@ "${passthru.vulkan-headers}" + substituteInPlace Scripts/create_dylib.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" + substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace '$(git rev-parse HEAD)' ${src.rev} + ''; + + dontConfigure = true; + + buildPhase = '' + # Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`. + derived_data_path=$(pwd)/DerivedData + pushd MoltenVKShaderConverter + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVKShaderConverter.xcodeproj \ + -scheme MoltenVKShaderConverter \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + mkdir -p outputs/bin outputs/lib + declare -A outputs=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib ) + for output in "''${!outputs[@]}"; do + cp DerivedData/Build/Products/Release/$output "outputs/''${outputs[$output]}/$output" + done + + pushd MoltenVK + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVK.xcodeproj \ + -scheme MoltenVK-macOS \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + cp DerivedData/Build/Products/Release/dynamic/libMoltenVK.dylib outputs/lib/libMoltenVK.dylib + ''; + + installPhase = '' + mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" + cp outputs/bin/MoltenVKShaderConverter "$bin/bin/" + cp outputs/lib/libMoltenVK.dylib "$out/lib/" + ${cctools}/bin/install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib" + # FIXME: https://github.com/NixOS/nixpkgs/issues/148189 + /usr/bin/codesign -s - -f "$out/lib/libMoltenVK.dylib" + install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json" + substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \ + --replace ./libMoltenVK.dylib "$out/share/vulkan/icd.d/MoltenVK_icd.json" + ''; + + sandboxProfile = '' + (allow file-read* file-write* process-exec mach-lookup) + ; block homebrew dependencies + (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + ''; + + meta = { + description = "A Vulkan Portability implementation built on top of Apple’s Metal API"; + homepage = "https://github.com/KhronosGroup/MoltenVK"; + changelog = "https://github.com/KhronosGroup/MoltenVK/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch new file mode 100644 index 0000000000000..e28b9ee70b6a7 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch @@ -0,0 +1,14 @@ +diff --git a/Scripts/gen_moltenvk_rev_hdr.sh b/Scripts/gen_moltenvk_rev_hdr.sh +index c49ea4e6..9b7d13d1 100755 +--- a/Scripts/gen_moltenvk_rev_hdr.sh ++++ b/Scripts/gen_moltenvk_rev_hdr.sh +@@ -2,7 +2,7 @@ + + # Record the MoltenVK GIT revision as a derived header file suitable for including in a build + MVK_GIT_REV=$(git rev-parse HEAD) +-MVK_HDR_FILE="${BUILT_PRODUCTS_DIR}/mvkGitRevDerived.h" ++MVK_HDR_FILE="@@sourceRoot@@/outputs/include/mvkGitRevDerived.h" ++mkdir -p $(dirname ${MVK_HDR_FILE}) + echo "// Auto-generated by MoltenVK" > "${MVK_HDR_FILE}" + echo "static const char* mvkRevString = \"${MVK_GIT_REV}\";" >> "${MVK_HDR_FILE}" +- diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix new file mode 100644 index 0000000000000..be44db38fe14e --- /dev/null +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, SkyLight }: + +let + inherit (stdenv.hostPlatform) system; + target = { + "aarch64-darwin" = "arm"; + "x86_64-darwin" = "x86"; + }.${system} or (throw "Unsupported system: ${system}"); +in + +stdenv.mkDerivation rec { + pname = "sketchybar"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "SketchyBar"; + rev = "v${version}"; + sha256 = "1370xjl8sas5nghxgjxmc1zgskf28g40pv7nxgh37scjwdrkrrvb"; + }; + + buildInputs = [ Carbon Cocoa SkyLight ]; + + postPatch = '' + sed -i -e '/^#include <malloc\/_malloc.h>/d' src/*.[ch] src/*/*.[ch] + ''; + + makeFlags = [ + target + ]; + + installPhase = '' + mkdir -p $out/bin + cp ./bin/sketchybar_${target} $out/bin/sketchybar + ''; + + meta = with lib; { + description = "A highly customizable macOS status bar replacement"; + homepage = "https://github.com/FelixKratz/SketchyBar"; + platforms = platforms.darwin; + maintainers = [ maintainers.azuwis ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8e95c44f95cd8..5c1cf272e0e79 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -304,10 +304,10 @@ let meta = apparmor-meta "kernel patches"; }; - # Generate generic AppArmor rules in a file, - # from the closure of given rootPaths. - # To be included in an AppArmor profile like so: - # include "$(apparmorRulesFromClosure {} [pkgs.hello]}" + # Generate generic AppArmor rules in a file, from the closure of given + # rootPaths. To be included in an AppArmor profile like so: + # + # include "${apparmorRulesFromClosure { } [ pkgs.hello ]}" apparmorRulesFromClosure = { # The store path of the derivation is given in $path additionalRules ? [] diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index caeaed455f7e8..d6e4b059088dc 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -7,7 +7,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.23.0"; + version = "0.24.0"; disabled = !stdenv.isLinux; @@ -15,7 +15,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE="; + sha256 = "sha256-5Nq6LmphiyiiIyru/P2rCCmA25cwJIWn08oK1+eM3cQ="; }; format = "other"; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix new file mode 100644 index 0000000000000..69cd829049cac --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -0,0 +1,27 @@ +{ lib +, flutter +, fetchFromGitHub +}: + +flutter.mkFlutterApp { + pname = "firmware-updater"; + version = "unstable"; + + vendorHash = "sha256-QgeRCFbd3AcFekJunFTwu2nDOQpAOMJUxZhgY4stJJc="; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "firmware-updater"; + rev = "a51817a2551e29895352618a91df9cf93d944af1"; + sha256 = "6uhks6a9JcyIC5o0VssqfBlE4pqKiQ7d3KOb6feNTvU="; + fetchSubmodules = true; + }; + + meta = with lib; { + description = "Firmware Updater for Linux"; + homepage = "https://github.com/canonical/firmware-updater"; + license = licenses.free; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 07534332ebfad..093e8205630e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.265"; + version = "4.14.267"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1iwjg2z8818g1sl6l79pm5590hzwpxqcxh7wcdb00y4m3maksr0s"; + sha256 = "13hq4hcq686gdragjcgmz3m0kkk8abz5lna0ildaa9gybj43yd4c"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 9e57241d9eb7c..1ba37f697f717 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.228"; + version = "4.19.230"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14iis3x3jmfxwqqi7v7ijssqzha8d8nnydi4zqnpk53m45jw7km8"; + sha256 = "107sqv4izdnazscwhyam88vbinsvnd33z8agn4awc42hkqh9l20p"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 2b1cd51dfc4d8..0b67c3cd5fc71 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.300"; + version = "4.9.302"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bzmnkhxgz093ninqg8bh348d7s4xmkld2bld8nl215gnji0wfdb"; + sha256 = "0difn0vjz4hz9vl5lklawqy19ccb5gz5p5r1cyckschf0l2nyifm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index b8bade736a3cf..97416dd91e498 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.99"; + version = "5.10.101"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0j84g55d0v3832y9c5gh7bnmhnrb5bc9xdivps5n7n6km9c3b980"; + sha256 = "13hwpb85dynbayghxs3ln3hbyh8djgl5fj63vxwc8izfny62aj87"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index c7e6965032dba..e3a8505d98893 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.22"; + version = "5.15.24"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1hv3ci37nz79m1dg83ha4hl1jjnl3l52lvdzx514sp8hqihgji1m"; + sha256 = "0zx9big7n8gh6y14c05llxsqh543q0czjdrq906m8cc7r01yp5pl"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 426e3a5769826..5630b05d4f4d7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.8"; + version = "5.16.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "05h3b11czr710lilmb5gq84a78cfz3jm03q2q0gcrpcaxq2mzajj"; + sha256 = "17i3j07hgljsiz2kymbskp35p2xp14gb0mdi5s2r61c0h406yk8c"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4ac142b402efe..64252a715639a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.178"; + version = "5.4.180"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "19k2yzqlr4rarl086sr6vjnh0lq5wmg5n7r2p0cai9yfvq3spp2c"; + sha256 = "07ckmgcqpr39bzpp8v60b2vkb03p8931k7sl3ywg6f00lvcbaf8n"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 7f2811584cfce..c8d42ddda7461 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.90-rt60"; # updated by ./update-rt.sh + version = "5.10.78-rt55"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0997ijkmvf9iz4hn8m8naiagphhyvl4r6qx4q3gxk8qlq1j44pll"; + sha256 = "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0533s01ckjjw45b08zs9nhpszdcrqgfpwvnjs2dfjmc6yg9d13pi"; + sha256 = "1wcw682r238qi5jgn5zk9m6j2506p9ypfax13bzhjfyjzz3h98kp"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 64934724c25c6..636803f29097a 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.19"; + version = "5.15.24"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-4DChsTFWm/9X0iV9yhWZqOz7dxfNbok7cFLKAYKs+Dw="; + sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 81e86fe77efc4..8e6b9fa0663a3 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -12,20 +12,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ="; + sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; }; - patches = [(fetchpatch { - url = "https://github.com/libbpf/libbpf/pull/41.diff"; - sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA="; - })]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; @@ -38,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' # install linux's libbpf-compatible linux/btf.h - install -Dm444 include/uapi/linux/btf.h -t $out/include/linux + install -Dm444 include/uapi/linux/*.h -t $out/include/linux ''; # FIXME: Multi-output requires some fixes to the way the pkg-config file is diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 769bb1e43b447..0de982c3d5ee3 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; platforms = platforms.linux; - broken = kernel.kernelOlder "3.2.0"; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 3f58b0a536b34..1452650178550 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "510.47.03"; - sha256_64bit = "8qQh2ug2MY08DZZFnMs68n6Q5QyVsPqkKIr3Ynnl1pA="; - settingsSha256 = "lQRh8dG4NW2vLe4R6xx42BzAu3R6iLyrk3GOGKLfufQ="; - persistencedSha256 = "I8pIdBhbX9rfyhjQHGD5zjCwLF2zl2jc1Id+CTbSHKc="; + version = "510.54"; + sha256_64bit = "TCDezK4/40et/Q5piaMG+QJP2t+DGtwejmCFVnUzUWE="; + settingsSha256 = "ZWz5UN6Pa69NlmerKu30G+X8WfGlAwnVerDrO7TRO6w="; + persistencedSha256 = "MgWrBjKXJeRqF+ouT72tTiLPtn+lsS/Cp3oS61AWV8Q="; } else legacy_390; diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix new file mode 100644 index 0000000000000..d04c8ddb93985 --- /dev/null +++ b/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenvNoCC }: + +stdenvNoCC.mkDerivation rec { + name = "usb-blaster-udev-rules"; + + udevRules = ./usb-blaster.rules; + dontUnpack = true; + + installPhase = '' + install -Dm 644 "${udevRules}" "$out/lib/udev/rules.d/51-usbblaster.rules" + ''; + + meta = with lib; { + description = "udev rules that give NixOS permission to communicate with usb blasters"; + longDescription = '' + udev rules that give NixOS permission to communicate with usb blasters. + To use it under NixOS, add + + services.udev.packages = [ pkgs.usb-blaster-udev-rules ]; + + to the system configuration. + ''; + license = licenses.free; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules new file mode 100644 index 0000000000000..0add604ee819a --- /dev/null +++ b/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules @@ -0,0 +1,8 @@ +# USB-Blaster +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6002", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6003", TAG+="uaccess" + +# USB-Blaster II +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", TAG+="uaccess" diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix new file mode 100644 index 0000000000000..ccf462702fd3c --- /dev/null +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "virtio_vmmci"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "voutilad"; + repo = "virtio_vmmci"; + rev = "${version}"; + sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43"; + }; + + hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + + extraConfig = '' + CONFIG_RTC_HCTOSYS yes + ''; + + makeFlags = kernel.makeFlags ++ [ + "DEPMOD=echo" + "INSTALL_MOD_PATH=$(out)" + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with lib; { + description = "An OpenBSD VMM Control Interface (vmmci) for Linux"; + homepage = "https://github.com/voutilad/virtio_vmmci"; + license = licenses.gpl2; + maintainers = with maintainers; [ qbit ]; + platforms = platforms.linux; + }; + + enableParallelBuilding = true; +} diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index 80b5fbda817be..b6ccbd1de7049 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -1,25 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, libressl, libevent }: +{ lib, stdenv, fetchFromGitHub, bison, which, libressl, libevent }: stdenv.mkDerivation rec { pname = "gmid"; - version = "1.8"; + version = "1.8.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-CwJPaZefRDyn2fliOd9FnOLXq70HFu2RsUZhzWQdE3E"; + hash = "sha256-XNif164C5b5sVsZW7sy0id4qM/mJzg3RhoHbwJuJqDk="; }; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ bison which ]; buildInputs = [ libressl libevent ]; - configurePhase = '' - runHook preConfigure - ./configure PREFIX=$out - runHook postConfigure - ''; + configureFlags = [ + "PREFIX=${placeholder "out"}" + ]; meta = with lib; { description = "Simple and secure Gemini server"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5f607c63f1bf1..714087eb2e602 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.2.6"; + version = "2022.2.9"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -57,8 +57,8 @@ "aruba" = ps: with ps; [ pexpect ]; "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "aseko_pool_live" = ps: with ps; [ aioaseko ]; - "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox - "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox + "asterisk_cdr" = ps: with ps; [ asterisk-mbox ]; + "asterisk_mbox" = ps: with ps; [ asterisk-mbox ]; "asuswrt" = ps: with ps; [ aioasuswrt ]; "atag" = ps: with ps; [ pyatag ]; "aten_pe" = ps: with ps; [ atenpdu ]; @@ -83,7 +83,7 @@ "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO "bbox" = ps: with ps; [ ]; # missing inputs: pybbox "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim - "bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "bh1750" = ps: with ps; [ i2csense smbus-cffi ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ bizkaibus ]; @@ -98,7 +98,7 @@ "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; - "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: bme280spi i2csense + "bme280" = ps: with ps; [ bme280spi i2csense smbus-cffi ]; "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; @@ -208,7 +208,7 @@ "dunehd" = ps: with ps; [ pdunehd ]; "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy - "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices + "dynalite" = ps: with ps; [ dynalite-devices ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -312,7 +312,7 @@ "generic" = ps: with ps; [ ]; "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ sqlalchemy ]; - "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client + "geniushub" = ps: with ps; [ geniushub-client ]; "geo_json_events" = ps: with ps; [ geojson-client ]; "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ georss-generic-client ]; @@ -382,7 +382,7 @@ "hp_ilo" = ps: with ps; [ python-hpilo ]; "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; - "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "htu21d" = ps: with ps; [ i2csense smbus-cffi ]; "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; "hue" = ps: with ps; [ aiohue ]; "huisbaasje" = ps: with ps; [ huisbaasje-client ]; @@ -613,7 +613,7 @@ "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ pi1wire pyownet ]; "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ wsdiscovery ha-ffmpeg onvif-zeep-async ]; "open_meteo" = ps: with ps; [ open-meteo ]; "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; @@ -636,7 +636,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; - "overkiz" = ps: with ps; [ ]; # missing inputs: pyoverkiz + "overkiz" = ps: with ps; [ pyoverkiz ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; @@ -1149,6 +1149,7 @@ "dte_energy_bridge" "duckdns" "dunehd" + "dynalite" "eafm" "ecobee" "econet" @@ -1388,6 +1389,7 @@ "oncue" "ondilo_ico" "onewire" + "onvif" "open_meteo" "openalpr_cloud" "openalpr_local" @@ -1398,6 +1400,7 @@ "openuv" "openweathermap" "opnsense" + "overkiz" "ovo_energy" "owntracks" "ozw" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b000431fd1c7c..920343de67b63 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -138,7 +138,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.2.6"; + hassVersion = "2022.2.9"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -156,7 +156,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-UUiYp1YP+ak/2MncnGB0kE9+l2zQAyGjfD5srb5ArSI="; + hash = "sha256-So/MAKyFVa1TchrVE4ego1fRbgOXCoXR3w/rJLFSBqI="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6ee68c368ffe4..2aabb0d9312cd 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220203.0"; + version = "20220203.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-5iODXctmkw+MIdf/GECGhhWOMruMqeWBDWwwwrNQMjU="; + sha256 = "sha256-6+TzBhHo9+eo6Hlk8RF+BAt4O0i759iAN+dKAPDmTNY="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 9e40bb648ea50..9cdc0c58ee442 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -11,24 +11,25 @@ , systemd , tcp_wrappers , zlib +, c-ares }: stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6.3"; + version = "3.7.4"; src = fetchurl { - url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-P4ArWpxjOjBi9EiDp/ord17GfUOFwpiTKGvSEuZljGA="; + url = "https://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; + sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533"; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; - buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib c-ares ]; meta = with lib; { - description = "A caching proxy specialized for linux distribution files"; + description = "A caching proxy specialized for Linux distribution files"; homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/"; - license = licenses.gpl2; + license = licenses.bsdOriginal; platforms = platforms.linux; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 1731da3587688..c5966a10937e5 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let pname = "hylafaxplus"; - version = "7.0.4"; - sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5"; + version = "7.0.5"; + sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f"; configSite = substituteAll { name = "${pname}-config.site"; @@ -96,6 +96,7 @@ stdenv.mkDerivation { postInstall = ". ${postInstall}"; postInstallCheck = ". ${./post-install-check.sh}"; meta = { + changelog = "https://hylafax.sourceforge.io/news/${version}.php"; description = "enterprise-class system for sending and receiving facsimiles"; downloadPage = "https://hylafax.sourceforge.io/download.php"; homepage = "https://hylafax.sourceforge.io"; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 98602568d8c0f..fefd8a72570de 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.567"; + version = "0.20.576"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "VkRLbSs7n5I4DedZL49sykrpPbFQWlUouehPRg+MNio="; + sha256 = "UCYGxeA3ptSNDZ3vONxlr5SKhdvPxLIeslP23ULHy7M="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index b4ddb80c16532..598946037db69 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "maddy"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-b85g8Eu7qWTI+ggMr7JL/2BAVbkXocpsR89P6s6TfMg="; + sha256 = "sha256-UB9Y2nNkiN0L3NIfUqnpaJJqNuAnCYIeEyS60TnnIRs="; }; - vendorSha256 = "sha256-kzSwqT3r6uGxq1GNzCWCn8VoCxmVtiUb23XLCpsPv/c="; + vendorSha256 = "sha256-lL9hlICc9t/2v6eawG8LU6hpAKpY7raTg5l1RagewPs="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index e863451bb5e05..09d6d0cc105ad 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { description = "Self-hosted, globally interconnected microblogging software based on ActivityPub"; homepage = "https://joinmastodon.org"; license = licenses.agpl3Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = with maintainers; [ petabyteboy happy-river erictapen ]; }; } diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index 88ec52f45363a..58b19586e4bf8 100644 --- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -1,16 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse }: +{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, fetchpatch }: buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "0fvdzn5l1a6bhr1qzgs30a3kh6nj0byqichnl149sjgr0v4lpkz1"; + sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc="; }; + patches = [ + # Update legacy antispam plugin with newer types. Or it'll just ignore mjolnir 1.3.1 rules. + (fetchpatch { + url = "https://github.com/matrix-org/mjolnir/commit/eb8c5e08b4c2b78e6a796e38e826ac3b7e9dfbaf.patch"; + sha256 = "sha256-rfFU45PfxR2YmNRU74eBI9M2hqBVZcNH0Sw8W/cavD4="; + stripLen = 1; + }) + # Port to Synapse module API (needs Synapse >= 1.37.0) + (fetchpatch { + url = "https://github.com/matrix-org/mjolnir/commit/9c9bd0e02907412b5fa6b95844e9f53ac07b61fd.patch"; + sha256 = "sha256-HR2OvqFnlQwRV7ezfOjseatjo+3P8i9PsV7D+hLD1Yo="; + stripLen = 1; + excludes = [ + "README.md" + "mx-tester.yml" + ]; + }) + # Move glob_to_regex into the source + (fetchpatch { + url = "https://github.com/matrix-org/mjolnir/commit/6cb461fed424f07bf50a1fdc0693d40ed8bbee12.patch"; + sha256 = "sha256-tqcKXNs+fxwPIvN5sJjdNgcz5KUVHiXgulLHR2redYk="; + stripLen = 1; + }) + ]; + sourceRoot = "./source/synapse_antispam"; propagatedBuildInputs = [ matrix-synapse ]; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a56ef8c835e69..92f6d1f15ac71 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8="; + sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE="; + vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ="; doCheck = false; diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix index 59adcde1a6916..c928fcfbe6dd9 100644 --- a/pkgs/servers/mbtileserver/default.nix +++ b/pkgs/servers/mbtileserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mbtileserver"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "consbio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C6Gz+RBUrjnfJWo4Ou+s/JYJ8iVP9FMYJ/cxJjcVsXk="; + sha256 = "sha256-aa0YsP+SYYDtaSstTfluEe0/+yDl82KHUSss8LZ2gOc="; }; - vendorSha256 = "sha256-36tUTZud0hxH9oZlnKxeK/xzoEzfw3xFMnd/r0srw6U="; + vendorSha256 = "sha256-eVnL+28eOgbR0bjWv7XotcHDl5309EO0wV8AGMslvZw="; meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 990ef950e6bd3..814626fec1257 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.41.5"; + version = "0.42.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "sha256-DH1xy1cTVDNNXyOIaayGHzOi4g0ZukNFFbZjufY+XLk="; + hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,13 +14,15 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src" + runHook postInstall ''; meta = with lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; }; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 59181b05dadfe..a3f151a19aba8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-02-12T00-51-25Z"; + version = "2022-02-18T01-50-10Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-xAzfMyUa81gZgZhfe1XNAFJ6LFXdR2cFCba8aBDg6Rc="; + sha256 = "sha256-4SUmnUrO89hRcr2w1v6qZiY3swlIZsPgmCHa+q+iFK0="; }; - vendorSha256 = "sha256-tw7SUCqQrDrET+GQbSkHaHC4usCapnH+NpILLwm6l9U="; + vendorSha256 = "sha256-5OJntT5ed4pmugB1yw0fa906McREzv5aPuC8vBVx5o0="; doCheck = false; diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 8480cf4e8bf17..cff0f88ba9245 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "4c9LyQb5SZ1IoBayiP0C0ho4hwJDv49DhsuoQIv9bTs="; + sha256 = "05O7NgqlsVu4mdx1+0CZgBvwvBCWYg7nSFknJiXxuoc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mjolnir/node-composition.nix b/pkgs/servers/mjolnir/node-composition.nix index ef810f1b06e7d..7b8937a3647cc 100644 --- a/pkgs/servers/mjolnir/node-composition.nix +++ b/pkgs/servers/mjolnir/node-composition.nix @@ -2,11 +2,11 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/servers/mjolnir/node-deps.nix index 8a10a95cdd814..2a868156806f8 100644 --- a/pkgs/servers/mjolnir/node-deps.nix +++ b/pkgs/servers/mjolnir/node-deps.nix @@ -13,31 +13,31 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.16.0" = { + "@babel/code-frame-7.16.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/helper-validator-identifier-7.15.7" = { + "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/highlight-7.16.0" = { + "@babel/highlight-7.16.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.0"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -67,13 +67,13 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; - "@jest/types-27.2.5" = { + "@jest/types-27.4.2" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "27.2.5"; + version = "27.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz"; - sha512 = "nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz"; + sha512 = "j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg=="; }; }; "@selderee/plugin-htmlparser2-0.6.0" = { @@ -94,15 +94,6 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/axios-0.14.0" = { - name = "_at_types_slash_axios"; - packageName = "@types/axios"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz"; - sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46"; - }; - }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -121,13 +112,13 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/crypto-js-4.0.2" = { + "@types/crypto-js-4.1.0" = { name = "_at_types_slash_crypto-js"; packageName = "@types/crypto-js"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.0.2.tgz"; - sha512 = "sCVniU+h3GcGqxOmng11BRvf9TfN9yIs8KKjB8C8d75W69cpTfZG80gau9yTx5SxF3gvHGbJhdESzzvnjtf3Og=="; + url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.0.tgz"; + sha512 = "DCFfy/vh2lG6qHSGezQ+Sn2Ulf/1Mx51dqOdmOKyW5nMK3maLlxeS3onC7r212OnBM2pBR95HkAmAjjF08YkxQ=="; }; }; "@types/express-4.17.13" = { @@ -139,22 +130,22 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.25" = { + "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.25"; + version = "4.17.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.25.tgz"; - sha512 = "OUJIVfRMFijZukGGwTpKNFprqCCXk5WjNGvUgB/CxxBR40QWSjsNK86+yvGKlCOGc7sbwfHLaXhkG+NsytwBaQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; + sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/istanbul-lib-coverage-2.0.3" = { + "@types/istanbul-lib-coverage-2.0.4" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; + sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; }; }; "@types/istanbul-lib-report-3.0.0" = { @@ -175,13 +166,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jsdom-16.2.13" = { + "@types/jsdom-16.2.14" = { name = "_at_types_slash_jsdom"; packageName = "@types/jsdom"; - version = "16.2.13"; + version = "16.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.13.tgz"; - sha512 = "8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw=="; + url = "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.14.tgz"; + sha512 = "6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w=="; }; }; "@types/json5-0.0.29" = { @@ -202,31 +193,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-9.0.0" = { + "@types/mocha-9.1.0" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz"; - sha512 = "scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz"; + sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg=="; }; }; - "@types/node-16.11.7" = { + "@types/node-16.11.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.7"; + version = "16.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; - sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz"; + sha512 = "DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA=="; }; }; - "@types/parse5-6.0.2" = { + "@types/parse5-6.0.3" = { name = "_at_types_slash_parse5"; packageName = "@types/parse5"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.2.tgz"; - sha512 = "+hQX+WyJAOne7Fh3zF5CxPemILIbuhNcqHHodzK9caYOLnC8pD5efmPleRnw0z++LfKUC/sVNMwk0Gap+B0baA=="; + url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz"; + sha512 = "SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g=="; }; }; "@types/qs-6.9.7" = { @@ -328,13 +319,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.6.0" = { + "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; }; "acorn-globals-6.0.0" = { @@ -382,13 +373,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.8.1" = { + "ajv-8.9.0" = { name = "ajv"; packageName = "ajv"; - version = "8.8.1"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.1.tgz"; - sha512 = "6CiMNDrzv0ZR916u2T+iRunnD60uWmNn8SkdB44/6stVORUg0aAkWO7PkOhpCmjmW8f2I/G/xnowD66fxGyQJg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; }; }; "ansi-colors-4.1.1" = { @@ -535,15 +526,6 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; @@ -589,13 +571,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "body-parser-1.19.0" = { + "body-parser-1.19.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; }; }; "brace-expansion-1.1.11" = { @@ -652,13 +634,13 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "bytes-3.1.0" = { + "bytes-3.1.1" = { name = "bytes"; packageName = "bytes"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; }; }; "callsites-3.1.0" = { @@ -670,13 +652,13 @@ let sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; - "camelcase-6.2.1" = { + "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; - sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; "caseless-0.12.0" = { @@ -706,13 +688,13 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chokidar-3.5.2" = { + "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; "cliui-7.0.4" = { @@ -796,22 +778,22 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "config-3.3.6" = { + "config-3.3.7" = { name = "config"; packageName = "config"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/config/-/config-3.3.6.tgz"; - sha512 = "Hj5916C5HFawjYJat1epbyY2PlAgLpBtDUlr0MxGLgo3p5+7kylyvnRY18PqJHgnNWXcdd0eWDemT7eYWuFgwg=="; + url = "https://registry.npmjs.org/config/-/config-3.3.7.tgz"; + sha512 = "mX/n7GKDYZMqvvkY6e6oBY49W8wxdmQt+ho/5lhwFDXqQW9gI+Ahp8EKp8VAbISPnmf2+Bv5uZK7lKXZ6pf1aA=="; }; }; - "content-disposition-0.5.3" = { + "content-disposition-0.5.4" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; "content-type-1.0.4" = { @@ -823,13 +805,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "cookie-0.4.0" = { + "cookie-0.4.1" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; "cookie-signature-1.0.6" = { @@ -922,13 +904,13 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.3.2" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; "decamelize-4.0.0" = { @@ -1030,13 +1012,13 @@ let sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; }; }; - "diff-sequences-27.0.6" = { + "diff-sequences-27.4.0" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "27.0.6"; + version = "27.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz"; - sha512 = "ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz"; + sha512 = "YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww=="; }; }; "discontinuous-range-1.0.0" = { @@ -1093,13 +1075,13 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.2.2" = { + "domhandler-4.3.0" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; - sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; + sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; }; }; "domutils-2.8.0" = { @@ -1345,22 +1327,22 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "expect-27.3.1" = { + "expect-27.4.6" = { name = "expect"; packageName = "expect"; - version = "27.3.1"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz"; - sha512 = "MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg=="; + url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz"; + sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag=="; }; }; - "express-4.17.1" = { + "express-4.17.2" = { name = "express"; packageName = "express"; - version = "4.17.1"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; }; "extend-3.0.2" = { @@ -1462,22 +1444,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.2.4" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; - }; - }; - "follow-redirects-1.14.5" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha512 = "wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "forever-agent-0.6.1" = { @@ -1579,15 +1552,6 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.7" = { - name = "glob"; - packageName = "glob"; - version = "7.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; - }; - }; "glob-7.2.0" = { name = "glob"; packageName = "glob"; @@ -1624,13 +1588,13 @@ let sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "growl-1.10.5" = { @@ -1759,13 +1723,13 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-errors-1.7.2" = { + "http-errors-1.8.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.2"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; "http-proxy-agent-4.0.1" = { @@ -1840,13 +1804,13 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "inherits-2.0.3" = { + "inherits-2.0.4" = { name = "inherits"; packageName = "inherits"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; "ipaddr.js-1.9.1" = { @@ -1867,13 +1831,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.8.0" = { + "is-core-module-2.8.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; }; "is-extglob-2.1.1" = { @@ -1984,49 +1948,40 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "jest-diff-27.3.1" = { + "jest-diff-27.4.6" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.3.1"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz"; - sha512 = "PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz"; + sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w=="; }; }; - "jest-get-type-27.3.1" = { + "jest-get-type-27.4.0" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "27.3.1"; + version = "27.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz"; - sha512 = "+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg=="; + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz"; + sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="; }; }; - "jest-matcher-utils-27.3.1" = { + "jest-matcher-utils-27.4.6" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.3.1"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz"; - sha512 = "hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz"; + sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA=="; }; }; - "jest-message-util-27.3.1" = { + "jest-message-util-27.4.6" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz"; - sha512 = "bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg=="; - }; - }; - "jest-regex-util-27.0.6" = { - name = "jest-regex-util"; - packageName = "jest-regex-util"; - version = "27.0.6"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz"; - sha512 = "SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz"; + sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA=="; }; }; "js-tokens-4.0.0" = { @@ -2074,13 +2029,13 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; - "json-schema-0.2.3" = { + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-schema-traverse-0.4.1" = { @@ -2137,13 +2092,13 @@ let sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; }; - "jsprim-1.4.1" = { + "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; }; }; "levn-0.3.0" = { @@ -2362,13 +2317,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mocha-9.1.3" = { + "mocha-9.2.0" = { name = "mocha"; packageName = "mocha"; - version = "9.1.3"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz"; - sha512 = "Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz"; + sha512 = "kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q=="; }; }; "moo-0.5.1" = { @@ -2398,15 +2353,6 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { - name = "ms"; - packageName = "ms"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; - }; - }; "ms-2.1.2" = { name = "ms"; packageName = "ms"; @@ -2425,22 +2371,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nanoid-3.1.25" = { + "nanoid-3.2.0" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.25"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; - sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; - }; - }; - "nanoid-3.1.30" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.1.30"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"; - sha512 = "zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; + sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; }; }; "natural-compare-1.4.0" = { @@ -2668,13 +2605,13 @@ let sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; - "picomatch-2.3.0" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "pify-3.0.0" = { @@ -2686,13 +2623,13 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-8.3.11" = { + "postcss-8.4.6" = { name = "postcss"; packageName = "postcss"; - version = "8.3.11"; + version = "8.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz"; - sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz"; + sha512 = "OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA=="; }; }; "prelude-ls-1.1.2" = { @@ -2713,13 +2650,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.3.1" = { + "pretty-format-27.4.6" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.3.1"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz"; - sha512 = "DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz"; + sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g=="; }; }; "progress-2.0.3" = { @@ -2767,22 +2704,22 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "qs-6.5.2" = { + "qs-6.5.3" = { name = "qs"; packageName = "qs"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; + sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.7.0" = { + "qs-6.9.6" = { name = "qs"; packageName = "qs"; - version = "6.7.0"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; }; "railroad-diagrams-1.0.0" = { @@ -2821,13 +2758,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.0" = { + "raw-body-2.4.2" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; }; }; "react-is-17.0.2" = { @@ -2902,13 +2839,13 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "resolve-from-4.0.0" = { @@ -2947,6 +2884,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -2956,13 +2902,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.5.3" = { + "sanitize-html-2.6.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.5.3"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.3.tgz"; - sha512 = "DGATXd1fs/Rm287/i5FBKVYSBBUL0iAaztOA1/RFhEs4yqo39/X52i/q/CwsfCUG5cilmXSBmnQmyWfnKhBlOg=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.6.1.tgz"; + sha512 = "DzjSz3H5qDntD7s1TcWCSoRPmNR8UmA+y+xZQOvWgjATe2Br9ZW73+vD3Pj6Snrg0RuEuJdXgrKvnYuiuixRkA=="; }; }; "saxes-5.0.1" = { @@ -3001,13 +2947,13 @@ let sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; - "send-0.17.1" = { + "send-0.17.2" = { name = "send"; packageName = "send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; }; "serialize-javascript-6.0.0" = { @@ -3019,22 +2965,22 @@ let sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; - "serve-static-1.14.1" = { + "serve-static-1.14.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; }; - "setprototypeof-1.1.1" = { + "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; "shebang-command-2.0.0" = { @@ -3091,22 +3037,22 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-js-0.6.2" = { + "source-map-js-1.0.2" = { name = "source-map-js"; packageName = "source-map-js"; - version = "0.6.2"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; - sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; + sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; - "source-map-support-0.5.20" = { + "source-map-support-0.5.21" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.20"; + version = "0.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; - sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; }; "sprintf-js-1.0.3" = { @@ -3118,13 +3064,13 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; - "sshpk-1.16.1" = { + "sshpk-1.17.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; "stack-utils-2.0.5" = { @@ -3226,6 +3172,15 @@ let sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -3235,13 +3190,13 @@ let sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; - "table-6.7.3" = { + "table-6.8.0" = { name = "table"; packageName = "table"; - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.3.tgz"; - sha512 = "5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw=="; + url = "https://registry.npmjs.org/table/-/table-6.8.0.tgz"; + sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; }; }; "text-table-0.2.0" = { @@ -3262,13 +3217,13 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "toidentifier-1.0.0" = { + "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; "tough-cookie-2.5.0" = { @@ -3316,13 +3271,13 @@ let sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw=="; }; }; - "tsconfig-paths-3.11.0" = { + "tsconfig-paths-3.12.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; - sha512 = "7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; + sha512 = "e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg=="; }; }; "tslib-1.14.1" = { @@ -3406,13 +3361,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.5.2" = { + "typescript-4.5.5" = { name = "typescript"; packageName = "typescript"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz"; - sha512 = "5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; + sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; "typescript-formatter-7.2.2" = { @@ -3577,13 +3532,13 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workerpool-6.1.5" = { + "workerpool-6.2.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.1.5"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; - sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz"; + sha512 = "Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="; }; }; "wrap-ansi-7.0.0" = { @@ -3604,13 +3559,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.5.5" = { + "ws-7.5.6" = { name = "ws"; packageName = "ws"; - version = "7.5.5"; + version = "7.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"; - sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"; + sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; "xml-name-validator-3.0.0" = { @@ -3707,12 +3662,12 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "1.2.1"; - src = ../../../../../../../nix/store/8x9ib7ymf5yj075632mz4qap4m0nzd52-source; + version = "1.3.1"; + src = ../../../../../../../nix/store/k1myvl4f3yvjk9jw4d1b1k1rc8rlwcy2-source; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.15.7" - (sources."@babel/highlight-7.16.0" // { + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -3726,36 +3681,35 @@ let (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."argparse-1.0.10" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) (sources."@humanwhocodes/config-array-0.5.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@jest/types-27.2.5" + sources."@jest/types-27.4.2" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@tootallnate/once-1.1.2" - sources."@types/axios-0.14.0" sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" - sources."@types/crypto-js-4.0.2" + sources."@types/crypto-js-4.1.0" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.25" - sources."@types/istanbul-lib-coverage-2.0.3" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/jsdom-16.2.13" + sources."@types/jsdom-16.2.14" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" - sources."@types/mocha-9.0.0" - sources."@types/node-16.11.7" - sources."@types/parse5-6.0.2" + sources."@types/mocha-9.1.0" + sources."@types/node-16.11.22" + sources."@types/parse5-6.0.3" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" @@ -3766,7 +3720,7 @@ let sources."@ungap/promise-all-settled-1.1.2" sources."abab-2.0.5" sources."accepts-1.3.7" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -3776,7 +3730,7 @@ let sources."acorn-walk-7.2.0" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -3794,25 +3748,28 @@ let sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.4" sources."balanced-match-1.0.2" - sources."basic-auth-2.0.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" sources."bluebird-3.7.2" - sources."body-parser-1.19.0" + sources."body-parser-1.19.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."browser-stdout-1.3.1" sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."callsites-3.1.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."caseless-0.12.0" sources."chalk-4.1.2" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -3820,10 +3777,10 @@ let sources."commander-2.20.3" sources."commandpost-1.4.0" sources."concat-map-0.0.1" - sources."config-3.3.6" - sources."content-disposition-0.5.3" + sources."config-3.3.7" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" @@ -3845,7 +3802,7 @@ let sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff-sequences-27.0.6" + sources."diff-sequences-27.4.0" sources."discontinuous-range-1.0.0" sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" @@ -3855,7 +3812,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."ecc-jsbn-0.1.2" (sources."editorconfig-0.15.3" // { @@ -3877,7 +3834,7 @@ let (sources."eslint-7.32.0" // { dependencies = [ sources."argparse-1.0.10" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."js-yaml-3.14.1" sources."levn-0.4.1" sources."ms-2.1.2" @@ -3909,12 +3866,8 @@ let sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - (sources."expect-27.3.1" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) - sources."express-4.17.1" + sources."expect-27.4.6" + sources."express-4.17.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -3926,8 +3879,7 @@ let sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."follow-redirects-1.14.5" + sources."flatted-3.2.5" sources."forever-agent-0.6.1" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -3942,7 +3894,7 @@ let sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."globals-13.12.0" - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -3954,17 +3906,17 @@ let sources."html-to-text-8.1.0" sources."htmlencode-0.0.4" sources."htmlparser2-6.1.0" - sources."http-errors-1.7.2" + sources."http-errors-1.8.1" (sources."http-proxy-agent-4.0.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.3" sources."ms-2.1.2" ]; }) @@ -3973,10 +3925,10 @@ let sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -3989,25 +3941,24 @@ let sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jest-diff-27.3.1" - sources."jest-get-type-27.3.1" - sources."jest-matcher-utils-27.3.1" - (sources."jest-message-util-27.3.1" // { + sources."jest-diff-27.4.6" + sources."jest-get-type-27.4.0" + sources."jest-matcher-utils-27.4.6" + (sources."jest-message-util-27.4.6" // { dependencies = [ - sources."@babel/code-frame-7.16.0" + sources."@babel/code-frame-7.16.7" ]; }) - sources."jest-regex-util-27.0.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" sources."jsdom-16.7.0" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-2.2.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."levn-0.3.0" sources."locate-path-6.0.0" sources."lodash-4.17.21" @@ -4035,16 +3986,14 @@ let sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - (sources."mocha-9.1.3" // { + (sources."mocha-9.2.0" // { dependencies = [ - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."glob-7.1.7" sources."ms-2.1.3" - sources."nanoid-3.1.25" sources."supports-color-8.1.1" ]; }) @@ -4055,7 +4004,7 @@ let ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.30" + sources."nanoid-3.2.0" sources."natural-compare-1.4.0" sources."nearley-2.20.1" sources."negotiator-0.6.2" @@ -4080,11 +4029,11 @@ let sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."pify-3.0.0" - sources."postcss-8.3.11" + sources."postcss-8.4.6" sources."prelude-ls-1.1.2" - (sources."pretty-format-27.3.1" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -4094,19 +4043,19 @@ let sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."qs-6.9.6" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.2" sources."react-is-17.0.2" sources."readdirp-3.6.0" sources."regexpp-3.2.0" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."qs-6.5.2" + sources."qs-6.5.3" sources."tough-cookie-2.5.0" ]; }) @@ -4118,34 +4067,34 @@ let sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."ret-0.1.15" sources."rimraf-3.0.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sanitize-html-2.5.3" + sources."sanitize-html-2.6.1" sources."saxes-5.0.1" sources."selderee-0.6.0" sources."semver-7.3.5" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) sources."serialize-javascript-6.0.0" - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" + sources."serve-static-1.14.2" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" sources."slash-3.0.0" sources."slice-ansi-4.0.0" sources."source-map-0.6.1" - sources."source-map-js-0.6.2" - sources."source-map-support-0.5.20" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" + sources."sshpk-1.17.0" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -4159,16 +4108,17 @@ let sources."strip-bom-3.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" - (sources."table-6.7.3" // { + (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.8.1" + sources."ajv-8.9.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-2.1.0" sources."ts-mocha-8.0.0" @@ -4178,7 +4128,7 @@ let sources."mkdirp-0.5.5" ]; }) - (sources."tsconfig-paths-3.11.0" // { + (sources."tsconfig-paths-3.12.0" // { dependencies = [ sources."json5-1.0.1" ]; @@ -4206,7 +4156,7 @@ let sources."type-check-0.3.2" sources."type-fest-0.20.2" sources."type-is-1.6.18" - sources."typescript-4.5.2" + sources."typescript-4.5.5" sources."typescript-formatter-7.2.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -4224,10 +4174,10 @@ let sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."word-wrap-1.2.3" - sources."workerpool-6.1.5" + sources."workerpool-6.2.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.5" + sources."ws-7.5.6" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" diff --git a/pkgs/servers/mjolnir/node-env.nix b/pkgs/servers/mjolnir/node-env.nix index 21089c4d5459e..5f055785791ba 100644 --- a/pkgs/servers/mjolnir/node-env.nix +++ b/pkgs/servers/mjolnir/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - cd .. - '' - ) dependencies); + local strippedName - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -79,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -415,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -492,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} diff --git a/pkgs/servers/mjolnir/update.sh b/pkgs/servers/mjolnir/update.sh index 6c7b2fb417b3b..62c0c6eaa7e74 100755 --- a/pkgs/servers/mjolnir/update.sh +++ b/pkgs/servers/mjolnir/update.sh @@ -20,7 +20,7 @@ store_src="$(nix-build . -A mjolnir.src --no-out-link)" cd "$(dirname "${BASH_SOURCE[0]}")" node2nix \ - --nodejs-12 \ + --nodejs-14 \ --development \ --node-env ./node-env.nix \ --output ./node-deps.nix \ diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index b5ae640306896..35d44072a9f0c 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -1,4 +1,6 @@ -{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }: +{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell +, nodePackages, python3, vips, glib, pkg-config +}: # Notes for the upgrade: # * Download the tarball of the new version to use. @@ -10,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-q4w40Do3e4vMluwAb1YwSGMVHO6QRZr8Fa5I+05uzLI="; + sha256 = "sha256-6yw+zp83T6VVa4A9KYX6rzMKG5GoyJ7M8Z+cEHE4uts="; }; buildPhase = '' @@ -35,6 +37,14 @@ mkYarnPackage rec { yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; + pkgConfig.sharp = { + nativeBuildInputs = [ nodePackages.node-gyp python3 pkg-config ]; + buildInputs = [ glib vips ]; + postInstall = '' + node-gyp rebuild + ''; + }; + distPhase = '' runHook preDist diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index dbc39a3aafcb0..0e22150e0e22b 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/grafana/grafana-image-renderer.git" + "url": "http://github.com/grafana/grafana-image-renderer.git" }, "scripts": { "eslint": "eslint . --ext .ts", @@ -14,6 +14,7 @@ "prettier:write": "prettier --list-different \"**/*.ts\" --write", "precommit": "npm run eslint & npm run typecheck", "watch": "tsc-watch --onSuccess \"node build/app.js server --config=dev.json\"", + "watch:debug": "tsc-watch --onSuccess \"cross-env DEBUG=puppeteer-cluster:* node build/app.js server --config=dev.json\"", "build": "tsc", "start": "node build/app.js --config=dev.json" }, @@ -30,8 +31,10 @@ "morgan": "^1.9.0", "on-finished": "^2.3.0", "prom-client": "^11.5.3", - "puppeteer": "^10.0.0", + "puppeteer": "^13.1.3", "puppeteer-cluster": "^0.22.0", + "poolpeteer": "^0.22.0", + "sharp": "0.29.3", "unique-filename": "^1.1.0", "winston": "^3.2.1" }, @@ -39,6 +42,7 @@ "@grafana/eslint-config": "^2.5.0", "@types/express": "^4.11.1", "@types/node": "^14.14.41", + "cross-env": "7.0.3", "@typescript-eslint/eslint-plugin": "^4.32.0", "@typescript-eslint/parser": "^4.32.0", "eslint": "^7.32.0", @@ -49,7 +53,7 @@ "eslint-plugin-react-hooks": "^4.2.0", "husky": "^4.3.8", "lint-staged": "^11.2.0", - "pkg": "^5.4.1", + "pkg": "5.5.2", "prettier": "2.2.1", "tsc-watch": "^4.2.3", "typescript": "^4.3.2" @@ -69,7 +73,7 @@ }, "bin": "build/app.js", "engines": { - "node": ">=14 <15" + "node": ">=14 <=16" }, "volta": { "node": "14.16.1" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index dae82acb1311c..de9fa1f9b9d41 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -1,3848 +1,3878 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== - dependencies: - "@babel/highlight" "^7.10.4" - -"@babel/code-frame@^7.0.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.5": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@7.13.13": - version "7.13.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" - integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== - -"@babel/types@7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd" - integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@dabh/diagnostics@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" - integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== - dependencies: - colorspace "1.1.x" - enabled "2.0.x" - kuler "^2.0.0" - -"@es-joy/jsdoccomment@0.10.8": - version "0.10.8" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz#b3152887e25246410ed4ea569a55926ec13b2b05" - integrity sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ== - dependencies: - comment-parser "1.2.4" - esquery "^1.4.0" - jsdoc-type-pratt-parser "1.1.1" - -"@eslint/eslintrc@^0.4.0", "@eslint/eslintrc@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" - integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== - dependencies: - ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^13.9.0" - ignore "^4.0.6" - import-fresh "^3.2.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - strip-json-comments "^3.1.1" - -"@grafana/eslint-config@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.0.tgz#d028898e201f242748a94d5582f0e14a493f5853" - integrity sha512-JHckBXfUoGYXT18br2n2nTqo4eX7V51/Ec4Y2I7ALh5XsW6OnO+/1AAPymE2J/4WGt3IocW7vJoNV2GRW1JSQg== - dependencies: - "@typescript-eslint/eslint-plugin" "4.28.0" - "@typescript-eslint/parser" "4.28.0" - eslint "7.21.0" - eslint-config-prettier "7.2.0" - eslint-plugin-jsdoc "31.6.1" - eslint-plugin-prettier "3.3.1" - eslint-plugin-react "7.22.0" - eslint-plugin-react-hooks "4.2.0" - prettier "2.2.1" - typescript "4.3.4" - -"@grpc/grpc-js@^1.0": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz#58b687aff93b743aafde237fd2ee9a3259d7f2d8" - integrity sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA== - dependencies: - "@types/node" ">=12.12.47" - -"@grpc/proto-loader@^0.5.4": - version "0.5.6" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" - integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== - dependencies: - lodash.camelcase "^4.3.0" - protobufjs "^6.8.6" - -"@hapi/boom@^9.1.0": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" - integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== - dependencies: - "@hapi/hoek" "9.x.x" - -"@hapi/hoek@9.x.x": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" - integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== - -"@humanwhocodes/config-array@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" - integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== - dependencies: - "@humanwhocodes/object-schema" "^1.2.0" - debug "^4.1.1" - minimatch "^3.0.4" - -"@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= - -"@types/body-parser@*": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" - integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/express-serve-static-core@^4.17.18": - version "4.17.24" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" - integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@^4.11.1": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/json-schema@^7.0.7": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== - -"@types/long@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" - integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== - -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - -"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "16.10.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz#5764ca9aa94470adb4e1185fe2e9f19458992b2e" - integrity sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ== - -"@types/node@^14.14.41": - version "14.17.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.20.tgz#74cc80438fd0467dc4377ee5bbad89a886df3c10" - integrity sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/yauzl@^2.9.1": - version "2.9.2" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" - integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== - dependencies: - "@types/node" "*" - -"@typescript-eslint/eslint-plugin@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz#1a66f03b264844387beb7dc85e1f1d403bd1803f" - integrity sha512-KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ== - dependencies: - "@typescript-eslint/experimental-utils" "4.28.0" - "@typescript-eslint/scope-manager" "4.28.0" - debug "^4.3.1" - functional-red-black-tree "^1.0.1" - regexpp "^3.1.0" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/eslint-plugin@^4.32.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" - integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== - dependencies: - "@typescript-eslint/experimental-utils" "4.33.0" - "@typescript-eslint/scope-manager" "4.33.0" - debug "^4.3.1" - functional-red-black-tree "^1.0.1" - ignore "^5.1.8" - regexpp "^3.1.0" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/experimental-utils@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz#13167ed991320684bdc23588135ae62115b30ee0" - integrity sha512-9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ== - dependencies: - "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.0" - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/typescript-estree" "4.28.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - -"@typescript-eslint/experimental-utils@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" - integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== - dependencies: - "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - -"@typescript-eslint/parser@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz#2404c16751a28616ef3abab77c8e51d680a12caa" - integrity sha512-7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A== - dependencies: - "@typescript-eslint/scope-manager" "4.28.0" - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/typescript-estree" "4.28.0" - debug "^4.3.1" - -"@typescript-eslint/parser@^4.32.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" - integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== - dependencies: - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - debug "^4.3.1" - -"@typescript-eslint/scope-manager@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz#6a3009d2ab64a30fc8a1e257a1a320067f36a0ce" - integrity sha512-eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg== - dependencies: - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/visitor-keys" "4.28.0" - -"@typescript-eslint/scope-manager@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" - integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== - dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - -"@typescript-eslint/types@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz#a33504e1ce7ac51fc39035f5fe6f15079d4dafb0" - integrity sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA== - -"@typescript-eslint/types@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" - integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== - -"@typescript-eslint/typescript-estree@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz#e66d4e5aa2ede66fec8af434898fe61af10c71cf" - integrity sha512-m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ== - dependencies: - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/visitor-keys" "4.28.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/typescript-estree@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" - integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== - dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/visitor-keys@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz#255c67c966ec294104169a6939d96f91c8a89434" - integrity sha512-PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw== - dependencies: - "@typescript-eslint/types" "4.28.0" - eslint-visitor-keys "^2.0.0" - -"@typescript-eslint/visitor-keys@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" - integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== - dependencies: - "@typescript-eslint/types" "4.33.0" - eslint-visitor-keys "^2.0.0" - -accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -acorn-jsx@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^7.4.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv@^6.10.0, ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-escapes@^4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-includes@^3.1.1, array-includes@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" - integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" - is-string "^1.0.7" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array.prototype.flatmap@^1.2.3, array.prototype.flatmap@^1.2.4: - version "1.2.5" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" - integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.19.0" - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" - integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -basic-auth@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" - integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== - dependencies: - safe-buffer "5.1.2" - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bintrees@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" - integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= - -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^3.0.1, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer@^5.2.1, buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-truncate@2.1.0, cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -color-convert@^1.9.0, color-convert@^1.9.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@^1.0.0, color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.5.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" - integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" - integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - -colorette@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" - integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== - -colors@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - -colorspace@1.1.x: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" - integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== - dependencies: - color "3.0.x" - text-hex "1.0.x" - -commander@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8" - integrity sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA== - -comment-parser@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz#e5317d7a2ec22b470dcb54a29b25426c30bf39d8" - integrity sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ== - -comment-parser@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760" - integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw== - -compare-versions@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" - integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -depd@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -devtools-protocol@0.0.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -duplexer@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -enabled@2.0.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" - integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -enquirer@^2.3.5, enquirer@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.19.0, es-abstract@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" - integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - get-intrinsic "^1.1.1" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - is-callable "^1.2.4" - is-negative-zero "^2.0.1" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.1" - is-string "^1.0.7" - is-weakref "^1.0.1" - object-inspect "^1.11.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -eslint-config-prettier@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9" - integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg== - -eslint-config-prettier@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" - integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== - -eslint-plugin-jsdoc@31.6.1: - version "31.6.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz#98040c801500572fff71c984a097d89946f1e450" - integrity sha512-5hCV3u+1VSEUMyfdTl+dpWsioD7tqQr2ILQw+KbXrF42AVxCLO8gnNLR6zDCDjqGGpt79V1sgY0RRchCWuCigg== - dependencies: - comment-parser "1.1.2" - debug "^4.3.1" - jsdoctypeparser "^9.0.0" - lodash "^4.17.20" - regextras "^0.7.1" - semver "^7.3.4" - spdx-expression-parse "^3.0.1" - -eslint-plugin-jsdoc@^36.1.0: - version "36.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.0.tgz#8dfe5f27edfb6aa3812e6d86ccaea849ddc86b03" - integrity sha512-Qpied2AJCQcScxfzTObLKRiP5QgLXjMU/ITjBagEV5p2Q/HpumD1EQtazdRYdjDSwPmXhwOl2yquwOGQ4HOJNw== - dependencies: - "@es-joy/jsdoccomment" "0.10.8" - comment-parser "1.2.4" - debug "^4.3.2" - esquery "^1.4.0" - jsdoc-type-pratt-parser "^1.1.1" - lodash "^4.17.21" - regextras "^0.8.0" - semver "^7.3.5" - spdx-expression-parse "^3.0.1" - -eslint-plugin-prettier@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" - integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-prettier@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" - integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-react-hooks@4.2.0, eslint-plugin-react-hooks@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" - integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== - -eslint-plugin-react@7.22.0: - version "7.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" - integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== - dependencies: - array-includes "^3.1.1" - array.prototype.flatmap "^1.2.3" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.4.1 || ^3.0.0" - object.entries "^1.1.2" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.18.1" - string.prototype.matchall "^4.0.2" - -eslint-plugin-react@^7.26.1: - version "7.26.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e" - integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ== - dependencies: - array-includes "^3.1.3" - array.prototype.flatmap "^1.2.4" - doctrine "^2.1.0" - estraverse "^5.2.0" - jsx-ast-utils "^2.4.1 || ^3.0.0" - minimatch "^3.0.4" - object.entries "^1.1.4" - object.fromentries "^2.0.4" - object.hasown "^1.0.0" - object.values "^1.1.4" - prop-types "^15.7.2" - resolve "^2.0.0-next.3" - semver "^6.3.0" - string.prototype.matchall "^4.0.5" - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint@7.21.0: - version "7.21.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" - integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash "^4.17.20" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.4" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -eslint@^7.32.0: - version "7.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" - integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.3" - "@humanwhocodes/config-array" "^0.5.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" - globals "^13.6.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.9" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== - dependencies: - acorn "^7.4.0" - acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -event-stream@=3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" - integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= - dependencies: - duplexer "~0.1.1" - from "~0" - map-stream "~0.1.0" - pause-stream "0.0.11" - split "0.3" - stream-combiner "~0.0.4" - through "~2.3.1" - -execa@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -express-prom-bundle@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz#f298615879299a58cf8ec1350186f4de91d91fa4" - integrity sha512-tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg== - dependencies: - on-finished "^2.3.0" - url-value-parser "^2.0.0" - -express@^4.16.3: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extract-zip@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== - -fast-glob@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - -fecha@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" - integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-versions@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" - integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== - dependencies: - semver-regex "^3.1.2" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flatted@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" - integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== - -fn.name@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" - integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -from2@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - -from@~0: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-own-enumerable-property-symbols@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" - integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob@^7.1.3: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0, globals@^13.9.0: - version "13.11.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" - integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== - dependencies: - type-fest "^0.20.2" - -globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -google-protobuf@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" - integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= - -graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - -has-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -husky@^4.3.8: - version "4.3.8" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" - integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== - dependencies: - chalk "^4.0.0" - ci-info "^2.0.0" - compare-versions "^3.6.0" - cosmiconfig "^7.0.0" - find-versions "^4.0.0" - opencollective-postinstall "^2.0.2" - pkg-dir "^5.0.0" - please-upgrade-node "^3.2.0" - slash "^3.0.0" - which-pm-runs "^1.0.0" - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== - -ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - -into-stream@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" - integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== - dependencies: - from2 "^2.3.0" - p-is-promise "^3.0.0" - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-callable@^1.1.4, is-callable@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== - -is-core-module@^2.2.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3" - integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ== - dependencies: - has "^1.0.3" - -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== - -is-number-object@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= - -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= - -is-shared-array-buffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" - integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-weakref@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" - integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== - dependencies: - call-bind "^1.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -jsdoc-type-pratt-parser@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f" - integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g== - -jsdoc-type-pratt-parser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz#3482a3833b74a88c95a6ba7253f0c0de3b77b9f5" - integrity sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg== - -jsdoctypeparser@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz#8c97e2fb69315eb274b0f01377eaa5c940bd7b26" - integrity sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -"jsx-ast-utils@^2.4.1 || ^3.0.0": - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" - integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== - dependencies: - array-includes "^3.1.3" - object.assign "^4.1.2" - -kuler@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" - integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -lint-staged@^11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.0.tgz#6b9774a74b3eb4bef5c59fb6475bff84d6853008" - integrity sha512-0KIcRuO4HQS2Su7qWtjrfTXgSklvyIb9Fk9qVWRZkGHa5S81Vj6WBbs+ogQBvHUwLJYq1eQ4R+H82GSak4OM7w== - dependencies: - cli-truncate "2.1.0" - colorette "^1.4.0" - commander "^8.2.0" - cosmiconfig "^7.0.1" - debug "^4.3.2" - enquirer "^2.3.6" - execa "^5.1.1" - listr2 "^3.12.2" - micromatch "^4.0.4" - normalize-path "^3.0.0" - please-upgrade-node "^3.2.0" - string-argv "0.3.1" - stringify-object "3.3.0" - supports-color "8.1.1" - -listr2@^3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.12.2.tgz#2d55cc627111603ad4768a9e87c9c7bb9b49997e" - integrity sha512-64xC2CJ/As/xgVI3wbhlPWVPx0wfTqbUAkpb7bjDi0thSWMqrf07UFhrfsGoo8YSXmF049Rp9C0cjLC8rZxK9A== - dependencies: - cli-truncate "^2.1.0" - colorette "^1.4.0" - log-update "^4.0.0" - p-map "^4.0.0" - rxjs "^6.6.7" - through "^2.3.8" - wrap-ansi "^7.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= - -lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-update@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" - integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== - dependencies: - ansi-escapes "^4.3.0" - cli-cursor "^3.1.0" - slice-ansi "^4.0.0" - wrap-ansi "^6.2.0" - -logform@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz#a3997a05985de2ebd325ae0d166dffc9c6fe6b57" - integrity sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ== - dependencies: - colors "^1.2.1" - fecha "^4.2.0" - ms "^2.1.1" - safe-stable-stringify "^1.1.0" - triple-beam "^1.3.0" - -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - -loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -map-stream@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" - integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -mime-db@1.50.0: - version "1.50.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" - integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== - -mime-types@~2.1.24: - version "2.1.33" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" - integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== - dependencies: - mime-db "1.50.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -morgan@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" - integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== - dependencies: - basic-auth "~2.0.1" - debug "2.6.9" - depd "~2.0.0" - on-finished "~2.3.0" - on-headers "~1.0.2" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multistream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" - integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== - dependencies: - once "^1.4.0" - readable-stream "^3.6.0" - -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -node-abi@^2.7.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== - dependencies: - semver "^5.4.1" - -node-cleanup@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" - integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= - -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-fetch@^2.6.1: - version "2.6.5" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" - integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== - dependencies: - whatwg-url "^5.0.0" - -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npmlog@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== - -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - -object.entries@^1.1.2, object.entries@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" - integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.fromentries@^2.0.2, object.fromentries@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" - integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.hasown@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" - integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.values@^1.1.1, object.values@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" - integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -on-finished@^2.3.0, on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -one-time@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" - integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== - dependencies: - fn.name "1.x.x" - -onetime@^5.1.0, onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -opencollective-postinstall@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" - integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -p-is-promise@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" - integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pause-stream@0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= - dependencies: - through "~2.3" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -pkg-dir@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -pkg-dir@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" - integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== - dependencies: - find-up "^5.0.0" - -pkg-fetch@3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.4.tgz#5372734b12167d4bacd872be348217461b517390" - integrity sha512-ewUD26GP86/8+Fu93zrb30CpJjKOtT4maSgm4SwTX9Ujy1pfdUdv+1PubsY9tTJES0iBYItAtqbfkf7Wu5LV9w== - dependencies: - chalk "^4.1.0" - fs-extra "^9.1.0" - https-proxy-agent "^5.0.0" - node-fetch "^2.6.1" - progress "^2.0.3" - semver "^7.3.5" - yargs "^16.2.0" - -pkg@^5.4.1: - version "5.4.1" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.4.1.tgz#4d824e42c454f32131e471d7cd8d14bfdb3e1c4c" - integrity sha512-iJs3W6MCgeZ4MrH7iZtX6HTqsNzoh2U9rGILL3eOLbQFV43U8WPAzrqRK7cBQGuHx38UXxcGT6G/2yDl/GveRg== - dependencies: - "@babel/parser" "7.13.13" - "@babel/types" "7.13.12" - chalk "^4.1.0" - escodegen "^2.0.0" - fs-extra "^9.1.0" - globby "^11.0.3" - into-stream "^6.0.0" - minimist "^1.2.5" - multistream "^4.1.0" - pkg-fetch "3.2.4" - prebuild-install "6.0.1" - progress "^2.0.3" - resolve "^1.20.0" - stream-meter "^1.0.4" - tslib "2.1.0" - -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - -prebuild-install@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz#5902172f7a40eb67305b96c2a695db32636ee26d" - integrity sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.7.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - which-pm-runs "^1.0.0" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= - -prettier-linter-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" - integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== - dependencies: - fast-diff "^1.1.2" - -prettier@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -progress@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" - integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg== - -progress@^2.0.0, progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -prom-client@^11.5.3: - version "11.5.3" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz#5fedfce1083bac6c2b223738e966d0e1643756f8" - integrity sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q== - dependencies: - tdigest "^0.1.1" - -prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -protobufjs@^6.8.6: - version "6.11.2" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" - integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - -proxy-addr@~2.0.5: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -proxy-from-env@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - -ps-tree@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd" - integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA== - dependencies: - event-stream "=3.3.4" - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -puppeteer-cluster@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz#4ab214671f414f15ad6a94a4b61ed0b4172e86e6" - integrity sha512-hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w== - dependencies: - debug "^4.1.1" - -puppeteer@^10.0.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz#a6465ff97fda0576c4ac29601406f67e6fea3dc7" - integrity sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w== - dependencies: - debug "4.3.1" - devtools-protocol "0.0.901419" - extract-zip "2.0.1" - https-proxy-agent "5.0.0" - node-fetch "2.6.1" - pkg-dir "4.2.0" - progress "2.0.1" - proxy-from-env "1.1.0" - rimraf "3.0.2" - tar-fs "2.0.0" - unbzip2-stream "1.3.3" - ws "7.4.6" - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -react-is@^16.8.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.7: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -regexp.prototype.flags@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -regexpp@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -regextras@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2" - integrity sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w== - -regextras@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217" - integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ== - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve@^1.18.1, resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -resolve@^2.0.0-next.3: - version "2.0.0-next.3" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" - integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rimraf@3.0.2, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -rxjs@^6.6.7: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@^5.0.1, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-stable-stringify@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" - integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -semver-regex@^3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" - integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== - -semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" - integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== - -split@0.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= - dependencies: - through "2" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -stream-combiner@~0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" - integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= - dependencies: - duplexer "~0.1.1" - -stream-meter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d" - integrity sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0= - dependencies: - readable-stream "^2.1.4" - -string-argv@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" - integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== - -string-argv@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz#c5b7bc03fb2b11983ba3a72333dd0559e77e4738" - integrity sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA== - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.5: - version "4.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" - integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - regexp.prototype.flags "^1.3.1" - side-channel "^1.0.4" - -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -stringify-object@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" - integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== - dependencies: - get-own-enumerable-property-symbols "^3.0.0" - is-obj "^1.0.1" - is-regexp "^1.0.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -table@^6.0.4, table@^6.0.9: - version "6.7.2" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" - integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== - dependencies: - ajv "^8.0.1" - lodash.clonedeep "^4.5.0" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - -tar-fs@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" - integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== - dependencies: - chownr "^1.1.1" - mkdirp "^0.5.1" - pump "^3.0.0" - tar-stream "^2.0.0" - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.0.0, tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tdigest@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" - integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= - dependencies: - bintrees "1.0.1" - -text-hex@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" - integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -through@2, through@^2.3.8, through@~2.3, through@~2.3.1: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= - -triple-beam@^1.2.0, triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== - -tsc-watch@^4.2.3: - version "4.5.0" - resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.5.0.tgz#d6884b932822b2c2ccd37f1c1f3748304566a474" - integrity sha512-aXhN4jY+1YEcn/NwCQ/+fHqU43EqOpW+pS+933EPsVEsrKhvyrodPDIjQsk1a1niFrabAK3RIBrRbAslVefEbQ== - dependencies: - cross-spawn "^7.0.3" - node-cleanup "^2.1.2" - ps-tree "^1.2.0" - string-argv "^0.1.1" - strip-ansi "^6.0.0" - -tslib@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - -tslib@^1.8.1, tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= - dependencies: - prelude-ls "~1.1.2" - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typescript@4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" - integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== - -typescript@^4.3.2: - version "4.4.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324" - integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA== - -unbox-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== - dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - which-boxed-primitive "^1.0.2" - -unbzip2-stream@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" - integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg== - dependencies: - buffer "^5.2.1" - through "^2.3.8" - -unique-filename@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -url-value-parser@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz#cd4b8d6754e458d65e8125260c09718d926e6e21" - integrity sha512-FjIX+Q9lYmDM9uYIGdMYfQW0uLbWVwN2NrL2ayAI7BTOvEwzH+VoDdNquwB9h4dFAx+u6mb0ONLa3sHD5DvyvA== - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -v8-compile-cache@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== - dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" - -winston@^3.2.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" - integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== - dependencies: - "@dabh/diagnostics" "^2.0.2" - async "^3.1.0" - is-stream "^2.0.0" - logform "^2.2.0" - one-time "^1.0.0" - readable-stream "^3.4.0" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.4.0" - -word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@7.4.6: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/code-frame@^7.0.0": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== + dependencies: + "@babel/highlight" "^7.16.7" + +"@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@7.16.2": + version "7.16.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.2.tgz#3723cd5c8d8773eef96ce57ea1d9b7faaccd12ac" + integrity sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw== + +"@babel/types@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== + dependencies: + "@babel/helper-validator-identifier" "^7.15.7" + to-fast-properties "^2.0.0" + +"@dabh/diagnostics@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" + integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@es-joy/jsdoccomment@0.10.8": + version "0.10.8" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz#b3152887e25246410ed4ea569a55926ec13b2b05" + integrity sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ== + dependencies: + comment-parser "1.2.4" + esquery "^1.4.0" + jsdoc-type-pratt-parser "1.1.1" + +"@es-joy/jsdoccomment@~0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz#2532b2ecb8576d694011b157c447ed6b12534c70" + integrity sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA== + dependencies: + comment-parser "1.3.0" + esquery "^1.4.0" + jsdoc-type-pratt-parser "~2.2.2" + +"@eslint/eslintrc@^0.4.2", "@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@grafana/eslint-config@^2.5.0": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.2.tgz#4343bdd2dbd362b061395010f209fea316ca3f61" + integrity sha512-LfTKRbeAshEIr5VELcr6dw5U0Er586yeyb5X/IwrfutHwdcrJdepRf1E/LwMVAUoBzJRQfTLErkS9Mw0Xlv/aA== + dependencies: + "@typescript-eslint/eslint-plugin" "5.10.0" + "@typescript-eslint/parser" "5.10.0" + eslint "7.28.0" + eslint-config-prettier "8.3.0" + eslint-plugin-jsdoc "37.7.0" + eslint-plugin-prettier "4.0.0" + eslint-plugin-react "7.28.0" + eslint-plugin-react-hooks "4.3.0" + prettier "2.5.1" + typescript "4.4.4" + +"@grpc/grpc-js@^1.0": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz#dd0237ad7df80a7a24766fe516d7e4a22cb4855e" + integrity sha512-+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw== + dependencies: + "@grpc/proto-loader" "^0.6.4" + "@types/node" ">=12.12.47" + +"@grpc/proto-loader@^0.5.4": + version "0.5.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" + integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== + dependencies: + lodash.camelcase "^4.3.0" + protobufjs "^6.8.6" + +"@grpc/proto-loader@^0.6.4": + version "0.6.9" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7" + integrity sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg== + dependencies: + "@types/long" "^4.0.1" + lodash.camelcase "^4.3.0" + long "^4.0.0" + protobufjs "^6.10.0" + yargs "^16.2.0" + +"@hapi/boom@^9.1.0": + version "9.1.4" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" + integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== + dependencies: + "@hapi/hoek" "9.x.x" + +"@hapi/hoek@9.x.x": + version "9.2.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + +"@types/body-parser@*": + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + dependencies: + "@types/node" "*" + +"@types/express-serve-static-core@^4.17.18": + version "4.17.28" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" + integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@^4.11.1": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/json-schema@^7.0.7", "@types/json-schema@^7.0.9": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + +"@types/long@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== + +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": + version "17.0.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz#33b9b94f789a8fedd30a68efdbca4dbb06b61f20" + integrity sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng== + +"@types/node@^14.14.41": + version "14.18.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.10.tgz#774f43868964f3cfe4ced1f5417fe15818a4eaea" + integrity sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/qs@*": + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/yauzl@^2.9.1": + version "2.9.2" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" + integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== + dependencies: + "@types/node" "*" + +"@typescript-eslint/eslint-plugin@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz#e90afea96dff8620892ad216b0e4ccdf8ee32d3a" + integrity sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ== + dependencies: + "@typescript-eslint/scope-manager" "5.10.0" + "@typescript-eslint/type-utils" "5.10.0" + "@typescript-eslint/utils" "5.10.0" + debug "^4.3.2" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.2.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/eslint-plugin@^4.32.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" + integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== + dependencies: + "@typescript-eslint/experimental-utils" "4.33.0" + "@typescript-eslint/scope-manager" "4.33.0" + debug "^4.3.1" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" + integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/parser@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz#8f59e036f5f1cffc178cacbd5ccdd02aeb96c91c" + integrity sha512-pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw== + dependencies: + "@typescript-eslint/scope-manager" "5.10.0" + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/typescript-estree" "5.10.0" + debug "^4.3.2" + +"@typescript-eslint/parser@^4.32.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" + integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== + dependencies: + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" + debug "^4.3.1" + +"@typescript-eslint/scope-manager@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" + integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== + dependencies: + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" + +"@typescript-eslint/scope-manager@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz#bb5d872e8b9e36203908595507fbc4d3105329cb" + integrity sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg== + dependencies: + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/visitor-keys" "5.10.0" + +"@typescript-eslint/type-utils@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz#8524b9479c19c478347a7df216827e749e4a51e5" + integrity sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ== + dependencies: + "@typescript-eslint/utils" "5.10.0" + debug "^4.3.2" + tsutils "^3.21.0" + +"@typescript-eslint/types@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" + integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== + +"@typescript-eslint/types@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c" + integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ== + +"@typescript-eslint/typescript-estree@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" + integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== + dependencies: + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/typescript-estree@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224" + integrity sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA== + dependencies: + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/visitor-keys" "5.10.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz#c3d152a85da77c400e37281355561c72fb1b5a65" + integrity sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.10.0" + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/typescript-estree" "5.10.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/visitor-keys@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" + integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== + dependencies: + "@typescript-eslint/types" "4.33.0" + eslint-visitor-keys "^2.0.0" + +"@typescript-eslint/visitor-keys@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz#770215497ad67cd15a572b52089991d5dfe06281" + integrity sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ== + dependencies: + "@typescript-eslint/types" "5.10.0" + eslint-visitor-keys "^3.0.0" + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-jsx@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv@^6.10.0, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.1: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" + integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-includes@^3.1.3, array-includes@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + is-string "^1.0.7" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array.prototype.flatmap@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" + integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.19.0" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +basic-auth@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bintrees@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" + integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= + +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +body-parser@1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" + integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== + dependencies: + bytes "3.1.1" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.8.1" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.9.6" + raw-body "2.4.2" + type-is "~1.6.18" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +bytes@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" + integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== + +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chokidar@^3.5.2: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-truncate@2.1.0, cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +color-convert@^1.9.0, color-convert@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0, color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-string@^1.6.0, color-string@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa" + integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== + dependencies: + color-convert "^1.9.3" + color-string "^1.6.0" + +color@^4.0.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz#0c782459a3e98838ea01e4bc0fb43310ca35af78" + integrity sha512-hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ== + dependencies: + color-convert "^2.0.1" + color-string "^1.9.0" + +colorette@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== + +colorette@^2.0.16: + version "2.0.16" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== + +colors@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +colorspace@1.1.x: + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== + dependencies: + color "^3.1.3" + text-hex "1.0.x" + +commander@^8.2.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + +comment-parser@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760" + integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw== + +comment-parser@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.0.tgz#68beb7dbe0849295309b376406730cd16c719c44" + integrity sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA== + +compare-versions@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" + integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +cross-env@7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-fetch@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== + dependencies: + node-fetch "2.6.7" + +cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4, debug@4.3.3, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@^0.1.3, deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + +detect-libc@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" + integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== + +devtools-protocol@0.0.960912: + version "0.0.960912" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.960912.tgz#411c1fa355eddb72f06c4a8743f2808766db6245" + integrity sha512-I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg== + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +duplexer@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enquirer@^2.3.5, enquirer@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.19.0, es-abstract@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.1" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +eslint-config-prettier@8.3.0, eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + +eslint-plugin-jsdoc@37.7.0: + version "37.7.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.0.tgz#975d9f18cb0520dde7a2b0db5f4421dfee3fdd17" + integrity sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA== + dependencies: + "@es-joy/jsdoccomment" "~0.18.0" + comment-parser "1.3.0" + debug "^4.3.3" + escape-string-regexp "^4.0.0" + esquery "^1.4.0" + regextras "^0.8.0" + semver "^7.3.5" + spdx-expression-parse "^3.0.1" + +eslint-plugin-jsdoc@^36.1.0: + version "36.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz#124cd0e53a5d07f01ebde916a96dd1a6009625d6" + integrity sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ== + dependencies: + "@es-joy/jsdoccomment" "0.10.8" + comment-parser "1.2.4" + debug "^4.3.2" + esquery "^1.4.0" + jsdoc-type-pratt-parser "^1.1.1" + lodash "^4.17.21" + regextras "^0.8.0" + semver "^7.3.5" + spdx-expression-parse "^3.0.1" + +eslint-plugin-prettier@4.0.0, eslint-plugin-prettier@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" + integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-react-hooks@4.3.0, eslint-plugin-react-hooks@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== + +eslint-plugin-react@7.28.0, eslint-plugin-react@^7.26.1: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf" + integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw== + dependencies: + array-includes "^3.1.4" + array.prototype.flatmap "^1.2.5" + doctrine "^2.1.0" + estraverse "^5.3.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.0.4" + object.entries "^1.1.5" + object.fromentries "^2.0.5" + object.hasown "^1.1.0" + object.values "^1.1.5" + prop-types "^15.7.2" + resolve "^2.0.0-next.3" + semver "^6.3.0" + string.prototype.matchall "^4.0.6" + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1" + integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ== + +eslint@7.28.0: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" + integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +eslint@^7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +event-stream@=3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" + integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= + dependencies: + duplexer "~0.1.1" + from "~0" + map-stream "~0.1.0" + pause-stream "0.0.11" + split "0.3" + stream-combiner "~0.0.4" + through "~2.3.1" + +execa@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +express-prom-bundle@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz#f298615879299a58cf8ec1350186f4de91d91fa4" + integrity sha512-tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg== + dependencies: + on-finished "^2.3.0" + url-value-parser "^2.0.0" + +express@^4.16.3: + version "4.17.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" + integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.1" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.4.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.7" + qs "6.9.6" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.17.2" + serve-static "1.14.2" + setprototypeof "1.2.0" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extract-zip@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + +fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +fecha@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" + integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-versions@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" + integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== + dependencies: + semver-regex "^3.1.2" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== + +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +from2@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +from@~0: + version "0.1.7" + resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.3: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^13.6.0, globals@^13.9.0: + version "13.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" + integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== + dependencies: + type-fest "^0.20.2" + +globby@^11.0.3, globby@^11.0.4: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +google-protobuf@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" + integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= + +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +http-errors@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.1" + +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +husky@^4.3.8: + version "4.3.8" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" + integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== + dependencies: + chalk "^4.0.0" + ci-info "^2.0.0" + compare-versions "^3.6.0" + cosmiconfig "^7.0.0" + find-versions "^4.0.0" + opencollective-postinstall "^2.0.2" + pkg-dir "^5.0.0" + please-upgrade-node "^3.2.0" + slash "^3.0.0" + which-pm-runs "^1.0.0" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +ignore@^5.1.8, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + +into-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" + integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== + dependencies: + from2 "^2.3.0" + p-is-promise "^3.0.0" + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + +is-core-module@^2.2.0, is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== + dependencies: + has "^1.0.3" + +is-date-object@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-negative-zero@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + +is-number-object@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-weakref@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsdoc-type-pratt-parser@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f" + integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g== + +jsdoc-type-pratt-parser@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz#3482a3833b74a88c95a6ba7253f0c0de3b77b9f5" + integrity sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg== + +jsdoc-type-pratt-parser@~2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz#a85e407ac502b444dc23333aa4d6d0dc83f76187" + integrity sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" + integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== + dependencies: + array-includes "^3.1.3" + object.assign "^4.1.2" + +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +lint-staged@^11.2.0: + version "11.2.6" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.6.tgz#f477b1af0294db054e5937f171679df63baa4c43" + integrity sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg== + dependencies: + cli-truncate "2.1.0" + colorette "^1.4.0" + commander "^8.2.0" + cosmiconfig "^7.0.1" + debug "^4.3.2" + enquirer "^2.3.6" + execa "^5.1.1" + listr2 "^3.12.2" + micromatch "^4.0.4" + normalize-path "^3.0.0" + please-upgrade-node "^3.2.0" + string-argv "0.3.1" + stringify-object "3.3.0" + supports-color "8.1.1" + +listr2@^3.12.2: + version "3.14.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e" + integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g== + dependencies: + cli-truncate "^2.1.0" + colorette "^2.0.16" + log-update "^4.0.0" + p-map "^4.0.0" + rfdc "^1.3.0" + rxjs "^7.5.1" + through "^2.3.8" + wrap-ansi "^7.0.0" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-update@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" + integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== + dependencies: + ansi-escapes "^4.3.0" + cli-cursor "^3.1.0" + slice-ansi "^4.0.0" + wrap-ansi "^6.2.0" + +logform@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.2.tgz#68babe6a74ab09a1fd15a9b1e6cbc7713d41cb5b" + integrity sha512-V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA== + dependencies: + colors "1.4.0" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^1.1.0" + triple-beam "^1.3.0" + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +map-stream@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" + integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== + +mime-types@~2.1.24: + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + dependencies: + mime-db "1.51.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +morgan@^1.9.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== + dependencies: + basic-auth "~2.0.1" + debug "2.6.9" + depd "~2.0.0" + on-finished "~2.3.0" + on-headers "~1.0.2" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multistream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" + integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== + dependencies: + once "^1.4.0" + readable-stream "^3.6.0" + +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +node-abi@^2.21.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== + dependencies: + semver "^5.4.1" + +node-abi@^3.3.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.7.0.tgz#ed980f6dbb6db9ff3b31aeb27d43cd9b096f6e9e" + integrity sha512-3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ== + dependencies: + semver "^7.3.5" + +node-addon-api@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + +node-cleanup@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" + integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= + +node-fetch@2.6.7, node-fetch@^2.6.6: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.entries@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" + integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.fromentries@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" + integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.hasown@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" + integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.values@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +on-finished@^2.3.0, on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" + +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +opencollective-postinstall@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + +p-is-promise@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" + integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6, path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pause-stream@0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + dependencies: + through "~2.3" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pkg-dir@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pkg-dir@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== + dependencies: + find-up "^5.0.0" + +pkg-fetch@3.2.6: + version "3.2.6" + resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.6.tgz#8473e1da5763522c4c3c051917db7274b75836fa" + integrity sha512-Q8fx6SIT022g0cdSE4Axv/xpfHeltspo2gg1KsWRinLQZOTRRAtOOaEFghA1F3jJ8FVsh8hGrL/Pb6Ea5XHIFw== + dependencies: + chalk "^4.1.2" + fs-extra "^9.1.0" + https-proxy-agent "^5.0.0" + node-fetch "^2.6.6" + progress "^2.0.3" + semver "^7.3.5" + tar-fs "^2.1.1" + yargs "^16.2.0" + +pkg@5.5.2: + version "5.5.2" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.5.2.tgz#c21ca9b5cb48feceb3b158c17df855ada350086d" + integrity sha512-pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA== + dependencies: + "@babel/parser" "7.16.2" + "@babel/types" "7.16.0" + chalk "^4.1.2" + escodegen "^2.0.0" + fs-extra "^9.1.0" + globby "^11.0.4" + into-stream "^6.0.0" + minimist "^1.2.5" + multistream "^4.1.0" + pkg-fetch "3.2.6" + prebuild-install "6.1.4" + progress "^2.0.3" + resolve "^1.20.0" + stream-meter "^1.0.4" + tslib "2.3.1" + +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + +poolpeteer@^0.22.0: + version "0.22.20" + resolved "https://registry.yarnpkg.com/poolpeteer/-/poolpeteer-0.22.20.tgz#0079b8bb96b6d576379ebdfcfe5291ca7cd79430" + integrity sha512-+bEpQoW5YpmZ3fUEhdL9tcgYVULHc5ylI140QDka1F4a6ew9Jv3bWHpkgrR5OLeEbHdfSdJZOXIysna3GgRkIw== + dependencies: + debug "^4.1.1" + +prebuild-install@6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.21.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prebuild-install@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" + integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + +prettier@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" + integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@2.0.3, progress@^2.0.0, progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +prom-client@^11.5.3: + version "11.5.3" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz#5fedfce1083bac6c2b223738e966d0e1643756f8" + integrity sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q== + dependencies: + tdigest "^0.1.1" + +prop-types@^15.7.2: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + +protobufjs@^6.10.0, protobufjs@^6.8.6: + version "6.11.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" + integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.1" + "@types/node" ">=13.7.0" + long "^4.0.0" + +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +proxy-from-env@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +ps-tree@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd" + integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA== + dependencies: + event-stream "=3.3.4" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +puppeteer-cluster@^0.22.0: + version "0.22.0" + resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz#4ab214671f414f15ad6a94a4b61ed0b4172e86e6" + integrity sha512-hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w== + dependencies: + debug "^4.1.1" + +puppeteer@^13.1.3: + version "13.3.2" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.3.2.tgz#4ff1cf6e2009df29fd80038bc702dc067776f79d" + integrity sha512-TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg== + dependencies: + cross-fetch "3.1.5" + debug "4.3.3" + devtools-protocol "0.0.960912" + extract-zip "2.0.1" + https-proxy-agent "5.0.0" + pkg-dir "4.2.0" + progress "2.0.3" + proxy-from-env "1.1.0" + rimraf "3.0.2" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + ws "8.5.0" + +qs@6.9.6: + version "6.9.6" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" + integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== + dependencies: + bytes "3.1.1" + http-errors "1.8.1" + iconv-lite "0.4.24" + unpipe "1.0.0" + +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-is@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +regexp.prototype.flags@^1.3.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" + integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +regexpp@^3.1.0, regexpp@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + +regextras@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217" + integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve@^1.20.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + dependencies: + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rfdc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" + integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== + +rimraf@3.0.2, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +rxjs@^7.5.1: + version "7.5.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.2.tgz#11e4a3a1dfad85dbf7fb6e33cbba17668497490b" + integrity sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w== + dependencies: + tslib "^2.1.0" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-stable-stringify@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" + integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== + +safe-stable-stringify@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" + integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver-regex@^3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" + integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== + +semver@^5.4.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.2.1, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +send@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "1.8.1" + mime "1.6.0" + ms "2.1.3" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serve-static@1.14.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.2" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +sharp@0.29.3: + version "0.29.3" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.3.tgz#0da183d626094c974516a48fab9b3e4ba92eb5c2" + integrity sha512-fKWUuOw77E4nhpyzCCJR1ayrttHoFHBT2U/kR/qEMRhvPEcluG4BKj324+SCO1e84+knXHwhJ1HHJGnUt4ElGA== + dependencies: + color "^4.0.1" + detect-libc "^1.0.3" + node-addon-api "^4.2.0" + prebuild-install "^7.0.0" + semver "^7.3.5" + simple-get "^4.0.0" + tar-fs "^2.1.1" + tunnel-agent "^0.6.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55" + integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA== + dependencies: + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== + +split@0.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" + integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= + dependencies: + through "2" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-combiner@~0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" + integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= + dependencies: + duplexer "~0.1.1" + +stream-meter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d" + integrity sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0= + dependencies: + readable-stream "^2.1.4" + +string-argv@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + +string-argv@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz#c5b7bc03fb2b11983ba3a72333dd0559e77e4738" + integrity sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA== + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string.prototype.matchall@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" + integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +stringify-object@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== + dependencies: + get-own-enumerable-property-symbols "^3.0.0" + is-obj "^1.0.1" + is-regexp "^1.0.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +table@^6.0.9: + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + +tar-fs@2.1.1, tar-fs@^2.0.0, tar-fs@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tdigest@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" + integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= + dependencies: + bintrees "1.0.1" + +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + +through@2, through@^2.3.8, through@~2.3, through@~2.3.1: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + +triple-beam@^1.2.0, triple-beam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== + +tsc-watch@^4.2.3: + version "4.6.0" + resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.6.0.tgz#a0eba1300cbe3048ab6d3a3e06de47141b613beb" + integrity sha512-DRMADjFe44EDWb+YMIOj4b83UrU6le27L3/o0/9FlmA01ikFd5Dl9RD5h1hpeh0mQdIqXvwfHZszCcjhH3bAmQ== + dependencies: + cross-spawn "^7.0.3" + node-cleanup "^2.1.2" + ps-tree "^1.2.0" + string-argv "^0.1.1" + strip-ansi "^6.0.0" + +tslib@2.3.1, tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + +tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + +type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typescript@4.4.4: + version "4.4.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c" + integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== + +typescript@^4.3.2: + version "4.5.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" + integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + +unbzip2-stream@1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + +unique-filename@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-value-parser@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.1.0.tgz#fe1ae776122b2eea4bbf284896bbdcd7fc75e1fa" + integrity sha512-gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +winston-transport@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.2.tgz#554efe3fce229d046df006e0e3c411d240652e51" + integrity sha512-9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw== + dependencies: + logform "^2.3.2" + readable-stream "^3.4.0" + triple-beam "^1.2.0" + +winston@^3.2.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.5.1.tgz#b25cc899d015836dbf8c583dec8c4c4483a0da2e" + integrity sha512-tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA== + dependencies: + "@dabh/diagnostics" "^2.0.2" + async "^3.2.3" + is-stream "^2.0.0" + logform "^2.3.2" + one-time "^1.0.0" + readable-stream "^3.4.0" + safe-stable-stringify "^2.3.1" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.4.2" + +word-wrap@^1.2.3, word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index f72f4e59bf0e7..556b6eef845b0 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -6,47 +6,47 @@ path = fetchurl { name = "_babel_code_frame___code_frame_7.12.11.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; } { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; - sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha1 = "220df993bfe904a4a6b02ab4f3385a5ebf6e2389"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; } { - name = "_babel_highlight___highlight_7.14.5.tgz"; + name = "_babel_highlight___highlight_7.16.10.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; - sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + name = "_babel_highlight___highlight_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; } { - name = "_babel_parser___parser_7.13.13.tgz"; + name = "_babel_parser___parser_7.16.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz"; - sha1 = "42f03862f4aed50461e543270916b47dd501f0df"; + name = "_babel_parser___parser_7.16.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.2.tgz"; + sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="; }; } { - name = "_babel_types___types_7.13.12.tgz"; + name = "_babel_types___types_7.16.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz"; - sha1 = "edbf99208ef48852acdff1c8a681a1e4ade580cd"; + name = "_babel_types___types_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; + sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; } { @@ -62,7 +62,15 @@ path = fetchurl { name = "_es_joy_jsdoccomment___jsdoccomment_0.10.8.tgz"; url = "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz"; - sha1 = "b3152887e25246410ed4ea569a55926ec13b2b05"; + sha512 = "3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ=="; + }; + } + { + name = "_es_joy_jsdoccomment___jsdoccomment_0.18.0.tgz"; + path = fetchurl { + name = "_es_joy_jsdoccomment___jsdoccomment_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz"; + sha512 = "TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA=="; }; } { @@ -70,23 +78,23 @@ path = fetchurl { name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; - sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; } { - name = "_grafana_eslint_config___eslint_config_2.5.0.tgz"; + name = "_grafana_eslint_config___eslint_config_2.5.2.tgz"; path = fetchurl { - name = "_grafana_eslint_config___eslint_config_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.0.tgz"; - sha1 = "d028898e201f242748a94d5582f0e14a493f5853"; + name = "_grafana_eslint_config___eslint_config_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.2.tgz"; + sha512 = "LfTKRbeAshEIr5VELcr6dw5U0Er586yeyb5X/IwrfutHwdcrJdepRf1E/LwMVAUoBzJRQfTLErkS9Mw0Xlv/aA=="; }; } { - name = "_grpc_grpc_js___grpc_js_1.3.7.tgz"; + name = "_grpc_grpc_js___grpc_js_1.5.4.tgz"; path = fetchurl { - name = "_grpc_grpc_js___grpc_js_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"; - sha1 = "58b687aff93b743aafde237fd2ee9a3259d7f2d8"; + name = "_grpc_grpc_js___grpc_js_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz"; + sha512 = "+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw=="; }; } { @@ -94,7 +102,15 @@ path = fetchurl { name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; - sha1 = "1dea4b8a6412b05e2d58514d507137b63a52a98d"; + sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; + }; + } + { + name = "_grpc_proto_loader___proto_loader_0.6.9.tgz"; + path = fetchurl { + name = "_grpc_proto_loader___proto_loader_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz"; + sha512 = "UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg=="; }; } { @@ -102,7 +118,7 @@ path = fetchurl { name = "_hapi_boom___boom_9.1.4.tgz"; url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz"; - sha1 = "1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6"; + sha512 = "Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw=="; }; } { @@ -110,7 +126,7 @@ path = fetchurl { name = "_hapi_hoek___hoek_9.2.1.tgz"; url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz"; - sha1 = "9551142a1980503752536b5050fd99f4a7f13b17"; + sha512 = "gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="; }; } { @@ -118,15 +134,15 @@ path = fetchurl { name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; - sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; } { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; - sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; } { @@ -134,7 +150,7 @@ path = fetchurl { name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; } { @@ -142,7 +158,7 @@ path = fetchurl { name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; } { @@ -150,7 +166,7 @@ path = fetchurl { name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; } { @@ -158,7 +174,7 @@ path = fetchurl { name = "_protobufjs_aspromise___aspromise_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; - sha1 = "9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"; + sha1 = "m4sMxmPWaafY9vXQiToU00jzD78="; }; } { @@ -166,7 +182,7 @@ path = fetchurl { name = "_protobufjs_base64___base64_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz"; - sha1 = "4c85730e59b9a1f1f349047dbf24296034bb2735"; + sha512 = "AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="; }; } { @@ -174,7 +190,7 @@ path = fetchurl { name = "_protobufjs_codegen___codegen_2.0.4.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz"; - sha1 = "7ef37f0d010fb028ad1ad59722e506d9262815cb"; + sha512 = "YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="; }; } { @@ -182,7 +198,7 @@ path = fetchurl { name = "_protobufjs_eventemitter___eventemitter_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; - sha1 = "355cbc98bafad5978f9ed095f397621f1d066b70"; + sha1 = "NVy8mLr61ZePntCV85diHx0Ga3A="; }; } { @@ -190,7 +206,7 @@ path = fetchurl { name = "_protobufjs_fetch___fetch_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz"; - sha1 = "ba99fb598614af65700c1619ff06d454b0d84c45"; + sha1 = "upn7WYYUr2VwDBYZ/wbUVLDYTEU="; }; } { @@ -198,7 +214,7 @@ path = fetchurl { name = "_protobufjs_float___float_1.0.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz"; - sha1 = "5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"; + sha1 = "Xp4avctz/Ap8uLKR33jIy9l7h9E="; }; } { @@ -206,7 +222,7 @@ path = fetchurl { name = "_protobufjs_inquire___inquire_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz"; - sha1 = "ff200e3e7cf2429e2dcafc1140828e8cc638f089"; + sha1 = "/yAOPnzyQp4tyvwRQIKOjMY48Ik="; }; } { @@ -214,7 +230,7 @@ path = fetchurl { name = "_protobufjs_path___path_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz"; - sha1 = "6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"; + sha1 = "bMKyDFya1q0NzP0hynZz2Nf79o0="; }; } { @@ -222,7 +238,7 @@ path = fetchurl { name = "_protobufjs_pool___pool_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz"; - sha1 = "09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"; + sha1 = "Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="; }; } { @@ -230,15 +246,15 @@ path = fetchurl { name = "_protobufjs_utf8___utf8_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz"; - sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; + sha1 = "p3c2C1s5oaLlEG+OhY8v0tBgxXA="; }; } { - name = "_types_body_parser___body_parser_1.19.1.tgz"; + name = "_types_body_parser___body_parser_1.19.2.tgz"; path = fetchurl { - name = "_types_body_parser___body_parser_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; - sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; + name = "_types_body_parser___body_parser_1.19.2.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; } { @@ -246,15 +262,15 @@ path = fetchurl { name = "_types_connect___connect_3.4.35.tgz"; url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; - sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.28.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; - sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.28.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; + sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; } { @@ -262,7 +278,7 @@ path = fetchurl { name = "_types_express___express_4.17.13.tgz"; url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; - sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; } { @@ -270,7 +286,7 @@ path = fetchurl { name = "_types_json_schema___json_schema_7.0.9.tgz"; url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; - sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; } { @@ -278,7 +294,7 @@ path = fetchurl { name = "_types_long___long_4.0.1.tgz"; url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz"; - sha1 = "459c65fa1867dafe6a8f322c4c51695663cc55e9"; + sha512 = "5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="; }; } { @@ -286,23 +302,23 @@ path = fetchurl { name = "_types_mime___mime_1.3.2.tgz"; url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; - sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; } { - name = "_types_node___node_16.10.2.tgz"; + name = "_types_node___node_17.0.14.tgz"; path = fetchurl { - name = "_types_node___node_16.10.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz"; - sha1 = "5764ca9aa94470adb4e1185fe2e9f19458992b2e"; + name = "_types_node___node_17.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz"; + sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng=="; }; } { - name = "_types_node___node_14.17.20.tgz"; + name = "_types_node___node_14.18.10.tgz"; path = fetchurl { - name = "_types_node___node_14.17.20.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.20.tgz"; - sha1 = "74cc80438fd0467dc4377ee5bbad89a886df3c10"; + name = "_types_node___node_14.18.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.10.tgz"; + sha512 = "6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ=="; }; } { @@ -310,7 +326,7 @@ path = fetchurl { name = "_types_parse_json___parse_json_4.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; } { @@ -318,7 +334,7 @@ path = fetchurl { name = "_types_qs___qs_6.9.7.tgz"; url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; - sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; } { @@ -326,7 +342,7 @@ path = fetchurl { name = "_types_range_parser___range_parser_1.2.4.tgz"; url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; } { @@ -334,7 +350,7 @@ path = fetchurl { name = "_types_serve_static___serve_static_1.13.10.tgz"; url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; - sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; } { @@ -342,15 +358,15 @@ path = fetchurl { name = "_types_yauzl___yauzl_2.9.2.tgz"; url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz"; - sha1 = "1a66f03b264844387beb7dc85e1f1d403bd1803f"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz"; + sha512 = "XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ=="; }; } { @@ -358,15 +374,7 @@ path = fetchurl { name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz"; - sha1 = "c24dc7c8069c7706bc40d99f6fa87edcb2005276"; - }; - } - { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz"; - sha1 = "13167ed991320684bdc23588135ae62115b30ee0"; + sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; } { @@ -374,15 +382,15 @@ path = fetchurl { name = "_typescript_eslint_experimental_utils___experimental_utils_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz"; - sha1 = "6f2a786a4209fa2222989e9380b5331b2810f7fd"; + sha512 = "zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q=="; }; } { - name = "_typescript_eslint_parser___parser_4.28.0.tgz"; + name = "_typescript_eslint_parser___parser_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz"; - sha1 = "2404c16751a28616ef3abab77c8e51d680a12caa"; + name = "_typescript_eslint_parser___parser_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz"; + sha512 = "pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw=="; }; } { @@ -390,31 +398,31 @@ path = fetchurl { name = "_typescript_eslint_parser___parser_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz"; - sha1 = "dfe797570d9694e560528d18eecad86c8c744899"; + sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.0.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz"; - sha1 = "6a3009d2ab64a30fc8a1e257a1a320067f36a0ce"; + name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; + sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; - sha1 = "d38e49280d983e8772e29121cf8c6e9221f280a3"; + name = "_typescript_eslint_scope_manager___scope_manager_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz"; + sha512 = "tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg=="; }; } { - name = "_typescript_eslint_types___types_4.28.0.tgz"; + name = "_typescript_eslint_type_utils___type_utils_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz"; - sha1 = "a33504e1ce7ac51fc39035f5fe6f15079d4dafb0"; + name = "_typescript_eslint_type_utils___type_utils_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz"; + sha512 = "TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ=="; }; } { @@ -422,15 +430,15 @@ path = fetchurl { name = "_typescript_eslint_types___types_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz"; - sha1 = "a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"; + sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.0.tgz"; + name = "_typescript_eslint_types___types_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz"; - sha1 = "e66d4e5aa2ede66fec8af434898fe61af10c71cf"; + name = "_typescript_eslint_types___types_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz"; + sha512 = "wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ=="; }; } { @@ -438,15 +446,23 @@ path = fetchurl { name = "_typescript_eslint_typescript_estree___typescript_estree_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; - sha1 = "0dfb51c2908f68c5c08d82aefeaf166a17c24609"; + sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz"; - sha1 = "255c67c966ec294104169a6939d96f91c8a89434"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz"; + sha512 = "x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA=="; + }; + } + { + name = "_typescript_eslint_utils___utils_5.10.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_utils___utils_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz"; + sha512 = "IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg=="; }; } { @@ -454,7 +470,15 @@ path = fetchurl { name = "_typescript_eslint_visitor_keys___visitor_keys_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; - sha1 = "2a22f77a41604289b7a186586e9ec48ca92ef1dd"; + sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_5.10.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz"; + sha512 = "GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ=="; }; } { @@ -462,7 +486,7 @@ path = fetchurl { name = "accepts___accepts_1.3.7.tgz"; url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; } { @@ -470,7 +494,7 @@ path = fetchurl { name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; } { @@ -478,7 +502,7 @@ path = fetchurl { name = "acorn___acorn_7.4.1.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; } { @@ -486,7 +510,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -494,7 +518,7 @@ path = fetchurl { name = "aggregate_error___aggregate_error_3.1.0.tgz"; url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; } { @@ -502,15 +526,15 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { - name = "ajv___ajv_8.6.3.tgz"; + name = "ajv___ajv_8.9.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.6.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; - sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; + name = "ajv___ajv_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; }; } { @@ -518,7 +542,7 @@ path = fetchurl { name = "ansi_colors___ansi_colors_4.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; } { @@ -534,15 +558,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - } - { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -550,7 +566,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -558,7 +574,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -566,7 +582,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -574,7 +590,7 @@ path = fetchurl { name = "anymatch___anymatch_3.1.2.tgz"; url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; - sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; } { @@ -582,7 +598,7 @@ path = fetchurl { name = "aproba___aproba_1.2.0.tgz"; url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; } { @@ -590,7 +606,7 @@ path = fetchurl { name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha1 = "b15474a932adab4ff8a50d9adfa7e4e926f21146"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -598,7 +614,7 @@ path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; } { @@ -606,7 +622,7 @@ path = fetchurl { name = "array_flatten___array_flatten_1.1.1.tgz"; url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + sha1 = "ml9pkFGx5wczKPKgCJaLZOopVdI="; }; } { @@ -614,7 +630,7 @@ path = fetchurl { name = "array_includes___array_includes_3.1.4.tgz"; url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz"; - sha1 = "f5b493162c760f3539631f005ba2bb46acb45ba9"; + sha512 = "ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw=="; }; } { @@ -622,7 +638,7 @@ path = fetchurl { name = "array_union___array_union_2.1.0.tgz"; url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; - sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; } { @@ -630,7 +646,7 @@ path = fetchurl { name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz"; - sha1 = "908dc82d8a406930fdf38598d51e7411d18d4446"; + sha512 = "08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA=="; }; } { @@ -638,15 +654,15 @@ path = fetchurl { name = "astral_regex___astral_regex_2.0.0.tgz"; url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { - name = "async___async_3.2.1.tgz"; + name = "async___async_3.2.3.tgz"; path = fetchurl { - name = "async___async_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; - sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; + name = "async___async_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; } { @@ -654,7 +670,7 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { @@ -662,7 +678,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -670,7 +686,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -678,7 +694,7 @@ path = fetchurl { name = "basic_auth___basic_auth_2.0.1.tgz"; url = "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz"; - sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; } { @@ -686,7 +702,7 @@ path = fetchurl { name = "binary_extensions___binary_extensions_2.2.0.tgz"; url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; } { @@ -694,7 +710,7 @@ path = fetchurl { name = "bintrees___bintrees_1.0.1.tgz"; url = "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz"; - sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; + sha1 = "DmVcm5wkNeqraL9AJyJtK1WjRSQ="; }; } { @@ -702,15 +718,15 @@ path = fetchurl { name = "bl___bl_4.1.0.tgz"; url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; } { - name = "body_parser___body_parser_1.19.0.tgz"; + name = "body_parser___body_parser_1.19.1.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + name = "body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; }; } { @@ -718,7 +734,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -726,7 +742,7 @@ path = fetchurl { name = "braces___braces_3.0.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; } { @@ -734,7 +750,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -742,15 +758,15 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { - name = "bytes___bytes_3.1.0.tgz"; + name = "bytes___bytes_3.1.1.tgz"; path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + name = "bytes___bytes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; }; } { @@ -758,7 +774,7 @@ path = fetchurl { name = "call_bind___call_bind_1.0.2.tgz"; url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; } { @@ -766,7 +782,7 @@ path = fetchurl { name = "callsites___callsites_3.1.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } { @@ -774,7 +790,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -782,15 +798,15 @@ path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { - name = "chokidar___chokidar_3.5.2.tgz"; + name = "chokidar___chokidar_3.5.3.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; - sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; + name = "chokidar___chokidar_3.5.3.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; } { @@ -798,7 +814,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -806,7 +822,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -814,7 +830,7 @@ path = fetchurl { name = "clean_stack___clean_stack_2.2.0.tgz"; url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; - sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; } { @@ -822,7 +838,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_3.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; } { @@ -830,7 +846,7 @@ path = fetchurl { name = "cli_truncate___cli_truncate_2.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; - sha1 = "c39e28bf05edcde5be3b98992a22deed5a2b93c7"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -838,7 +854,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -846,7 +862,7 @@ path = fetchurl { name = "code_point_at___code_point_at_1.1.0.tgz"; url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -854,7 +870,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -862,7 +878,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -870,7 +886,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -878,23 +894,31 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + } + { + name = "color_string___color_string_1.9.0.tgz"; + path = fetchurl { + name = "color_string___color_string_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz"; + sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; }; } { - name = "color_string___color_string_1.6.0.tgz"; + name = "color___color_3.2.1.tgz"; path = fetchurl { - name = "color_string___color_string_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz"; - sha1 = "c3915f61fe267672cb7e1e064c9d692219f6c312"; + name = "color___color_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; } { - name = "color___color_3.0.0.tgz"; + name = "color___color_4.2.0.tgz"; path = fetchurl { - name = "color___color_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz"; - sha1 = "d920b4328d534a3ac8295d68f7bd4ba6c427be9a"; + name = "color___color_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz"; + sha512 = "hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ=="; }; } { @@ -902,39 +926,39 @@ path = fetchurl { name = "colorette___colorette_1.4.0.tgz"; url = "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz"; - sha1 = "5190fbb87276259a86ad700bff2c6d6faa3fca40"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; } { - name = "colors___colors_1.4.0.tgz"; + name = "colorette___colorette_2.0.16.tgz"; path = fetchurl { - name = "colors___colors_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; - sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + name = "colorette___colorette_2.0.16.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz"; + sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; }; } { - name = "colorspace___colorspace_1.1.2.tgz"; + name = "colors___colors_1.4.0.tgz"; path = fetchurl { - name = "colorspace___colorspace_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz"; - sha1 = "e0128950d082b86a2168580796a0aa5d6c68d8c5"; + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; } { - name = "commander___commander_8.2.0.tgz"; + name = "colorspace___colorspace_1.1.4.tgz"; path = fetchurl { - name = "commander___commander_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz"; - sha1 = "37fe2bde301d87d47a53adeff8b5915db1381ca8"; + name = "colorspace___colorspace_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz"; + sha512 = "BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w=="; }; } { - name = "comment_parser___comment_parser_1.1.2.tgz"; + name = "commander___commander_8.3.0.tgz"; path = fetchurl { - name = "comment_parser___comment_parser_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz"; - sha1 = "e5317d7a2ec22b470dcb54a29b25426c30bf39d8"; + name = "commander___commander_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; + sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; } { @@ -942,7 +966,15 @@ path = fetchurl { name = "comment_parser___comment_parser_1.2.4.tgz"; url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz"; - sha1 = "489f3ee55dfd184a6e4bffb31baba284453cb760"; + sha512 = "pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw=="; + }; + } + { + name = "comment_parser___comment_parser_1.3.0.tgz"; + path = fetchurl { + name = "comment_parser___comment_parser_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.0.tgz"; + sha512 = "hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA=="; }; } { @@ -950,7 +982,7 @@ path = fetchurl { name = "compare_versions___compare_versions_3.6.0.tgz"; url = "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz"; - sha1 = "1a5689913685e5a87637b8d3ffca75514ec41d62"; + sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; }; } { @@ -958,7 +990,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -966,15 +998,15 @@ path = fetchurl { name = "console_control_strings___console_control_strings_1.1.0.tgz"; url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { - name = "content_disposition___content_disposition_0.5.3.tgz"; + name = "content_disposition___content_disposition_0.5.4.tgz"; path = fetchurl { - name = "content_disposition___content_disposition_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + name = "content_disposition___content_disposition_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; } { @@ -982,7 +1014,7 @@ path = fetchurl { name = "content_type___content_type_1.0.4.tgz"; url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; } { @@ -990,15 +1022,15 @@ path = fetchurl { name = "cookie_signature___cookie_signature_1.0.6.tgz"; url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + sha1 = "4wOogrNCzD7oylE6eZmXNNqzriw="; }; } { - name = "cookie___cookie_0.4.0.tgz"; + name = "cookie___cookie_0.4.1.tgz"; path = fetchurl { - name = "cookie___cookie_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + name = "cookie___cookie_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; } { @@ -1006,7 +1038,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.3.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -1014,7 +1046,23 @@ path = fetchurl { name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha1 = "714d756522cace867867ccb4474c5d01bbae5d6d"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; + }; + } + { + name = "cross_env___cross_env_7.0.3.tgz"; + path = fetchurl { + name = "cross_env___cross_env_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz"; + sha512 = "+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="; + }; + } + { + name = "cross_fetch___cross_fetch_3.1.5.tgz"; + path = fetchurl { + name = "cross_fetch___cross_fetch_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz"; + sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; }; } { @@ -1022,7 +1070,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -1030,31 +1078,31 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; } { - name = "debug___debug_4.3.1.tgz"; + name = "decompress_response___decompress_response_4.2.1.tgz"; path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; } { - name = "decompress_response___decompress_response_4.2.1.tgz"; + name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { - name = "decompress_response___decompress_response_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; - sha1 = "414023cc7a302da25ce2ec82d0d5238ccafd8986"; + name = "decompress_response___decompress_response_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; } { @@ -1062,7 +1110,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { @@ -1070,7 +1118,7 @@ path = fetchurl { name = "deep_is___deep_is_0.1.4.tgz"; url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; } { @@ -1078,7 +1126,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -1086,7 +1134,7 @@ path = fetchurl { name = "delegates___delegates_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; }; } { @@ -1094,7 +1142,7 @@ path = fetchurl { name = "depd___depd_1.1.2.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; }; } { @@ -1102,7 +1150,7 @@ path = fetchurl { name = "depd___depd_2.0.0.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; - sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; } { @@ -1110,7 +1158,7 @@ path = fetchurl { name = "destroy___destroy_1.0.4.tgz"; url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + sha1 = "l4hXRCxEdJ5CBmE+N5RiBYJqvYA="; }; } { @@ -1118,15 +1166,23 @@ path = fetchurl { name = "detect_libc___detect_libc_1.0.3.tgz"; url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; + }; + } + { + name = "detect_libc___detect_libc_2.0.0.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz"; + sha512 = "S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw=="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.960912.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + name = "devtools_protocol___devtools_protocol_0.0.960912.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.960912.tgz"; + sha512 = "I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg=="; }; } { @@ -1134,7 +1190,7 @@ path = fetchurl { name = "dir_glob___dir_glob_3.0.1.tgz"; url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; - sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; } { @@ -1142,7 +1198,7 @@ path = fetchurl { name = "doctrine___doctrine_2.1.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; }; } { @@ -1150,7 +1206,7 @@ path = fetchurl { name = "doctrine___doctrine_3.0.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha1 = "addebead72a6574db783639dc87a121773973961"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; } { @@ -1158,7 +1214,7 @@ path = fetchurl { name = "duplexer___duplexer_0.1.2.tgz"; url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; - sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; } { @@ -1166,7 +1222,7 @@ path = fetchurl { name = "ee_first___ee_first_1.1.1.tgz"; url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; }; } { @@ -1174,7 +1230,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -1182,7 +1238,7 @@ path = fetchurl { name = "enabled___enabled_2.0.0.tgz"; url = "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz"; - sha1 = "f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; } { @@ -1190,7 +1246,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -1198,7 +1254,7 @@ path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -1206,7 +1262,7 @@ path = fetchurl { name = "enquirer___enquirer_2.3.6.tgz"; url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; - sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; } { @@ -1214,7 +1270,7 @@ path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; } { @@ -1222,7 +1278,7 @@ path = fetchurl { name = "es_abstract___es_abstract_1.19.1.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz"; - sha1 = "d4885796876916959de78edaa0df456627115ec3"; + sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; }; } { @@ -1230,7 +1286,7 @@ path = fetchurl { name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; } { @@ -1238,7 +1294,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -1246,7 +1302,7 @@ path = fetchurl { name = "escape_html___escape_html_1.0.3.tgz"; url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; }; } { @@ -1254,7 +1310,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -1262,7 +1318,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -1270,15 +1326,7 @@ path = fetchurl { name = "escodegen___escodegen_2.0.0.tgz"; url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; - sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; - }; - } - { - name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; - path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz"; - sha1 = "f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"; + sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; } { @@ -1286,31 +1334,23 @@ path = fetchurl { name = "eslint_config_prettier___eslint_config_prettier_8.3.0.tgz"; url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; - sha1 = "f7471b20b6fe8a9a9254cc684454202886a2dd7a"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; } { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_31.6.1.tgz"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_37.7.0.tgz"; path = fetchurl { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_31.6.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz"; - sha1 = "98040c801500572fff71c984a097d89946f1e450"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_37.7.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.0.tgz"; + sha512 = "vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA=="; }; } { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.0.tgz"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz"; path = fetchurl { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.0.tgz"; - sha1 = "8dfe5f27edfb6aa3812e6d86ccaea849ddc86b03"; - }; - } - { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz"; - sha1 = "7079cfa2497078905011e6f82e8dd8453d1371b7"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz"; + sha512 = "nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ=="; }; } { @@ -1318,31 +1358,23 @@ path = fetchurl { name = "eslint_plugin_prettier___eslint_plugin_prettier_4.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz"; - sha1 = "8b99d1e4b8b24a762472b4567992023619cb98e0"; - }; - } - { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; - path = fetchurl { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; - sha1 = "8c229c268d468956334c943bb45fc860280f5556"; + sha512 = "98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ=="; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.22.0.tgz"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz"; - sha1 = "3d1c542d1d3169c45421c1215d9470e341707269"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz"; + sha512 = "XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA=="; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz"; - sha1 = "41bcfe3e39e6a5ac040971c1af94437c80daa40e"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz"; + sha512 = "IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw=="; }; } { @@ -1350,7 +1382,7 @@ path = fetchurl { name = "eslint_scope___eslint_scope_5.1.1.tgz"; url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; } { @@ -1358,7 +1390,7 @@ path = fetchurl { name = "eslint_utils___eslint_utils_2.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; } { @@ -1366,7 +1398,7 @@ path = fetchurl { name = "eslint_utils___eslint_utils_3.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha1 = "8aebaface7345bb33559db0a1f13a1d2d48c3672"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; }; } { @@ -1374,7 +1406,7 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; } { @@ -1382,15 +1414,23 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_3.2.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; + sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; }; } { - name = "eslint___eslint_7.21.0.tgz"; + name = "eslint___eslint_7.28.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.21.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz"; - sha1 = "4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"; + name = "eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; } { @@ -1398,7 +1438,7 @@ path = fetchurl { name = "eslint___eslint_7.32.0.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; - sha1 = "c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; } { @@ -1406,7 +1446,7 @@ path = fetchurl { name = "espree___espree_7.3.1.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; - sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; } { @@ -1414,7 +1454,7 @@ path = fetchurl { name = "esprima___esprima_4.0.1.tgz"; url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; } { @@ -1422,7 +1462,7 @@ path = fetchurl { name = "esquery___esquery_1.4.0.tgz"; url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; } { @@ -1430,7 +1470,7 @@ path = fetchurl { name = "esrecurse___esrecurse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; } { @@ -1438,15 +1478,15 @@ path = fetchurl { name = "estraverse___estraverse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; } { - name = "estraverse___estraverse_5.2.0.tgz"; + name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + name = "estraverse___estraverse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; } { @@ -1454,7 +1494,7 @@ path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } { @@ -1462,7 +1502,7 @@ path = fetchurl { name = "etag___etag_1.8.1.tgz"; url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha1 = "Qa4u62XvpiJorr/qg6x9eSmbCIc="; }; } { @@ -1470,7 +1510,7 @@ path = fetchurl { name = "event_stream___event_stream_3.3.4.tgz"; url = "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + sha1 = "SrTJoPWlTbkzi0w02Gv86PSzVXE="; }; } { @@ -1478,7 +1518,7 @@ path = fetchurl { name = "execa___execa_5.1.1.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; - sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; } { @@ -1486,7 +1526,7 @@ path = fetchurl { name = "expand_template___expand_template_2.0.3.tgz"; url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; - sha1 = "6e14b3fcee0f3a6340ecb57d2e8918692052a47c"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } { @@ -1494,15 +1534,15 @@ path = fetchurl { name = "express_prom_bundle___express_prom_bundle_5.1.5.tgz"; url = "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz"; - sha1 = "f298615879299a58cf8ec1350186f4de91d91fa4"; + sha512 = "tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg=="; }; } { - name = "express___express_4.17.1.tgz"; + name = "express___express_4.17.2.tgz"; path = fetchurl { - name = "express___express_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + name = "express___express_4.17.2.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; } { @@ -1510,7 +1550,7 @@ path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -1518,7 +1558,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -1526,15 +1566,15 @@ path = fetchurl { name = "fast_diff___fast_diff_1.2.0.tgz"; url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; - sha1 = "73ee11982d86caaf7959828d519cfe927fac5f03"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; } { - name = "fast_glob___fast_glob_3.2.7.tgz"; + name = "fast_glob___fast_glob_3.2.11.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; - sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + name = "fast_glob___fast_glob_3.2.11.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; } { @@ -1542,7 +1582,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1550,7 +1590,7 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } { @@ -1558,7 +1598,7 @@ path = fetchurl { name = "fastq___fastq_1.13.0.tgz"; url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; - sha1 = "616760f88a7526bdfc596b7cab8c18938c36b98c"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; } { @@ -1566,7 +1606,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -1574,7 +1614,7 @@ path = fetchurl { name = "fecha___fecha_4.2.1.tgz"; url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz"; - sha1 = "0a83ad8f86ef62a091e22bb5a039cd03d23eecce"; + sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; }; } { @@ -1582,7 +1622,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } { @@ -1590,7 +1630,7 @@ path = fetchurl { name = "fill_range___fill_range_7.0.1.tgz"; url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; } { @@ -1598,7 +1638,7 @@ path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; } { @@ -1606,7 +1646,7 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { @@ -1614,7 +1654,7 @@ path = fetchurl { name = "find_up___find_up_5.0.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; - sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; } { @@ -1622,7 +1662,7 @@ path = fetchurl { name = "find_versions___find_versions_4.0.0.tgz"; url = "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz"; - sha1 = "3c57e573bf97769b8cb8df16934b627915da4965"; + sha512 = "wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ=="; }; } { @@ -1630,15 +1670,15 @@ path = fetchurl { name = "flat_cache___flat_cache_3.0.4.tgz"; url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; } { - name = "flatted___flatted_3.2.2.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; - sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; } { @@ -1646,7 +1686,7 @@ path = fetchurl { name = "fn.name___fn.name_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz"; - sha1 = "26cad8017967aea8731bc42961d04a3d5988accc"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; } { @@ -1654,7 +1694,7 @@ path = fetchurl { name = "forwarded___forwarded_0.2.0.tgz"; url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; - sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; } { @@ -1662,7 +1702,7 @@ path = fetchurl { name = "fresh___fresh_0.5.2.tgz"; url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha1 = "PYyt2Q2XZWn6g1qx+OSyOhBWBac="; }; } { @@ -1670,7 +1710,7 @@ path = fetchurl { name = "from2___from2_2.3.0.tgz"; url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + sha1 = "i/tVAr3kpNNs/e6gB/zKIdfjgq8="; }; } { @@ -1678,7 +1718,7 @@ path = fetchurl { name = "from___from_0.1.7.tgz"; url = "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz"; - sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + sha1 = "g8YK/Fi5xWmXAH7Rp2izqzA6RP4="; }; } { @@ -1686,7 +1726,7 @@ path = fetchurl { name = "fs_constants___fs_constants_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; } { @@ -1694,7 +1734,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -1702,7 +1742,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; }; } { @@ -1710,7 +1750,7 @@ path = fetchurl { name = "fsevents___fsevents_2.3.2.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; } { @@ -1718,7 +1758,7 @@ path = fetchurl { name = "function_bind___function_bind_1.1.1.tgz"; url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; } { @@ -1726,7 +1766,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; }; } { @@ -1734,7 +1774,7 @@ path = fetchurl { name = "gauge___gauge_2.7.4.tgz"; url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1742,7 +1782,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1750,7 +1790,7 @@ path = fetchurl { name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; } { @@ -1758,7 +1798,7 @@ path = fetchurl { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; }; } { @@ -1766,7 +1806,7 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; } { @@ -1774,7 +1814,7 @@ path = fetchurl { name = "get_stream___get_stream_6.0.1.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; - sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; } { @@ -1782,7 +1822,7 @@ path = fetchurl { name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha1 = "7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; } { @@ -1790,7 +1830,7 @@ path = fetchurl { name = "github_from_package___github_from_package_0.0.0.tgz"; url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; - sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + sha1 = "l/tdlr/eiXMxPyDoKI75oWf6ZM4="; }; } { @@ -1798,7 +1838,7 @@ path = fetchurl { name = "glob_parent___glob_parent_5.1.2.tgz"; url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; - sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; } { @@ -1806,31 +1846,23 @@ path = fetchurl { name = "glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; - }; - } - { - name = "globals___globals_12.4.0.tgz"; - path = fetchurl { - name = "globals___globals_12.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; - sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { - name = "globals___globals_13.11.0.tgz"; + name = "globals___globals_13.12.0.tgz"; path = fetchurl { - name = "globals___globals_13.11.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz"; - sha1 = "40ef678da117fe7bd2e28f1fab24951bd0255be7"; + name = "globals___globals_13.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz"; + sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; } { - name = "globby___globby_11.0.4.tgz"; + name = "globby___globby_11.1.0.tgz"; path = fetchurl { - name = "globby___globby_11.0.4.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; - sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + name = "globby___globby_11.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; } { @@ -1838,15 +1870,15 @@ path = fetchurl { name = "google_protobuf___google_protobuf_3.5.0.tgz"; url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz"; - sha1 = "b8cc63c74d83457bd8a9a904503c8efb26bca339"; + sha1 = "uMxjx02DRXvYqakEUDyO+ya8ozk="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; } { @@ -1854,7 +1886,7 @@ path = fetchurl { name = "has_bigints___has_bigints_1.0.1.tgz"; url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; - sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; }; } { @@ -1862,7 +1894,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -1870,7 +1902,7 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; } { @@ -1878,7 +1910,7 @@ path = fetchurl { name = "has_symbols___has_symbols_1.0.2.tgz"; url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; } { @@ -1886,7 +1918,7 @@ path = fetchurl { name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha1 = "7e133818a7d394734f941e73c3d3f9291e658b25"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; } { @@ -1894,7 +1926,7 @@ path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1902,23 +1934,15 @@ path = fetchurl { name = "has___has_1.0.3.tgz"; url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; - }; - } - { - name = "http_errors___http_errors_1.7.2.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; } { - name = "http_errors___http_errors_1.7.3.tgz"; + name = "http_errors___http_errors_1.8.1.tgz"; path = fetchurl { - name = "http_errors___http_errors_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + name = "http_errors___http_errors_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; } { @@ -1926,7 +1950,7 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { @@ -1934,7 +1958,7 @@ path = fetchurl { name = "human_signals___human_signals_2.1.0.tgz"; url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; - sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; } { @@ -1942,7 +1966,7 @@ path = fetchurl { name = "husky___husky_4.3.8.tgz"; url = "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz"; - sha1 = "31144060be963fd6850e5cc8f019a1dfe194296d"; + sha512 = "LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow=="; }; } { @@ -1950,7 +1974,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.4.24.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; } { @@ -1958,7 +1982,7 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { @@ -1966,15 +1990,15 @@ path = fetchurl { name = "ignore___ignore_4.0.6.tgz"; url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; - sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; } { - name = "ignore___ignore_5.1.8.tgz"; + name = "ignore___ignore_5.2.0.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.8.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; - sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + name = "ignore___ignore_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; } { @@ -1982,7 +2006,7 @@ path = fetchurl { name = "import_fresh___import_fresh_3.3.0.tgz"; url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; - sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; } { @@ -1990,7 +2014,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -1998,7 +2022,7 @@ path = fetchurl { name = "indent_string___indent_string_4.0.0.tgz"; url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; } { @@ -2006,7 +2030,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -2014,15 +2038,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; - }; - } - { - name = "inherits___inherits_2.0.3.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -2030,7 +2046,7 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } { @@ -2038,7 +2054,7 @@ path = fetchurl { name = "internal_slot___internal_slot_1.0.3.tgz"; url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; } { @@ -2046,7 +2062,7 @@ path = fetchurl { name = "into_stream___into_stream_6.0.0.tgz"; url = "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz"; - sha1 = "4bfc1244c0128224e18b8870e85b2de8e66c6702"; + sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA=="; }; } { @@ -2054,7 +2070,7 @@ path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; } { @@ -2062,7 +2078,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; }; } { @@ -2070,7 +2086,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.3.2.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; } { @@ -2078,7 +2094,7 @@ path = fetchurl { name = "is_bigint___is_bigint_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; - sha1 = "08147a1875bc2b32005d41ccd8291dffc6691df3"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; }; } { @@ -2086,7 +2102,7 @@ path = fetchurl { name = "is_binary_path___is_binary_path_2.1.0.tgz"; url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; } { @@ -2094,7 +2110,7 @@ path = fetchurl { name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha1 = "5c6dc200246dd9321ae4b885a114bb1f75f63719"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; } { @@ -2102,15 +2118,15 @@ path = fetchurl { name = "is_callable___is_callable_1.2.4.tgz"; url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; - sha1 = "47301d58dd0259407865547853df6d61fe471945"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; } { - name = "is_core_module___is_core_module_2.7.0.tgz"; + name = "is_core_module___is_core_module_2.8.1.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz"; - sha1 = "3c0ef7d31b4acfc574f80c58409d568a836848e3"; + name = "is_core_module___is_core_module_2.8.1.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; } { @@ -2118,7 +2134,7 @@ path = fetchurl { name = "is_date_object___is_date_object_1.0.5.tgz"; url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; - sha1 = "0841d5536e724c25597bf6ea62e1bd38298df31f"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; } { @@ -2126,7 +2142,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; }; } { @@ -2134,15 +2150,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -2150,7 +2158,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -2158,15 +2166,15 @@ path = fetchurl { name = "is_glob___is_glob_4.0.3.tgz"; url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; - sha1 = "64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; } { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; } { @@ -2174,7 +2182,7 @@ path = fetchurl { name = "is_number_object___is_number_object_1.0.6.tgz"; url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz"; - sha1 = "6a7aaf838c7f0686a50b4553f7e54a96494e89f0"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; }; } { @@ -2182,7 +2190,7 @@ path = fetchurl { name = "is_number___is_number_7.0.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; } { @@ -2190,7 +2198,7 @@ path = fetchurl { name = "is_obj___is_obj_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + sha1 = "PkcprB9f3gJc19g6iW2rn09n2w8="; }; } { @@ -2198,7 +2206,7 @@ path = fetchurl { name = "is_regex___is_regex_1.1.4.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; - sha1 = "eef5663cd59fa4c0ae339505323df6854bb15958"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; } { @@ -2206,7 +2214,7 @@ path = fetchurl { name = "is_regexp___is_regexp_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + sha1 = "/S2INUXEa6xaYz57mgnof6LLUGk="; }; } { @@ -2214,7 +2222,7 @@ path = fetchurl { name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; - sha1 = "97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"; + sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; }; } { @@ -2222,7 +2230,7 @@ path = fetchurl { name = "is_stream___is_stream_2.0.1.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; - sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; } { @@ -2230,7 +2238,7 @@ path = fetchurl { name = "is_string___is_string_1.0.7.tgz"; url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; - sha1 = "0dd12bf2006f255bb58f695110eff7491eebc0fd"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; } { @@ -2238,15 +2246,15 @@ path = fetchurl { name = "is_symbol___is_symbol_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; - sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; } { - name = "is_weakref___is_weakref_1.0.1.tgz"; + name = "is_weakref___is_weakref_1.0.2.tgz"; path = fetchurl { - name = "is_weakref___is_weakref_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz"; - sha1 = "842dba4ec17fa9ac9850df2d6efbc1737274f2a2"; + name = "is_weakref___is_weakref_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; } { @@ -2254,7 +2262,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -2262,7 +2270,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -2270,7 +2278,7 @@ path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; } { @@ -2278,7 +2286,7 @@ path = fetchurl { name = "js_yaml___js_yaml_3.14.1.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; } { @@ -2286,7 +2294,7 @@ path = fetchurl { name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.1.1.tgz"; url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz"; - sha1 = "10fe5e409ba38de22a48b555598955a26ff0160f"; + sha512 = "uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g=="; }; } { @@ -2294,15 +2302,15 @@ path = fetchurl { name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.2.0.tgz"; url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz"; - sha1 = "3482a3833b74a88c95a6ba7253f0c0de3b77b9f5"; + sha512 = "4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg=="; }; } { - name = "jsdoctypeparser___jsdoctypeparser_9.0.0.tgz"; + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_2.2.2.tgz"; path = fetchurl { - name = "jsdoctypeparser___jsdoctypeparser_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; - sha1 = "8c97e2fb69315eb274b0f01377eaa5c940bd7b26"; + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz"; + sha512 = "zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw=="; }; } { @@ -2310,7 +2318,7 @@ path = fetchurl { name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; } { @@ -2318,7 +2326,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -2326,7 +2334,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; } { @@ -2334,7 +2342,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; }; } { @@ -2342,7 +2350,7 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; } { @@ -2350,7 +2358,7 @@ path = fetchurl { name = "jsx_ast_utils___jsx_ast_utils_3.2.1.tgz"; url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz"; - sha1 = "720b97bfe7d901b927d87c3773637ae8ea48781b"; + sha512 = "uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA=="; }; } { @@ -2358,7 +2366,7 @@ path = fetchurl { name = "kuler___kuler_2.0.0.tgz"; url = "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz"; - sha1 = "e2c570a3800388fb44407e851531c1d670b061b3"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; } { @@ -2366,7 +2374,7 @@ path = fetchurl { name = "levn___levn_0.4.1.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; } { @@ -2374,31 +2382,31 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; }; } { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; } { - name = "lint_staged___lint_staged_11.2.0.tgz"; + name = "lint_staged___lint_staged_11.2.6.tgz"; path = fetchurl { - name = "lint_staged___lint_staged_11.2.0.tgz"; - url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.0.tgz"; - sha1 = "6b9774a74b3eb4bef5c59fb6475bff84d6853008"; + name = "lint_staged___lint_staged_11.2.6.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.6.tgz"; + sha512 = "Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg=="; }; } { - name = "listr2___listr2_3.12.2.tgz"; + name = "listr2___listr2_3.14.0.tgz"; path = fetchurl { - name = "listr2___listr2_3.12.2.tgz"; - url = "https://registry.yarnpkg.com/listr2/-/listr2-3.12.2.tgz"; - sha1 = "2d55cc627111603ad4768a9e87c9c7bb9b49997e"; + name = "listr2___listr2_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz"; + sha512 = "TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g=="; }; } { @@ -2406,7 +2414,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -2414,7 +2422,7 @@ path = fetchurl { name = "locate_path___locate_path_6.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; - sha1 = "55321eb309febbc59c4801d931a72452a681d286"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; } { @@ -2422,15 +2430,7 @@ path = fetchurl { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; - }; - } - { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + sha1 = "soqmKIorn8ZRA1x3EfZathkDMaY="; }; } { @@ -2438,7 +2438,7 @@ path = fetchurl { name = "lodash.merge___lodash.merge_4.6.2.tgz"; url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } { @@ -2446,7 +2446,7 @@ path = fetchurl { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; }; } { @@ -2454,7 +2454,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -2462,15 +2462,15 @@ path = fetchurl { name = "log_update___log_update_4.0.0.tgz"; url = "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz"; - sha1 = "589ecd352471f2a1c0c570287543a64dfd20e0a1"; + sha512 = "9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="; }; } { - name = "logform___logform_2.3.0.tgz"; + name = "logform___logform_2.3.2.tgz"; path = fetchurl { - name = "logform___logform_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz"; - sha1 = "a3997a05985de2ebd325ae0d166dffc9c6fe6b57"; + name = "logform___logform_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.3.2.tgz"; + sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; }; } { @@ -2478,7 +2478,7 @@ path = fetchurl { name = "long___long_4.0.0.tgz"; url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; - sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; } { @@ -2486,7 +2486,7 @@ path = fetchurl { name = "loose_envify___loose_envify_1.4.0.tgz"; url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; } { @@ -2494,7 +2494,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -2502,7 +2502,7 @@ path = fetchurl { name = "map_stream___map_stream_0.1.0.tgz"; url = "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + sha1 = "5WqpTEyAVaFkBKBnS3jyFffI4ZQ="; }; } { @@ -2510,7 +2510,7 @@ path = fetchurl { name = "media_typer___media_typer_0.3.0.tgz"; url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; }; } { @@ -2518,7 +2518,7 @@ path = fetchurl { name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha1 = "sAqqVW3YtEVoFQ7J0blT8/kMu2E="; }; } { @@ -2526,7 +2526,7 @@ path = fetchurl { name = "merge_stream___merge_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; } { @@ -2534,7 +2534,7 @@ path = fetchurl { name = "merge2___merge2_1.4.1.tgz"; url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; - sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; } { @@ -2542,7 +2542,7 @@ path = fetchurl { name = "methods___methods_1.1.2.tgz"; url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha1 = "VSmk1nZUE07cxSZmVoNbD4Ua/O4="; }; } { @@ -2550,23 +2550,23 @@ path = fetchurl { name = "micromatch___micromatch_4.0.4.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; } { - name = "mime_db___mime_db_1.50.0.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.50.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz"; - sha1 = "abd4ac94e98d3c0e185016c67ab45d5fde40c11f"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } { - name = "mime_types___mime_types_2.1.33.tgz"; + name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.33.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz"; - sha1 = "1fa12a904472fafd068e48d9e8401f74d3f70edb"; + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; } { @@ -2574,7 +2574,7 @@ path = fetchurl { name = "mime___mime_1.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; } { @@ -2582,7 +2582,7 @@ path = fetchurl { name = "mimic_fn___mimic_fn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; } { @@ -2590,7 +2590,15 @@ path = fetchurl { name = "mimic_response___mimic_response_2.1.0.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; - sha1 = "d13763d35f613d09ec37ebb30bac0469c0ee8f43"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + } + { + name = "mimic_response___mimic_response_3.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; }; } { @@ -2598,7 +2606,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -2606,7 +2614,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -2614,15 +2622,7 @@ path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; - }; - } - { - name = "mkdirp___mkdirp_0.5.5.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; } { @@ -2630,7 +2630,7 @@ path = fetchurl { name = "morgan___morgan_1.10.0.tgz"; url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; - sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; } { @@ -2638,15 +2638,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - } - { - name = "ms___ms_2.1.1.tgz"; - path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -2654,7 +2646,7 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } { @@ -2662,7 +2654,7 @@ path = fetchurl { name = "ms___ms_2.1.3.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; } { @@ -2670,7 +2662,7 @@ path = fetchurl { name = "multistream___multistream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz"; - sha1 = "7bf00dfd119556fbc153cff3de4c6d477909f5a8"; + sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; } { @@ -2678,7 +2670,7 @@ path = fetchurl { name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; - sha1 = "b1fddc0b2c46e380a0b7a76f984dd47c41a13806"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } { @@ -2686,7 +2678,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; }; } { @@ -2694,7 +2686,7 @@ path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; } { @@ -2702,39 +2694,39 @@ path = fetchurl { name = "node_abi___node_abi_2.30.1.tgz"; url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; - sha1 = "c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; } { - name = "node_cleanup___node_cleanup_2.1.2.tgz"; + name = "node_abi___node_abi_3.7.0.tgz"; path = fetchurl { - name = "node_cleanup___node_cleanup_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz"; - sha1 = "7ac19abd297e09a7f72a71545d951b517e4dde2c"; + name = "node_abi___node_abi_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.7.0.tgz"; + sha512 = "3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ=="; }; } { - name = "node_fetch___node_fetch_2.6.1.tgz"; + name = "node_addon_api___node_addon_api_4.3.0.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + name = "node_addon_api___node_addon_api_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz"; + sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; } { - name = "node_fetch___node_fetch_2.6.5.tgz"; + name = "node_cleanup___node_cleanup_2.1.2.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; + name = "node_cleanup___node_cleanup_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz"; + sha1 = "esGavSl+Caf3KnFUXZUbUX5N3iw="; }; } { - name = "noop_logger___noop_logger_0.1.1.tgz"; + name = "node_fetch___node_fetch_2.6.7.tgz"; path = fetchurl { - name = "noop_logger___noop_logger_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; + name = "node_fetch___node_fetch_2.6.7.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz"; + sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; } { @@ -2742,7 +2734,7 @@ path = fetchurl { name = "normalize_path___normalize_path_3.0.0.tgz"; url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } { @@ -2750,7 +2742,7 @@ path = fetchurl { name = "npm_run_path___npm_run_path_4.0.1.tgz"; url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; } { @@ -2758,7 +2750,7 @@ path = fetchurl { name = "npmlog___npmlog_4.1.2.tgz"; url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; } { @@ -2766,7 +2758,7 @@ path = fetchurl { name = "number_is_nan___number_is_nan_1.0.1.tgz"; url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; }; } { @@ -2774,15 +2766,15 @@ path = fetchurl { name = "object_assign___object_assign_4.1.1.tgz"; url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { - name = "object_inspect___object_inspect_1.11.0.tgz"; + name = "object_inspect___object_inspect_1.12.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; - sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + name = "object_inspect___object_inspect_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; }; } { @@ -2790,7 +2782,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -2798,7 +2790,7 @@ path = fetchurl { name = "object.assign___object.assign_4.1.2.tgz"; url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; } { @@ -2806,7 +2798,7 @@ path = fetchurl { name = "object.entries___object.entries_1.1.5.tgz"; url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz"; - sha1 = "e1acdd17c4de2cd96d5a08487cfb9db84d881861"; + sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; }; } { @@ -2814,7 +2806,7 @@ path = fetchurl { name = "object.fromentries___object.fromentries_2.0.5.tgz"; url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz"; - sha1 = "7b37b205109c21e741e605727fe8b0ad5fa08251"; + sha512 = "CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw=="; }; } { @@ -2822,7 +2814,7 @@ path = fetchurl { name = "object.hasown___object.hasown_1.1.0.tgz"; url = "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz"; - sha1 = "7232ed266f34d197d15cac5880232f7a4790afe5"; + sha512 = "MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg=="; }; } { @@ -2830,7 +2822,7 @@ path = fetchurl { name = "object.values___object.values_1.1.5.tgz"; url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz"; - sha1 = "959f63e3ce9ef108720333082131e4a459b716ac"; + sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; }; } { @@ -2838,7 +2830,7 @@ path = fetchurl { name = "on_finished___on_finished_2.3.0.tgz"; url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; }; } { @@ -2846,7 +2838,7 @@ path = fetchurl { name = "on_headers___on_headers_1.0.2.tgz"; url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; - sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; } { @@ -2854,7 +2846,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -2862,7 +2854,7 @@ path = fetchurl { name = "one_time___one_time_1.0.0.tgz"; url = "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz"; - sha1 = "e06bc174aed214ed58edede573b433bbf827cb45"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; } { @@ -2870,7 +2862,7 @@ path = fetchurl { name = "onetime___onetime_5.1.2.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; } { @@ -2878,7 +2870,7 @@ path = fetchurl { name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; - sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; }; } { @@ -2886,7 +2878,7 @@ path = fetchurl { name = "optionator___optionator_0.8.3.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; } { @@ -2894,7 +2886,7 @@ path = fetchurl { name = "optionator___optionator_0.9.1.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; } { @@ -2902,7 +2894,7 @@ path = fetchurl { name = "p_is_promise___p_is_promise_3.0.0.tgz"; url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz"; - sha1 = "58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"; + sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; }; } { @@ -2910,7 +2902,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -2918,7 +2910,7 @@ path = fetchurl { name = "p_limit___p_limit_3.1.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; } { @@ -2926,7 +2918,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -2934,7 +2926,7 @@ path = fetchurl { name = "p_locate___p_locate_5.0.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; - sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; } { @@ -2942,7 +2934,7 @@ path = fetchurl { name = "p_map___p_map_4.0.0.tgz"; url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; - sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; } { @@ -2950,7 +2942,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -2958,7 +2950,7 @@ path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; } { @@ -2966,7 +2958,7 @@ path = fetchurl { name = "parse_json___parse_json_5.2.0.tgz"; url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; - sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; } { @@ -2974,7 +2966,7 @@ path = fetchurl { name = "parseurl___parseurl_1.3.3.tgz"; url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; } { @@ -2982,7 +2974,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -2990,7 +2982,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -2998,7 +2990,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -3006,7 +2998,7 @@ path = fetchurl { name = "path_parse___path_parse_1.0.7.tgz"; url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } { @@ -3014,7 +3006,7 @@ path = fetchurl { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha1 = "32BBeABfUi8V60SQ5yR6G/qmf4w="; }; } { @@ -3022,7 +3014,7 @@ path = fetchurl { name = "path_type___path_type_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; } { @@ -3030,7 +3022,7 @@ path = fetchurl { name = "pause_stream___pause_stream_0.0.11.tgz"; url = "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + sha1 = "/lo0sMvOErWqaitAPuLnO2AvFEU="; }; } { @@ -3038,15 +3030,15 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { - name = "picomatch___picomatch_2.3.0.tgz"; + name = "picomatch___picomatch_2.3.1.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + name = "picomatch___picomatch_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } { @@ -3054,7 +3046,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -3062,23 +3054,23 @@ path = fetchurl { name = "pkg_dir___pkg_dir_5.0.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz"; - sha1 = "a02d6aebe6ba133a928f74aec20bafdfe6b8e760"; + sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; } { - name = "pkg_fetch___pkg_fetch_3.2.4.tgz"; + name = "pkg_fetch___pkg_fetch_3.2.6.tgz"; path = fetchurl { - name = "pkg_fetch___pkg_fetch_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.4.tgz"; - sha1 = "5372734b12167d4bacd872be348217461b517390"; + name = "pkg_fetch___pkg_fetch_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.6.tgz"; + sha512 = "Q8fx6SIT022g0cdSE4Axv/xpfHeltspo2gg1KsWRinLQZOTRRAtOOaEFghA1F3jJ8FVsh8hGrL/Pb6Ea5XHIFw=="; }; } { - name = "pkg___pkg_5.4.1.tgz"; + name = "pkg___pkg_5.5.2.tgz"; path = fetchurl { - name = "pkg___pkg_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/pkg/-/pkg-5.4.1.tgz"; - sha1 = "4d824e42c454f32131e471d7cd8d14bfdb3e1c4c"; + name = "pkg___pkg_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-5.5.2.tgz"; + sha512 = "pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA=="; }; } { @@ -3086,15 +3078,31 @@ path = fetchurl { name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; - sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; + sha512 = "gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg=="; + }; + } + { + name = "poolpeteer___poolpeteer_0.22.20.tgz"; + path = fetchurl { + name = "poolpeteer___poolpeteer_0.22.20.tgz"; + url = "https://registry.yarnpkg.com/poolpeteer/-/poolpeteer-0.22.20.tgz"; + sha512 = "+bEpQoW5YpmZ3fUEhdL9tcgYVULHc5ylI140QDka1F4a6ew9Jv3bWHpkgrR5OLeEbHdfSdJZOXIysna3GgRkIw=="; }; } { - name = "prebuild_install___prebuild_install_6.0.1.tgz"; + name = "prebuild_install___prebuild_install_6.1.4.tgz"; path = fetchurl { - name = "prebuild_install___prebuild_install_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz"; - sha1 = "5902172f7a40eb67305b96c2a695db32636ee26d"; + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + }; + } + { + name = "prebuild_install___prebuild_install_7.0.1.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; }; } { @@ -3102,7 +3110,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.2.1.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; } { @@ -3110,7 +3118,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.1.2.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; }; } { @@ -3118,7 +3126,7 @@ path = fetchurl { name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha1 = "d23d41fe1375646de2d0104d3454a3008802cf7b"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; }; } { @@ -3126,23 +3134,23 @@ path = fetchurl { name = "prettier___prettier_2.2.1.tgz"; url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; - sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5"; + sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; }; } { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + name = "prettier___prettier_2.5.1.tgz"; path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + name = "prettier___prettier_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz"; + sha512 = "vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="; }; } { - name = "progress___progress_2.0.1.tgz"; + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { - name = "progress___progress_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz"; - sha1 = "c9242169342b1c29d275889c95734621b1952e31"; + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -3150,7 +3158,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -3158,15 +3166,15 @@ path = fetchurl { name = "prom_client___prom_client_11.5.3.tgz"; url = "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz"; - sha1 = "5fedfce1083bac6c2b223738e966d0e1643756f8"; + sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; } { - name = "prop_types___prop_types_15.7.2.tgz"; + name = "prop_types___prop_types_15.8.1.tgz"; path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + name = "prop_types___prop_types_15.8.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; + sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; }; } { @@ -3174,7 +3182,7 @@ path = fetchurl { name = "protobufjs___protobufjs_6.11.2.tgz"; url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz"; - sha1 = "de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"; + sha512 = "4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw=="; }; } { @@ -3182,7 +3190,7 @@ path = fetchurl { name = "proxy_addr___proxy_addr_2.0.7.tgz"; url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; } { @@ -3190,7 +3198,7 @@ path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; } { @@ -3198,7 +3206,7 @@ path = fetchurl { name = "ps_tree___ps_tree_1.2.0.tgz"; url = "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz"; - sha1 = "5e7425b89508736cdd4f2224d028f7bb3f722ebd"; + sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; } { @@ -3206,7 +3214,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -3214,7 +3222,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -3222,23 +3230,23 @@ path = fetchurl { name = "puppeteer_cluster___puppeteer_cluster_0.22.0.tgz"; url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz"; - sha1 = "4ab214671f414f15ad6a94a4b61ed0b4172e86e6"; + sha512 = "hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w=="; }; } { - name = "puppeteer___puppeteer_10.4.0.tgz"; + name = "puppeteer___puppeteer_13.3.2.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_10.4.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz"; - sha1 = "a6465ff97fda0576c4ac29601406f67e6fea3dc7"; + name = "puppeteer___puppeteer_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.3.2.tgz"; + sha512 = "TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg=="; }; } { - name = "qs___qs_6.7.0.tgz"; + name = "qs___qs_6.9.6.tgz"; path = fetchurl { - name = "qs___qs_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + name = "qs___qs_6.9.6.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; } { @@ -3246,7 +3254,7 @@ path = fetchurl { name = "queue_microtask___queue_microtask_1.2.3.tgz"; url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; } { @@ -3254,15 +3262,15 @@ path = fetchurl { name = "range_parser___range_parser_1.2.1.tgz"; url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; - sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; } { - name = "raw_body___raw_body_2.4.0.tgz"; + name = "raw_body___raw_body_2.4.2.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + name = "raw_body___raw_body_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; }; } { @@ -3270,7 +3278,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -3278,7 +3286,7 @@ path = fetchurl { name = "react_is___react_is_16.13.1.tgz"; url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; } { @@ -3286,7 +3294,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -3294,7 +3302,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -3302,15 +3310,15 @@ path = fetchurl { name = "readdirp___readdirp_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; - sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; - sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; + sha512 = "pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ=="; }; } { @@ -3318,15 +3326,7 @@ path = fetchurl { name = "regexpp___regexpp_3.2.0.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; - }; - } - { - name = "regextras___regextras_0.7.1.tgz"; - path = fetchurl { - name = "regextras___regextras_0.7.1.tgz"; - url = "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz"; - sha1 = "be95719d5f43f9ef0b9fa07ad89b7c606995a3b2"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; } { @@ -3334,7 +3334,7 @@ path = fetchurl { name = "regextras___regextras_0.8.0.tgz"; url = "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz"; - sha1 = "ec0f99853d4912839321172f608b544814b02217"; + sha512 = "k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ=="; }; } { @@ -3342,7 +3342,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -3350,7 +3350,7 @@ path = fetchurl { name = "require_from_string___require_from_string_2.0.2.tgz"; url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; } { @@ -3358,15 +3358,15 @@ path = fetchurl { name = "resolve_from___resolve_from_4.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve___resolve_1.22.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + name = "resolve___resolve_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; } { @@ -3374,7 +3374,7 @@ path = fetchurl { name = "resolve___resolve_2.0.0_next.3.tgz"; url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; - sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; + sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; } { @@ -3382,7 +3382,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_3.1.0.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; } { @@ -3390,7 +3390,15 @@ path = fetchurl { name = "reusify___reusify_1.0.4.tgz"; url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; - sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + } + { + name = "rfdc___rfdc_1.3.0.tgz"; + path = fetchurl { + name = "rfdc___rfdc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz"; + sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; }; } { @@ -3398,7 +3406,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -3406,15 +3414,15 @@ path = fetchurl { name = "run_parallel___run_parallel_1.2.0.tgz"; url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; - sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; } { - name = "rxjs___rxjs_6.6.7.tgz"; + name = "rxjs___rxjs_7.5.2.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.6.7.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; - sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; + name = "rxjs___rxjs_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.2.tgz"; + sha512 = "PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w=="; }; } { @@ -3422,7 +3430,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -3430,7 +3438,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.1.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -3438,7 +3446,15 @@ path = fetchurl { name = "safe_stable_stringify___safe_stable_stringify_1.1.1.tgz"; url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; - sha1 = "c8a220ab525cd94e60ebf47ddc404d610dc5d84a"; + sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; + }; + } + { + name = "safe_stable_stringify___safe_stable_stringify_2.3.1.tgz"; + path = fetchurl { + name = "safe_stable_stringify___safe_stable_stringify_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; }; } { @@ -3446,7 +3462,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -3454,7 +3470,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -3462,7 +3478,7 @@ path = fetchurl { name = "semver_regex___semver_regex_3.1.3.tgz"; url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz"; - sha1 = "b2bcc6f97f63269f286994e297e229b6245d0dc3"; + sha512 = "Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ=="; }; } { @@ -3470,7 +3486,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -3478,7 +3494,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -3486,23 +3502,23 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { - name = "send___send_0.17.1.tgz"; + name = "send___send_0.17.2.tgz"; path = fetchurl { - name = "send___send_0.17.1.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + name = "send___send_0.17.2.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; } { - name = "serve_static___serve_static_1.14.1.tgz"; + name = "serve_static___serve_static_1.14.2.tgz"; path = fetchurl { - name = "serve_static___serve_static_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + name = "serve_static___serve_static_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; } { @@ -3510,15 +3526,23 @@ path = fetchurl { name = "set_blocking___set_blocking_2.0.0.tgz"; url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; + name = "setprototypeof___setprototypeof_1.2.0.tgz"; path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + name = "setprototypeof___setprototypeof_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + } + { + name = "sharp___sharp_0.29.3.tgz"; + path = fetchurl { + name = "sharp___sharp_0.29.3.tgz"; + url = "https://registry.yarnpkg.com/sharp/-/sharp-0.29.3.tgz"; + sha512 = "fKWUuOw77E4nhpyzCCJR1ayrttHoFHBT2U/kR/qEMRhvPEcluG4BKj324+SCO1e84+knXHwhJ1HHJGnUt4ElGA=="; }; } { @@ -3526,7 +3550,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -3534,7 +3558,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -3542,15 +3566,15 @@ path = fetchurl { name = "side_channel___side_channel_1.0.4.tgz"; url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; - sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; }; } { @@ -3558,15 +3582,23 @@ path = fetchurl { name = "simple_concat___simple_concat_1.0.1.tgz"; url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; - sha1 = "f46976082ba35c2263f1c8ab5edfe26c41c9552f"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + } + { + name = "simple_get___simple_get_3.1.1.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz"; + sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="; }; } { - name = "simple_get___simple_get_3.1.0.tgz"; + name = "simple_get___simple_get_4.0.1.tgz"; path = fetchurl { - name = "simple_get___simple_get_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; - sha1 = "b45be062435e50d159540b576202ceec40b9c6b3"; + name = "simple_get___simple_get_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; } { @@ -3574,7 +3606,7 @@ path = fetchurl { name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; }; } { @@ -3582,7 +3614,7 @@ path = fetchurl { name = "slash___slash_3.0.0.tgz"; url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; } { @@ -3590,7 +3622,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_3.0.0.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; - sha1 = "31ddc10930a1b7e0b67b08c96c2f49b77a789787"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { @@ -3598,7 +3630,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_4.0.0.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; } { @@ -3606,7 +3638,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -3614,7 +3646,7 @@ path = fetchurl { name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; } { @@ -3622,15 +3654,15 @@ path = fetchurl { name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; }; } { @@ -3638,7 +3670,7 @@ path = fetchurl { name = "split___split_0.3.3.tgz"; url = "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + sha1 = "zQ7qXmOiEd//frDwkcQTPi0N0o8="; }; } { @@ -3646,7 +3678,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; }; } { @@ -3654,7 +3686,7 @@ path = fetchurl { name = "stack_trace___stack_trace_0.0.10.tgz"; url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + sha1 = "VHxws0fo0ytOEI6hoqFZ5f3eGcA="; }; } { @@ -3662,7 +3694,7 @@ path = fetchurl { name = "statuses___statuses_1.5.0.tgz"; url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; }; } { @@ -3670,7 +3702,7 @@ path = fetchurl { name = "stream_combiner___stream_combiner_0.0.4.tgz"; url = "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + sha1 = "TV5DPBhSYd3mI8o/RMWGvPXErRQ="; }; } { @@ -3678,7 +3710,7 @@ path = fetchurl { name = "stream_meter___stream_meter_1.0.4.tgz"; url = "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz"; - sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; + sha1 = "Uq+Vql6nYKJJFxZwTb/5D3Ov3R0="; }; } { @@ -3686,7 +3718,7 @@ path = fetchurl { name = "string_argv___string_argv_0.3.1.tgz"; url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz"; - sha1 = "95e2fbec0427ae19184935f816d74aaa4c5c19da"; + sha512 = "a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="; }; } { @@ -3694,7 +3726,7 @@ path = fetchurl { name = "string_argv___string_argv_0.1.2.tgz"; url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz"; - sha1 = "c5b7bc03fb2b11983ba3a72333dd0559e77e4738"; + sha512 = "mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA=="; }; } { @@ -3702,15 +3734,7 @@ path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -3718,7 +3742,7 @@ path = fetchurl { name = "string_width___string_width_4.2.3.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -3726,7 +3750,7 @@ path = fetchurl { name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz"; - sha1 = "5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"; + sha512 = "6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg=="; }; } { @@ -3734,7 +3758,7 @@ path = fetchurl { name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; }; } { @@ -3742,7 +3766,7 @@ path = fetchurl { name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; } { @@ -3750,7 +3774,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -3758,7 +3782,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { @@ -3766,7 +3790,7 @@ path = fetchurl { name = "stringify_object___stringify_object_3.3.0.tgz"; url = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"; - sha1 = "703065aefca19300d3ce88af4f5b3956d7556629"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; }; } { @@ -3774,15 +3798,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - } - { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -3790,7 +3806,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -3798,7 +3814,7 @@ path = fetchurl { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; } { @@ -3806,7 +3822,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; } { @@ -3814,7 +3830,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } { @@ -3822,7 +3838,7 @@ path = fetchurl { name = "supports_color___supports_color_8.1.1.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; - sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; } { @@ -3830,7 +3846,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -3838,23 +3854,23 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { - name = "table___table_6.7.2.tgz"; + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; path = fetchurl { - name = "table___table_6.7.2.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz"; - sha1 = "a8d39b9f5966693ca8b0feba270a78722cbaf3b0"; + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; } { - name = "tar_fs___tar_fs_2.0.0.tgz"; + name = "table___table_6.8.0.tgz"; path = fetchurl { - name = "tar_fs___tar_fs_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz"; - sha1 = "677700fc0c8b337a78bee3623fdc235f21d7afad"; + name = "table___table_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz"; + sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; }; } { @@ -3862,7 +3878,7 @@ path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; - sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; } { @@ -3870,7 +3886,7 @@ path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; } { @@ -3878,7 +3894,7 @@ path = fetchurl { name = "tdigest___tdigest_0.1.1.tgz"; url = "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz"; - sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021"; + sha1 = "Ljyyw56kSeVdHmzZEReszKRYgCE="; }; } { @@ -3886,7 +3902,7 @@ path = fetchurl { name = "text_hex___text_hex_1.0.0.tgz"; url = "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz"; - sha1 = "69dc9c1b17446ee79a92bf5b884bb4b9127506f5"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; }; } { @@ -3894,7 +3910,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; }; } { @@ -3902,7 +3918,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -3910,7 +3926,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; }; } { @@ -3918,15 +3934,15 @@ path = fetchurl { name = "to_regex_range___to_regex_range_5.0.1.tgz"; url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; } { - name = "toidentifier___toidentifier_1.0.0.tgz"; + name = "toidentifier___toidentifier_1.0.1.tgz"; path = fetchurl { - name = "toidentifier___toidentifier_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + name = "toidentifier___toidentifier_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; } { @@ -3934,7 +3950,7 @@ path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; }; } { @@ -3942,23 +3958,23 @@ path = fetchurl { name = "triple_beam___triple_beam_1.3.0.tgz"; url = "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz"; - sha1 = "a595214c7298db8339eeeee083e4d10bd8cb8dd9"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; } { - name = "tsc_watch___tsc_watch_4.5.0.tgz"; + name = "tsc_watch___tsc_watch_4.6.0.tgz"; path = fetchurl { - name = "tsc_watch___tsc_watch_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.5.0.tgz"; - sha1 = "d6884b932822b2c2ccd37f1c1f3748304566a474"; + name = "tsc_watch___tsc_watch_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.6.0.tgz"; + sha512 = "DRMADjFe44EDWb+YMIOj4b83UrU6le27L3/o0/9FlmA01ikFd5Dl9RD5h1hpeh0mQdIqXvwfHZszCcjhH3bAmQ=="; }; } { - name = "tslib___tslib_2.1.0.tgz"; + name = "tslib___tslib_2.3.1.tgz"; path = fetchurl { - name = "tslib___tslib_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; - sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; } { @@ -3966,7 +3982,7 @@ path = fetchurl { name = "tslib___tslib_1.14.1.tgz"; url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; - sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; } { @@ -3974,7 +3990,7 @@ path = fetchurl { name = "tsutils___tsutils_3.21.0.tgz"; url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; - sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; + sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; } { @@ -3982,7 +3998,7 @@ path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -3990,7 +4006,7 @@ path = fetchurl { name = "type_check___type_check_0.4.0.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; }; } { @@ -3998,7 +4014,7 @@ path = fetchurl { name = "type_check___type_check_0.3.2.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; }; } { @@ -4006,7 +4022,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -4014,15 +4030,7 @@ path = fetchurl { name = "type_fest___type_fest_0.21.3.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; - sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; - }; - } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; } { @@ -4030,23 +4038,23 @@ path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; - sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; } { - name = "typescript___typescript_4.3.4.tgz"; + name = "typescript___typescript_4.4.4.tgz"; path = fetchurl { - name = "typescript___typescript_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz"; - sha1 = "3f85b986945bcf31071decdd96cf8bfa65f9dcbc"; + name = "typescript___typescript_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; } { - name = "typescript___typescript_4.4.3.tgz"; + name = "typescript___typescript_4.5.5.tgz"; path = fetchurl { - name = "typescript___typescript_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz"; - sha1 = "bdc5407caa2b109efd4f82fe130656f977a29324"; + name = "typescript___typescript_4.5.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz"; + sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; } { @@ -4054,15 +4062,15 @@ path = fetchurl { name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; }; } { - name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; - sha1 = "d156d205e670d8d8c393e1c02ebd506422873f6a"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } { @@ -4070,7 +4078,7 @@ path = fetchurl { name = "unique_filename___unique_filename_1.1.1.tgz"; url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; - sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; } { @@ -4078,7 +4086,7 @@ path = fetchurl { name = "unique_slug___unique_slug_2.0.2.tgz"; url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; - sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; } { @@ -4086,7 +4094,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -4094,7 +4102,7 @@ path = fetchurl { name = "unpipe___unpipe_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; }; } { @@ -4102,15 +4110,15 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { - name = "url_value_parser___url_value_parser_2.0.3.tgz"; + name = "url_value_parser___url_value_parser_2.1.0.tgz"; path = fetchurl { - name = "url_value_parser___url_value_parser_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz"; - sha1 = "cd4b8d6754e458d65e8125260c09718d926e6e21"; + name = "url_value_parser___url_value_parser_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.1.0.tgz"; + sha512 = "gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw=="; }; } { @@ -4118,7 +4126,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -4126,7 +4134,7 @@ path = fetchurl { name = "utils_merge___utils_merge_1.0.1.tgz"; url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; }; } { @@ -4134,7 +4142,7 @@ path = fetchurl { name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; } { @@ -4142,7 +4150,7 @@ path = fetchurl { name = "vary___vary_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; }; } { @@ -4150,7 +4158,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; }; } { @@ -4158,7 +4166,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_5.0.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; }; } { @@ -4166,7 +4174,7 @@ path = fetchurl { name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; } { @@ -4174,7 +4182,7 @@ path = fetchurl { name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; url = "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; - sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + sha1 = "Zws6+8VS4LVd9rd4DKdGFfI60cs="; }; } { @@ -4182,31 +4190,31 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } { - name = "wide_align___wide_align_1.1.3.tgz"; + name = "wide_align___wide_align_1.1.5.tgz"; path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; } { - name = "winston_transport___winston_transport_4.4.0.tgz"; + name = "winston_transport___winston_transport_4.4.2.tgz"; path = fetchurl { - name = "winston_transport___winston_transport_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz"; - sha1 = "17af518daa690d5b2ecccaa7acf7b20ca7925e59"; + name = "winston_transport___winston_transport_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.2.tgz"; + sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; }; } { - name = "winston___winston_3.3.3.tgz"; + name = "winston___winston_3.5.1.tgz"; path = fetchurl { - name = "winston___winston_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz"; - sha1 = "ae6172042cafb29786afa3d09c8ff833ab7c9170"; + name = "winston___winston_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.5.1.tgz"; + sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; } { @@ -4214,7 +4222,7 @@ path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; } { @@ -4222,7 +4230,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; } { @@ -4230,7 +4238,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -4238,15 +4246,15 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { - name = "ws___ws_7.4.6.tgz"; + name = "ws___ws_8.5.0.tgz"; path = fetchurl { - name = "ws___ws_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + name = "ws___ws_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz"; + sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; }; } { @@ -4254,7 +4262,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -4262,7 +4270,7 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { @@ -4270,7 +4278,7 @@ path = fetchurl { name = "yaml___yaml_1.10.2.tgz"; url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; - sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; } { @@ -4278,7 +4286,7 @@ path = fetchurl { name = "yargs_parser___yargs_parser_20.2.9.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; } { @@ -4286,7 +4294,7 @@ path = fetchurl { name = "yargs___yargs_16.2.0.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; } { @@ -4294,7 +4302,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } { @@ -4302,7 +4310,7 @@ path = fetchurl { name = "yocto_queue___yocto_queue_0.1.0.tgz"; url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; } ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ca59c49439950..fdb6ea0efa99b 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.3.6"; + version = "8.4.1"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-XYgSXgZJKsVYMtlvMq84OuQBbrbFJUh6m/lKCbOlzus="; + sha256 = "sha256-RVEgqFEwvXTHE8Kvc1q+0o+V3mEHtURQR/7x3Qcmtpg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-8gR95+xCJD3e25WxbmtXBMsS7HdbB+vwrcZ9sApSxFk="; + sha256 = "sha256-RTupkQ9LlppJeyfmgGMztMW2m+sJXkJuDAdtpcyRGe0="; }; - vendorSha256 = "sha256:0bj9a45jciaayqlrakdndzjdw4x600xw48wwy1id4n50h2mkrbp8"; + vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 0e1fc59dc15f5..d11add105f6ba 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.72.7"; + version = "0.72.8"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SnEvY5pwjBHH/m9bB46bcEFvKy0r9lutft0YsuDvT8U="; + sha256 = "sha256-IejLCi1TJ2Q0lpA2ZK3hea18YX483FV4IisYRRVD1Vg="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-Pi/m/T4eBhKHH4Zl0hc13aQ0icolyAP/9sjXZwduKUA="; + vendorSha256 = "sha256-4hdy+Yr9EoUjJ4+pJ2ZEPGlnq+4sx5JLm92eFFav6tU="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index 4a2df19451fec..dd297d4c25854 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "promscale"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-snbQVkJ4J5ElVNfHuSfb7VCZ64TqJ8Lx5uUaJPqBHl4="; + sha256 = "sha256-KF+aD9vJYqNJkJftx27ZsxmOIXZ/2ciKwjwcTw0GBvY="; }; patches = [ ./0001-remove-jaeger-test-dep.patch ]; - vendorSha256 = "sha256-1t4WNoJrfKTtrpwi9p+L1WQR7mTsD70CRW+RYT7E9Lo="; + vendorSha256 = "sha256-/cjRM8CrOKnx0BcRu2+MLV28MYLOrG5x1DN24mRUJzQ="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 0888fc92dbd3a..883771e424ef9 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,14 +4,14 @@ let generic = { subPackages, pname, postInstall ? "", mainProgram }: buildGoModule rec { inherit pname; - version = "6.6.5"; + version = "6.6.6"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "sha256-mdql8bGSkPfs9wNxNUIIpux5t89CSjOQoFfHXTiScr4="; + sha256 = "sha256-//ZJV34H5c16QjppIH5hyk9eKrfEzKdL6GCVTp/k8Uo="; }; inherit subPackages postInstall; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 1166855deb957..89653f1066e16 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.20.4"; + version = "1.21.4"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-AK2KCbwFHeryqdK7iYtKEaP8JYINdX1i42/EHCAGkFk="; + sha256 = "sha256-0z6pMZY6/d+oC0TlJrymCeYWf+IjLWnR1M4eo/lnpw0="; }; - vendorSha256 = "sha256-35jcieU/EdJ3d4WfYhwXpDNZRrS+DQsWZYp2EoxpKU4"; + vendorSha256 = "sha256-igeRWLaYbHjZdbYBrynyjZPj1bwCXtnnU4UJM/CdaO0="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9eff996f78c3a..8eb7827037766 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -157,6 +157,10 @@ let outputs = [ "out" "doc" ] ++ lib.optional (builtins.elem "documentation" features_) "man"; + CXXFLAGS = lib.optionals stdenv.isDarwin [ + "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" + ]; + mesonFlags = [ "-Dtest=true" "-Dmanpages=true" diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 226294e5f425d..695480a05c967 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -1,21 +1,23 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -with lib; - -buildGoPackage rec { +buildGoModule rec { pname = "nats-server"; - version = "2.7.0"; - - goPackagePath = "github.com/nats-io/${pname}"; + version = "2.7.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; + sha256 = "0w4hjz1x6zwcxhnd1y3874agyn8nsdra4fky6kc2rrfikjcw003y"; }; - meta = { + vendorSha256 = "1gvvjwx1g8mhcqi3ssb3k5ylkz0afpmnf6h2zfny9rc4dk2cp2dy"; + + doCheck = false; + + passthru.tests.nats = nixosTests.nats; + + meta = with lib; { description = "High-Performance server for NATS"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop derekcollison ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a530a58e90005..735bfdeafb18c 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,18 +46,18 @@ in { ''; nextcloud21 = generic { - version = "21.0.8"; - sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z"; + version = "21.0.9"; + sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE="; }; nextcloud22 = generic { - version = "22.2.4"; - sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl"; + version = "22.2.5"; + sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; }; nextcloud23 = generic { - version = "23.0.1"; - sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay"; + version = "23.0.2"; + sha256 = "sha256-ngJGLTjqq2RX/KgHe9Rv54w6qtRC6RpuEuMvp9UbxO4="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index de51da4ca6613..32c7ac21dae4d 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "nitter"; - version = "unstable-2022-01-32"; + version = "unstable-2022-02-11"; nimBinOnly = true; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "cdb4efadfeb5102b501c7ff79261fefc7327edb9"; - sha256 = "sha256-kNK0UQd1whkaZwj98b2JYtYwjUSE1qBcAYytqnSaK1o="; + rev = "6695784050605c77a301c0a66764fa9a9580a2f5"; + sha256 = "1lddzf6m74bw5kkv465cp211xxqbwnfacav7ia3y9i38rrnqwk6m"; }; buildInputs = with nimPackages; [ diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh index 8001fea4d26f3..afeee592de3de 100755 --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -8,7 +8,7 @@ set -euo pipefail # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh -# - pkgs/misc/emulators/ryujinx/updater.sh +# - pkgs/applications/emulators/ryujinx/updater.sh cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 1e63b44450e7a..a99349d8c0db6 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-BLtoT6UHsur+jFp4KBlE10/Z/V6RDy0k16H10IC98WQ="; - arm64-linux_hash = "sha256-s8EV/VqiUXWRTNxacx4sy6r+TIAqkqhESAYYa9s0uAQ="; - x64-osx_hash = "sha256-woXFYmX+499NTtWmmGBpZ12PxTUazJ8klA6IPQIDjLE="; + x64-linux_hash = "sha256-O/dfLZst7RFnqDZj8UX6ejL2EBjGnCBY3e8JB3peRgY="; + arm64-linux_hash = "sha256-DkCOK1A7L1gMqY/XPIJFFz7qvUvxA6aJa24Hrh3dT/U="; + x64-osx_hash = "sha256-4N0/FTVhxUooauhh+7u527aViSBILiCb+a4cI17QTAg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.3.3"; + version = "4.10.2"; sourceRoot = "."; diff --git a/pkgs/servers/ombi/update.sh b/pkgs/servers/ombi/update.sh index a549a9f1731d8..9b49180b6f116 100755 --- a/pkgs/servers/ombi/update.sh +++ b/pkgs/servers/ombi/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" + sriHash="$(nix hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } @@ -25,7 +25,7 @@ updateVersion() sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" } -currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; ombi.version)') +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. ombi.version) latestTag=$(curl https://api.github.com/repos/Ombi-App/Ombi/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index acb3ba82a4acd..fe30163799780 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-IwD7PFRz6mjEjUTbpqItorvFMB/hcMcRhHG8XQHv0iM="; - arm64-linux_hash = "sha256-9Ou08PI3HNQO6Da76ZMkzx1QlU+oaq9Tr+vqPT05xnw="; - x64-osx_hash = "sha256-Nfm9vWB+ii2ZST6I4I8Y2PuG2a1qY7rbki57y88Ft8A="; + x64-linux_hash = "sha256-2DZUQ11sAsIbI3hkU+6Hj+xHz3EbsTelisUCOlRBvvQ="; + arm64-linux_hash = "sha256-j5gUC50NfvF2/W/aYgCiMoW1jF9F30L7pnVaFfX1Fwk="; + x64-osx_hash = "sha256-iOaOzisG54+nstPNNUXOYwhEaM1Uh4wHPISVtEf8vTQ="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "3.2.2.5080"; + version = "4.0.4.5922"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/radarr/update.sh b/pkgs/servers/radarr/update.sh index 240689eb45379..ce64b6df429b6 100755 --- a/pkgs/servers/radarr/update.sh +++ b/pkgs/servers/radarr/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Radarr/Radarr/releases/download/v$version/Radarr.master.$version.$os-core-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix to-sri --type sha256 $hash)" + sriHash="$(nix hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } @@ -25,7 +25,7 @@ updateVersion() sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" } -currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; radarr.version)') +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. radarr.version) latestTag=$(curl https://api.github.com/repos/Radarr/Radarr/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index dab8df564ff38..3dff92f4cfc40 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.1.3"; + version = "0.2.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-DEtWFWzUytj9xhNCVTPgSy2vR3sL2VYG76UmF6Dx78M="; + sha256 = "sha256-x4N1JRnx1vyb6VbQkpgguHsBssqJKmG0bSpmvEG38Qc="; }; - vendorSha256 = "sha256-ljbUAsbgonEFDVY6cSeVPkjieXWgF9JFGl6c7J6/164="; + vendorSha256 = "sha256-m5xwxs6XvmPffDX9dkkEG0/LdlDDm6Eq9CC0tVdauVI="; doCheck = false; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 2ea7d9915e5ca..e3be7cbdec458 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.36.2"; + version = "0.37.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-ED0+ETS1E0rw3nDoKNQkBOLMjyx5w/MzvmkjUiH65Ho="; + sha256 = "sha256-uAZlQpuNUpg2ZZJBU7A49fCm6GlrYaFyn6ZrmNBW1Y0="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-wMM0S7G81lrVAwPTCi3JaVEMmDqbw1AL3JJ+C1tZJWw="; + vendorSha256 = "sha256-YqlOzHsdkRrBdQ/mWGs2JIq5JttdRhFeug9HRbl6qlw="; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fb07bc39154d6..dfaf64380a913 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,16 +5,17 @@ , curl, libiconv, ncurses, openssl, pcre, pcre2 , libkrb5, libaio, liburing, systemd , CoreServices, cctools, perl -, jemalloc, less +, jemalloc, less, libedit # Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 , linux-pam, numactl, pmdk +, fmt_8 , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: -let # in mariadb # spans the whole file +let libExt = stdenv.hostPlatform.extensions.sharedLibrary; @@ -42,7 +43,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds ] ++ (packageSettings.extraBuildInputs or []) ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]); @@ -173,7 +174,8 @@ in stdenv.mkDerivation (common // { ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv - ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; + ++ lib.optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] + ++ lib.optionals (lib.versionAtLeast common.version "10.7") [ fmt_8 ]; patches = common.patches; @@ -235,17 +237,27 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.22"; - sha256 = "000ca1hdnj2jg051cjgdd2ralgwgh2p8nwb1x6b85202xdpc7ga4"; + version = "10.4.24"; + sha256 = "0ipqilri8isn0mfvwg8imwf36zm3jsw0wf2yx905c2bznd8mb5zy"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.13"; - sha256 = "0n0w1pyypv6wsknaqyykj3lc9zv6smji4q5jcf90w4rid330iw0n"; + version = "10.5.15"; + sha256 = "0nfvyxb157qsbl0d1i5gfzr2hb1nm0iv58f7qcbk5kkhz0vyv049"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.5"; - sha256 = "13qaqb2h6kysfdi3h1l9zbb2qlpjgxb1n8mxnj5jm96r50209gp0"; + version = "10.6.7"; + sha256 = "1idjnkjfkjvyr6r899xbiwq9wwbs84cm85mbc725yxjshqghzvkm"; + }; + mariadb_107 = mariadbPackage { + # Supported until 2023-02 + version = "10.7.3"; + sha256 = "1m2wa67vvdm61ap8spl18b9vqkmsnq4rfd0248l17jf9zwcnja6s"; + }; + mariadb_108 = mariadbPackage { + # Supported until 2023-05 + version = "10.8.2"; + sha256 = "0v4mms3mihylnqlc0ifvwzykah6lkdd39lmxbv5vnhbsh7wggq0l"; }; } diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 5a79dcd7d2cdb..d124664dd7b52 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.10"; + version = "26.4.11"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "sha256-v3fKadoHCAKHZGPjuh/uLnmAaaPESrax73GEI/mH39g="; + sha256 = "sha256-zAS/YCUNSgkjehUXJpa+FyPC6zHnx3Nmlx0m7hbuZo0="; fetchSubmodules = true; }; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index dbb800a276062..d0dfa5d00f566 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.2.0"; + version = "3.2.1"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-ernhVMaUfAz/uPoS1wgGrdmqBg5itshqLiBvnUtQfP0="; + sha256 = "sha256-+6to3ebKOTSyS6CMirDP8llPV/k96rQaFcgq4btpiT4="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index d94f97baf8654..0037713e597e5 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tegola"; - version = "0.13.0"; + version = "0.14.0"; goPackagePath = "github.com/go-spatial/tegola"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "go-spatial"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ="; + sha256 = "sha256-/1UhgcMLCB1/HtDX6HvVXybn3jOCRLuz2AF+M52Aye0="; }; ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 95ef4b0ea7020..2b764f39bf388 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,11 +2,11 @@ buildGoModule rec { pname = "traefik"; - version = "2.6.0"; + version = "2.6.1"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-+95GB4D6upo6s0K+rxpuolzF5Knind0bYCzgO33mNis="; + sha256 = "sha256-uaROz7DQcy5FlR9/U/QmanqA1qJPJj/ix725Gnei2U0="; stripRoot = false; }; diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index 0ae5523c35a3c..bbc41acf52e4f 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,19 @@ buildGoModule rec { pname = "galene"; - version = "0.3.5"; + version = "0.4.4"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "sha256-CqwxHLXhiBYPS+93/MycS2IR//31puhI+oSpMS/jR1s="; + hash = "sha256-5ngX9VakQlcAVGDQ1R62oNfChGPjbu48ILFA3pBqP7k="; }; - vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; + vendorSha256 = "0rkn6lpy4n5ra1jy3m0ysdjpwh3hq2z4xwda2pzvp99sgszxl5g3"; + + ldflags = [ "-s" "-w" ]; + preCheck = "export TZ=UTC"; outputs = [ "out" "static" ]; @@ -23,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Videoconferencing server that is easy to deploy, written in Go"; homepage = "https://github.com/jech/galene"; + changelog = "https://github.com/jech/galene/raw/galene-${version}/CHANGES"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ rgrunbla ]; diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch new file mode 100644 index 0000000000000..c8840db42e7be --- /dev/null +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -0,0 +1,10 @@ +--- a/plugins/GeoIp2/config/config.php ++++ b/plugins/GeoIp2/config/config.php +@@ -1,5 +1,5 @@ + <?php + + return [ +- 'path.geoip2' => DI\string('{path.root}/misc/'), ++ 'path.geoip2' => PIWIK_USER_PATH . '/misc/', + ]; +\ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index ad8dc85f70fad..aa371223cf0cb 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -32,14 +32,19 @@ let nativeBuildInputs = [ makeWrapper ]; - # make-localhost-default-database-server.patch: - # This changes the default value of the database server field - # from 127.0.0.1 to localhost. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - # TODO: is upstream interested in this? - # -> discussion at https://github.com/matomo-org/matomo/issues/12646 - patches = [ ./make-localhost-default-database-host.patch ]; + patches = [ + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + # -> discussion at https://github.com/matomo-org/matomo/issues/12646 + ./make-localhost-default-database-host.patch + + # This changes the default config for path.geoip2 so that it doesn't point + # to the nix store. + ./change-path-geoip2.patch + ]; # this bootstrap.php adds support for getting PIWIK_USER_PATH # from an environment variable. Point it to a mutable location @@ -73,6 +78,7 @@ let "misc/composer/build-xhprof.sh" "misc/composer/clean-xhprof.sh" "misc/cron/archive.sh" + "plugins/GeoIp2/config/config.php" "plugins/Installation/FormDatabaseSetup.php" "vendor/pear/archive_tar/sync-php4" "vendor/szymach/c-pchart/coverage.sh" diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index fab31f8bdba70..097fc23a12c6c 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-CI2ontloLNIzUJghZzPZ2UPbIS+cJAfKvKeetwvW6vg="; + sha256 = "sha256-d5qjJHNbZVOb7e9sv2YV6ht/0IHctWIJs/dJP6aGCa4="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 4fc092330e378..6d8ea1a9de9dd 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2021-11-12"; + version = "unstable-2022-02-10"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "190500bf1de6a89416e2a74470d3b5cceab102ba"; - sha256 = "1dipsy0s67fr47ig5559bcp1h5yn8rdjshhs8zsq7j8plvvh99qb"; + rev = "e8145d541a35d8a03df49fbbeefa50c4a0076bbf"; + sha256 = "h/3XP/BiNnUgQI29gEBl6RFee77WDhFyvsnTi1eRbKg="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 16565296e1e66..590d71b8f4a3f 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -1,31 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, xorg, boost, cmake, gtest }: +{ lib, stdenv, fetchFromGitHub, xorg, boost, gtest }: stdenv.mkDerivation rec { pname = "xlayoutdisplay"; - version = "1.1.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = pname; rev = "v${version}"; - sha256 = "0n3vg25gzwn1pcg6caxyyd1xf2w6n98m6jpxc70kqpxfqldxwl0m"; + sha256 = "sha256-8K9SoZToJTk/sL4PC4Fcsu9XzGLYfNIZlbIyxc9jf84="; }; - nativeBuildInputs = [ cmake ]; buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; checkInputs = [ gtest ]; doCheck = true; + checkTarget = "gtest"; - # format security fixup + # Fixup reference to hardcoded boost path, dynamically link as seems fine and we don't have static for this postPatch = '' - substituteInPlace test/test-Monitors.cpp \ - --replace 'fprintf(lidStateFile, contents);' \ - 'fputs(contents, lidStateFile);' - - substituteInPlace CMakeLists.txt --replace "set(Boost_USE_STATIC_LIBS ON)" "" + substituteInPlace config.mk --replace '/usr/lib/libboost_program_options.a' '-lboost_program_options' ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + enableParallelBuilding = true; + meta = with lib; { description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; homepage = "https://github.com/alex-courtis/xlayoutdisplay"; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 330722898ce69..656b9ee600674 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -43,11 +43,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-v0Abn0oYcl1I4H9GLN1pV9hk9tTE+Wlv2gPTtEE6t6k="; + hash = "sha256-CIHVpxZ2qC7Ct5Kmc6dxEzxH9s+63/sI07f9SbCh4a4="; }; patches = [ diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix index 1af1ec925e530..9e2ee94efa4ac 100644 --- a/pkgs/tools/X11/xtruss/default.nix +++ b/pkgs/tools/X11/xtruss/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, cmake, halibut }: stdenv.mkDerivation rec { pname = "xtruss"; - version = "20181001.82973f5"; + version = "20211025.c25bf48"; src = fetchurl { url = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss/${pname}-${version}.tar.gz"; - sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd"; + sha256 = "sha256-ikuKHtXEn2UVLE62l7qD9qc9ZUk6jiAqj5ru36vgdHk="; }; + nativeBuildInputs = [ cmake halibut ]; + meta = with lib; { description = "easy-to-use X protocol tracing program"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 73af7f9354518..bf4fdb973851d 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.107"; + version = "3.0.109"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-B9tqebSaOoHIOc/eZa1eh+B0T7LJOtVwYy7QwNt9k90="; + sha256 = "sha256-YlJGYt/depabhMPQtS1dwmFSxoThUEXOWi7KSWx7cRo="; }; vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY="; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index cb6546b2bb6e5..47273cf5ab7e8 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.83.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-PeReZ4sf1MZ3Eia0Ngja9DRgU0xoZTYqj7Q7Vn3p1i8="; + sha256 = "sha256-sHbZHLpRG8x3mTgrg+3htq8PywGe13VYJFdcVxni7Ok="; }; - vendorSha256 = "sha256-SHcLrrJtDT2eUvAqp19gp0rB7L+WaFWkcZeznUFij0U="; + vendorSha256 = "sha256-as3Q8umRES/XncIZbV4UKZSGvzqHF7ClKBWvnGdkYeg="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 182e594084ee0..d6b1933a57c0f 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.49.2"; + version = "1.49.3"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-8v+U0h0+3NVSXBlulOKY0A5oDlqkgNZPoyflRNycDxU="; + sha256 = "sha256-ANykklex/T7JwZ/G3dB4UPkYx5jSE5AnztGsWHGfL8I="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 40c2f05a9bdb7..a218f25f04e8e 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-oqG9E1sSmpV2S7ywLCBRFs9d3Tbv5uxrbRh5DwpktkA="; + sha256 = "sha256-vqzHZ7DW4ev5soFMcafgL/81k6vCsm6Ds5yto/VheX8="; }; - vendorSha256 = "sha256-+2KgRGQIkTHbVzFIv0FVLWuDegk7pZ/H+u07A1PjM/4="; + vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/tools/admin/synapse-admin/default.nix index 4248e62adebf8..52b2183222ed9 100644 --- a/pkgs/tools/admin/synapse-admin/default.nix +++ b/pkgs/tools/admin/synapse-admin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "synapse-admin"; - version = "0.8.3"; + version = "0.8.4"; src = fetchzip { url = "https://github.com/Awesome-Technologies/synapse-admin/releases/download/${version}/synapse-admin-${version}.tar.gz"; - hash = "sha256-LAdMxzUffnykiDHvQYu9uNxK4428Q9CxQY2q02AcUco="; + hash = "sha256-hRjguUQUK7tB4VWVKRid4sRTIF/ulm9RmNA6RNUfaak="; }; installPhase = '' diff --git a/pkgs/tools/archivers/tarlz/default.nix b/pkgs/tools/archivers/tarlz/default.nix index 1e1842d2907e0..7f41a05a9a889 100644 --- a/pkgs/tools/archivers/tarlz/default.nix +++ b/pkgs/tools/archivers/tarlz/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tarlz"; - version = "0.21"; + version = "0.22"; outputs = [ "out" "man" "info" ]; nativeBuildInputs = [ lzip texinfo ]; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; - sha256 = "sha256-D5chEt0/Emo5TVoEEHaVzLu55gPnsZM2e9FxRgfgrfQ="; + sha256 = "sha256-/M9yJvoktV0ybKsT926jSb7ERsWo33GkbTQwmaBQkdw="; }; enableParallelBuilding = true; makeFlags = [ "CXX:=$(CXX)" ]; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with lib; { homepage = "https://www.nongnu.org/lzip/${pname}.html"; diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix new file mode 100644 index 0000000000000..9b8fc94d2edc9 --- /dev/null +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "mpd-discord-rpc"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "JakeStanger"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY="; + }; + + cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg="; + + meta = with lib; { + description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; + homepage = "https://github.com/JakeStanger/mpd-discord-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index 30eb900920b61..92e31c2f57be7 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T34+oHEe+BWFJwWfYnC71+mP4+uhTMYr9r426I4fXcY="; + sha256 = "sha256-9nYLjnJZlwmDkamip1BVF/2NeFmGP+Oot3vRfl2Pcy0="; }; vendorSha256 = "sha256-eKsPdmPJXiCwvb2A28tNxF4xStry3iA6aLb+XYFJYSg="; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 1b151ece3d952..e55823e59ae4a 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }: +{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs, bash }: let zshCompletion = fetchurl { @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "tarsnap"; - version = "1.0.39"; + version = "1.0.40"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn"; + sha256 = "1mbzq81l4my5wdhyxyma04sblr43m8p7ryycbpi6n78w1hwfbjmw"; }; preConfigure = '' @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile.in \ --replace "command -p mv" "mv" + substituteInPlace configure \ + --replace "command -p getconf PATH" "echo $PATH" ''; postInstall = '' diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index ce3205f7b2e26..13ebb018d5955 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.97.2"; + version = "10.97.3"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4242"; - sha256 = "ljfowjaa3whNXavrLTFVUq87nG47sykYtrtGSrZb/rE="; + rev = "4263"; + sha256 = "qELSUQqzufKjaWwXgkrVFROozD4Wjj/BzN8iUuVffwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 44d7e93355bb7..d35d9ebcbcc04 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication { pname = "bashplotlib"; - version = "2019-01-02"; + version = "2021-03-31"; src = fetchFromGitHub { owner = "glamp"; repo = "bashplotlib"; - rev = "f7533172c4dc912b5accae42edd5c0f655d7468f"; - sha256 = "1sifqslvvz2c05spwrl81kcdg792l6jwvfd3ih9q5wjkvkm0plz8"; + rev = "db4065cfe65c0bf7c530e0e8b9328daf9593ad74"; + sha256 = "sha256-0S6mgy6k7CcqsDR1kE5xcXGidF1t061e+M+ZuP2Gk3c="; }; # No tests diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index d8fdada870776..1ac88f3ab92d5 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.11.2"; + version = "2.12.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-EwWV1Z+N2r8mW4Y9D1C0fnd5/s3xaijvmIT0eAwS9N4="; + sha256 = "sha256-wBt3tlEKN5Woid43hdXm0+JPdb7axRPYCJD6KQEOZ3M="; }; - vendorSha256 = "sha256-ipOuwV7HJWRtaj0/c9CrgQZsRrUc1BTUlWWpRypu9AA="; + vendorSha256 = "sha256-7PwqekYz/Um67gKeU7v8p9gIEYGCQ4l9K0jew5HCSo4="; doCheck = false; diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/tools/misc/clickclack/default.nix index 0bcea9a2e8ea3..c7e1cbee79a54 100644 --- a/pkgs/tools/misc/clickclack/default.nix +++ b/pkgs/tools/misc/clickclack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clickclack"; - version = "0.2"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~proycon"; repo = "clickclack"; rev = version; - sha256 = "sha256-hldtHSRdw6yP9lUFna5yvJ3mOTbQbbQNnGM7fMQmmtM="; + hash = "sha256-ABVfJRSzbQ6jIpON2g2wS52QsyNQVfW6+AhTvjkkf6s="; }; buildInputs = [ diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index d77204836b2f5..097605026ee31 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , colord , gettext @@ -7,24 +8,25 @@ , gobject-introspection , gtk-doc , docbook-xsl-ns -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_412 , libxslt , glib , gtk3 +, gtk4 , pkg-config , lcms2 }: stdenv.mkDerivation rec { pname = "colord-gtk"; - version = "0.2.0"; + version = "0.3.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; - sha256 = "05y78jbcbar22sgyhzffhv98dbpl4v6k8j9p807h17y6ighglk1a"; + sha256 = "uUZmVtZtmm/7wt0E+pHI9q9Ra/nvqstpdE7sD1bzwdA="; }; nativeBuildInputs = [ @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection gtk-doc docbook-xsl-ns - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_412 libxslt ]; @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ colord gtk3 + gtk4 ]; meta = with lib; { diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 89435332c9cb4..f3d7503b9c9d7 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , nixosTests , bash-completion @@ -29,13 +30,13 @@ stdenv.mkDerivation rec { pname = "colord"; - version = "1.4.5"; + version = "1.4.6"; outputs = [ "out" "dev" "devdoc" "man" "installedTests" ]; src = fetchurl { url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; - sha256 = "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p"; + sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8="; }; patches = [ @@ -95,7 +96,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d"; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index f36e5217aeafd..dfb61ca29ad9b 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20220116.0"; + version = "20220209.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eItt7AP96juIaP57yGzW/Fb8NAGsns/4nGWQIMv7Xn8="; + sha256 = "sha256-FkFu3SvsowcsOFXvqWmpY3KEypXSb6KcpC/nJbQpDBA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index f790527c92533..444e0e122ef1d 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,21 +16,16 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.1.4"; + version = "2022.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Pv4Rh92d+Jb3ZKPgKVyrgVHr6PGTcIYybdFavbnjuPA="; + sha256 = "sha256-Pt57wI1cYTqT65zGOk1/GyvK0BqITxCzWIyXSNZ9D/0="; }; - patches = [ - # fix missing write permissions on src files before modifing them - ./fix-src-permissions.patch - ]; - postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt diff --git a/pkgs/tools/misc/esphome/fix-src-permissions.patch b/pkgs/tools/misc/esphome/fix-src-permissions.patch deleted file mode 100644 index 5e92350105dd4..0000000000000 --- a/pkgs/tools/misc/esphome/fix-src-permissions.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f72c5035944065941daaa236b60664657c777726 Mon Sep 17 00:00:00 2001 -From: Martin Weinelt <hexa@darmstadt.ccc.de> -Date: Wed, 23 Jun 2021 04:50:35 +0200 -Subject: [PATCH] Set u+w for copied src files before trying to overwrite them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We store esphome in the nix store, which results in its file permissions -being 0444. Esphome, when compiling a firmware image, will copy these -files from the nix store to a working directory. When updating between -versions it will notice these files changed and try to copy the new -version over, which would break, because the user had no write -permissions on the files. - -❯ esphome compile 01e4ac.yml -INFO Reading configuration 01e4ac.yml... -INFO Detected timezone 'CET' with UTC offset 1 and daylight saving time from 27 March 02:00:00 to 30 October 03:00:00 -INFO Generating C++ source... -ERROR Error copying file /nix/store/lmzrgl1arqfd98jcss4rsmmy6dbffddn-esphome-1.19.2/lib/python3.8/site-packages/esphome/components/api/api_connection.cpp to 01e4ac/src/esphome/components/api/api_connection.cpp: [Errno 13] Permission denied: '01e4ac/src/esphome/components/api/api_connection.cpp' - -To fix this we modify chmod to 0644 just before esphome tries a copy -operation, which will fix permissions on existing working directories -just in time. ---- - esphome/helpers.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/esphome/helpers.py b/esphome/helpers.py -index ad7b8272..c456f4ff 100644 ---- a/esphome/helpers.py -+++ b/esphome/helpers.py -@@ -228,6 +228,10 @@ def copy_file_if_changed(src: os.PathLike, dst: os.PathLike) -> None: - if file_compare(src, dst): - return - mkdir_p(os.path.dirname(dst)) -+ try: -+ os.chmod(dst, 0o644) -+ except OSError: -+ pass - try: - shutil.copy(src, dst) - except OSError as err: --- -2.31.1 - diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 3f480a0ec5e4a..6ba612070431f 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEZ7H7WOPpzCGMLPgyfVJudamSWynoB5qnZSbVXj5uk="; + sha256 = "sha256-H7LgADzES5Zi5+lcooix+WCjDxqkThIIGvwa8IiHDHo="; }; - vendorSha256 = "sha256-7c5bd5pEulcr1mpdEUr2tDZNwjRkjqXOLiu+2x5/uFs="; + vendorSha256 = "sha256-4Hb+SmmPk4+c4QoOJADinKGD1xd0RYzn2wniuBxatAw="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index a22e6eab06cc2..293ee08a27525 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,31 +2,31 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.8"; + version = "0.9.18"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-8XS30fRxHPady/snr3gfo8Ryiw9O7EeDezcYYZjod1w="; + sha256 = "sha256-ukFY6Iy7RaUjECbMCMdOkulMdzUlsoBnyRiuzldXVc8="; }; - vendorSha256 = "sha256-8r7v3526kY+rFHkl1+KEwNbFrSnXPlpZD6kiK4ea+Zg="; + vendorSha256 = "sha256-D4tXBXtD3FlWvp4GPIuo/2p3MKg81DVPT5pKVOGe/5c="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; - # Install completions post-install + subPackages = [ "cmd/infracost" ]; + nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ terraform ]; - # Short only runs the unit-tests tagged short - checkFlags = [ "-v" "-short" ]; + # -short only runs the unit-tests tagged short + checkFlags = [ "-short" ]; checkPhase = '' runHook preCheck # Remove tests that require networking - rm cmd/infracost/{breakdown_test,diff_test}.go - # ldflags are required for some of the version testing - go test ./... $checkFlags ''${ldflags:+-ldflags="$ldflags"} + rm cmd/infracost/{breakdown_test,diff_test,run_test}.go + + go test $checkFlags ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES ./... runHook postCheck ''; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 6254e90e6b6c7..46a979d073705 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-2/LBldSIiAFMY8ytMurbPfLQoKn1FNn6hfMozD48LaI="; + sha256 = "sha256-pKNcgrhq5sh6AXKCStAIYAjTpW+tcnSheFHohp+Z84k="; }; - cargoSha256 = "sha256-0EuYYaH0Quy6wvuUsy9u/ayf/8zToTtTJzvYCWNk8ac="; + cargoSha256 = "sha256-QonLcAixRR7HEefU6D7cSF/stWFodWLWQI7HAkPJHrY="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index 0e2db1b986a24..71e4de7479c0d 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "mmctl"; - version = "6.3.0"; + version = "6.3.3"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-hrNVDHM8AweAdda9SC29EGhkOhdiLD0EE1BLPhwe5SI="; + sha256 = "sha256-V2p6diXymu37aJdHs0ZQJ7ak4LWe55KYCq15JRzMF48="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 6f4952f927997..72aea5c44d9a9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-8BfnxiBBql4X4veUzSV8oo2Wakt5hENz4aYcOemFtbw="; + sha256 = "sha256-uwQR38L81galqrOEF2qWxKi1UelaUmpkeg0WbkcbYfs="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-0A0PKmmbg11f3ilf/3bh0sVtHlZXgn72LQv4CRCu/VQ="; + vendorSha256 = "sha256-wzGv46wcPjpxiQsiNZQGC4DMHcMrWOEmacC5E0F2YCs="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 4d0c331373455..821cf8d21d5e1 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.8.1"; + version = "10.8.2"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-O1jqaUQZymCNcp+mznLtK0xRr0RHKe77zcbmcCkMqn8="; + sha256 = "sha256-hmgTQ9IEFYMasW72w9HDF+I0XncZJeBpiukgoDqeqrY="; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix index 8ead57a07eb98..6db1675fe02c0 100644 --- a/pkgs/tools/misc/rates/default.nix +++ b/pkgs/tools/misc/rates/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rates"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lunush"; repo = pname; rev = version; - sha256 = "077qxs4kwfprsai07dninkhmj3ihnghdxan98iv8gmsl3pijbgwh"; + sha256 = "sha256-ivJ6rD4+EYeMg6nOWzf3lp521+7NTBq5vCn7648q0T8="; }; - cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w"; + cargoSha256 = "sha256-dsWAxYFB096SZN5tfzEMokdQ8qw1aR/6Hmjtkdw1L8E="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 8d5d7356da528..22b669e4fdc61 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.12"; + version = "03.04.00"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-1KpM2lobU+KsxjHpNeAxwAx3mCrU8IZyhvfYJwlUQJ4="; + sha256 = "sha256-uIpIygxV5l122FN8sz+OMeQh8iL4Vy87EM1/CjFvLVI="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 9f974c6751bb0..1c49d68cd00a8 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20211213"; + version = "20220213"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-U7ydZ6nSVtMv9mxNSWT/IICwbjK3PCBKxfqjrQ9jwW0="; + sha256 = "sha256-lFb8NwKg8GBgkVsg01rlGrP31APwhFaCFT7QdqiT6J0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 0f3dd4e24f60b..412995b710f66 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -10,15 +10,15 @@ let in buildGoModule rec { pname = "datadog-agent"; - version = "7.33.0"; + version = "7.33.1"; src = fetchFromGitHub { inherit owner repo; rev = version; - sha256 = "sha256-8QwXJrhuONdmM0oneGip4BhYkfuaNoYQn+MjlIpCk98="; + sha256 = "sha256-H8apgLdm90/gVsqcCSc3gymgUUP2AWcNPgV9394UUeQ="; }; - vendorSha256 = "sha256-3caBX+Z1SbX0u5yfh/218HH2jEvKV1IM6fd3HkYHTGk="; + vendorSha256 = "sha256-qIm9ZIQTNmKUtTMBsGzH0t4MrIAvksea9t7p5cC6ykk="; subPackages = [ "cmd/agent" diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 7453ab04087ce..4e88b652e3189 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QwX31R/FuV8vACpgBJ5z94y1U4zH+ToEiloJ16kXqVc="; + sha256 = "sha256-Bo6OxHNZYA1cP2iP/QnaN80DcwBGIVCQXH/mc75hFUY="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 96a999e27790b..63560ce7ad6af 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; license = licenses.asl20; - maintainers = with maintainers; [ dezgeg pingiun ]; + maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 70f1da0dc23a3..108cd769a735f 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-oXynemPs41C4m0GAT1m5Jz5lqMNQWn4j7VcMwH6rg4E="; + sha256 = "sha256-dxOR+rgTaSgauVBz5PgSn8MPmsdQTEGH7h5bXFIT7wM="; }; - cargoSha256 = "sha256-Akn2G13OuHLURYJYqypZvIfwcO3Dv/tm6XyxGMAFr1w="; + cargoSha256 = "sha256-w8+wn8jnsEZAkMEZRWMaytskhG+noMPjk4+U+SdghMQ="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 87cb304ed50dc..b702c51136604 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-PpB5DfyDKvpspP30Uo3izi508+H3S+0NcK1UvVkg6VQ="; + sha256 = "sha256-LeNCT9dFK+HBwT1eCZQGEoUFXFcEaxyzwiDWdhHQ2n4="; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index c747c034d3706..f8aab394700df 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-GjDlJ5SEh0oPPx+U6RLWq4NmDCOhm3WUSCSnfBwtbv8="; + sha256 = "sha256-Z0BjwzTdKHAeETHya6M5OcsIIY//y6dDbbyZe/irCAY="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 1f92fd0ce320e..a19789651c2ee 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - sha256 = "sha256-VzK6WykC3UDlhhyu8LMRHgOMkdEssJuh1Aqp0rGx7F4="; + sha256 = "sha256-4VUzKTzeFC04c93PCnBnEoEoBDCyMg00uznv7ZOr+uY="; }; postConfigure = '' @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-extldflags '-static'" ]; - vendorSha256 = "sha256-ZRUy6gsl4Q2Sdm8Bfo4ANPdwcNQi5LNV6SbynpwfnOc="; + vendorSha256 = "sha256-BoAEmgN+ufzT1vp7mzPzYcfdXKJVWaZq/fzA90e+z8M="; doCheck = false; # tests require network access diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 14821b3d50382..be67bca63cf37 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-02-07T09-25-34Z"; + version = "2022-02-13T23-26-13Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-EoRJK+0C1SYKRrCoddCNkjyVV7yJp0vekYUD6yf86Rs="; + sha256 = "sha256-1Led0OTJO/nN8NisLD/of5IybwYOygsL4xwQmXYCxfs="; }; - vendorSha256 = "sha256-tJh+ElqKG3HUex2VT2YoawVZYq9rtK1X24E1GpDuOPA="; + vendorSha256 = "sha256-DDtpRKBetVyeUYk0OGddKkAEe3mqL7d+cbSdIbXeZ2s="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 52c481e3c7e1b..1d350ee4403de 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ScB0zJXyk8bPEDCxdymMqNmlhe/skNHr6IRmJpme+qQ="; + sha256 = "sha256-Uts9hKhnFNYdQhxeUoTOehCcfgqQwStSoGWixgY3dPU="; }; - cargoSha256 = "sha256-736UYTCs4d1DcpHWl5AejEaW+SYzlgElozC3t/RU41g="; + cargoSha256 = "sha256-YxXniyuQEM+vrCbflqCLlnXpH3ClAd9O496SFVKRvBs="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/tools/networking/notemap/default.nix index 040f26752b516..726b24469ab5c 100644 --- a/pkgs/tools/networking/notemap/default.nix +++ b/pkgs/tools/networking/notemap/default.nix @@ -3,6 +3,7 @@ , fetchzip , pkg-config , libressl +, memstreamHook }: stdenv.mkDerivation rec { @@ -20,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ libressl + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + memstreamHook ]; meta = { diff --git a/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch b/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch deleted file mode 100644 index d794efeac08ae..0000000000000 --- a/pkgs/tools/networking/ntopng/0001-Undo-weird-modification-of-data_dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/Prefs.cpp b/src/Prefs.cpp -index 76385c4..db8d20d 100755 ---- a/src/Prefs.cpp -+++ b/src/Prefs.cpp -@@ -795,7 +795,6 @@ int Prefs::checkOptions() { - ntop->getTrace()->traceEvent(TRACE_ERROR, "Unable to create log %s", path); - } - -- free(data_dir); data_dir = strdup(ntop->get_install_dir()); - docs_dir = ntop->getValidPath(docs_dir); - scripts_dir = ntop->getValidPath(scripts_dir); - callbacks_dir = ntop->getValidPath(callbacks_dir); diff --git a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch b/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch deleted file mode 100644 index 50ed1daebd484..0000000000000 --- a/pkgs/tools/networking/ntopng/0002-Remove-requirement-to-have-writeable-callback-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/Ntop.cpp b/src/Ntop.cpp -index 8de92a9..510418f 100644 ---- a/src/Ntop.cpp -+++ b/src/Ntop.cpp -@@ -197,8 +197,7 @@ void Ntop::registerPrefs(Prefs *_prefs) { - } - - if(stat(prefs->get_callbacks_dir(), &statbuf) -- || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */ -- || (!(statbuf.st_mode & S_IWRITE)) /* It's not writable */) { -+ || (!(statbuf.st_mode & S_IFDIR)) /* It's not a directory */) { - ntop->getTrace()->traceEvent(TRACE_ERROR, "Invalid directory %s specified", - prefs->get_callbacks_dir()); - _exit(-1); diff --git a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch b/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch deleted file mode 100644 index 51c9a706f8983..0000000000000 --- a/pkgs/tools/networking/ntopng/0003-New-libpcap-defines-SOCKET.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001 -From: emanuele-f <faranda@ntop.org> -Date: Tue, 18 Sep 2018 12:49:57 +0200 -Subject: [PATCH] Compilation fix with new libpcap - -SOCKET and INVALID_SOCKET are now defined in pcap.h ---- - third-party/mongoose/mongoose.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c -index 6a61cea9b..634c142e3 100644 ---- a/third-party/mongoose/mongoose.c -+++ b/third-party/mongoose/mongoose.c -@@ -247,7 +247,9 @@ struct pollfd { - #define mg_rename(x, y) rename(x, y) - #define mg_sleep(x) usleep((x) * 1000) - #define ERRNO errno -+#ifndef INVALID_SOCKET - #define INVALID_SOCKET (-1) -+#endif - - /* ntop */ - #if ((ULONG_MAX) == (UINT_MAX)) -@@ -270,7 +272,9 @@ struct pollfd { - #endif - - //#define INT64_FMT PRId64 -+#ifndef SOCKET - typedef int SOCKET; -+#endif - #define WINCDECL - - #endif // End of Windows and UNIX specific includes diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 46dd586c0fa18..652ad4e288670 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,62 +1,46 @@ -{ lib, stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib -, geoip, geolite-legacy, sqlite, which, autoreconfHook, git -, pkg-config, groff, curl, json_c, luajit, zeromq, rrdtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, bash, autoreconfHook +, zeromq, ndpi, json_c, openssl, libpcap, libcap, curl, libmaxminddb +, rrdtool, sqlite, libmysqlclient, expat, net-snmp }: -# ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ -# directory, but we use luajit, zeromq, and rrdtool from nixpkgs - stdenv.mkDerivation rec { pname = "ntopng"; - version = "2.0"; + version = "5.2.1"; - src = fetchurl { - urls = [ - "mirror://sourceforge/project/ntop/ntopng/old/ntopng-${version}.tar.gz" - "mirror://sourceforge/project/ntop/ntopng/ntopng-${version}.tar.gz" - ]; - sha256 = "0l82ivh05cmmqcvs26r6y69z849d28njipphqzvnakf43ggddgrw"; + src = fetchFromGitHub { + owner = "ntop"; + repo = "ntopng"; + rev = version; + sha256 = "sha256-FeRERSq8F3HEelUCkA6pgNNcP94xrWy6EbJgk+cEdqc="; }; patches = [ - ./0001-Undo-weird-modification-of-data_dir.patch - ./0002-Remove-requirement-to-have-writeable-callback-dir.patch - ./0003-New-libpcap-defines-SOCKET.patch + (fetchpatch { + url = "https://github.com/ntop/ntopng/commit/0aa580e1a45f248fffe6d11729ce40571f08e187.patch"; + sha256 = "sha256-xqEVwfGgkNS+akbJnLZsVvEQdp9GxxUen8VkFomtcPI="; + }) ]; - buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy - sqlite which autoreconfHook git pkg-config groff curl json_c luajit zeromq - rrdtool ]; + nativeBuildInputs = [ bash autoreconfHook pkg-config ]; + buildInputs = [ + zeromq ndpi json_c openssl libpcap curl libmaxminddb rrdtool sqlite + libmysqlclient expat net-snmp libcap + ]; - autoreconfPhase = '' - substituteInPlace autogen.sh --replace "/bin/rm" "rm" - substituteInPlace nDPI/autogen.sh --replace "/bin/rm" "rm" - $shell autogen.sh - ''; + autoreconfPhase = "bash autogen.sh"; preConfigure = '' substituteInPlace Makefile.in --replace "/bin/rm" "rm" ''; preBuild = '' - substituteInPlace src/Ntop.cpp --replace "/usr/local" "$out" - - sed -e "s|\(#define CONST_DEFAULT_DATA_DIR\).*|\1 \"/var/lib/ntopng\"|g" \ - -e "s|\(#define CONST_DEFAULT_DOCS_DIR\).*|\1 \"$out/share/ntopng/httpdocs\"|g" \ - -e "s|\(#define CONST_DEFAULT_SCRIPTS_DIR\).*|\1 \"$out/share/ntopng/scripts\"|g" \ - -e "s|\(#define CONST_DEFAULT_CALLBACKS_DIR\).*|\1 \"$out/share/ntopng/scripts/callbacks\"|g" \ - -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \ + sed -e "s|\(#define CONST_BIN_DIR \).*|\1\"$out/bin\"|g" \ + -e "s|\(#define CONST_SHARE_DIR \).*|\1\"$out/share\"|g" \ -i include/ntop_defines.h - - rm -rf httpdocs/geoip - ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip - '' + lib.optionalString stdenv.isDarwin '' - sed 's|LIBS += -lstdc++.6||' -i Makefile ''; - NIX_CFLAGS_COMPILE = "-fpermissive" - + lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; + enableParallelBuilding = true; meta = with lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 163341d064660..84327c8f5eef2 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pGkTCOQ2OR/9c5+L9UgESJjSMmz9FjfJw9NB8Nr6gRQ="; + sha256 = "sha256-Po0HCAK9h1GWSfKzV+1j3ddikCNIULbywx501GvRT/Q="; }; - vendorSha256 = "sha256-hvY64cmfvEeHniscD1WDyaeFpWeBJwsDNwr76e9F6ow="; + vendorSha256 = "sha256-GSNNOWhWpXRJEIzLoBci25sp9pu0W1mS18G8eFOsfhw="; # Tests use network doCheck = false; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 30495b9184625..15711e8d43b2b 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config -, openssl, ppp -, systemd ? null }: +, openssl +, ppp +, systemd +, withSystemd ? stdenv.isLinux +, withPpp ? stdenv.isLinux +}: -let - withSystemd = stdenv.isLinux && !(systemd == null); - -in stdenv.mkDerivation rec { pname = "openfortivpn"; version = "1.17.1"; @@ -26,15 +26,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - openssl ppp + openssl ] - ++ lib.optional withSystemd systemd; + ++ lib.optional withSystemd systemd + ++ lib.optional withPpp ppp; configureFlags = [ "--sysconfdir=/etc" - "--with-pppd=${ppp}/bin/pppd" ] - ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; + ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd"; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index f67d29f09d490..31a4262d8a645 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: +{ lib, stdenv, fetchsvn +, makeWrapper, pkg-config +, gawk, gnutls, libgcrypt, nettools, openresolv, perl +, opensslSupport ? false, openssl # Distributing this is a GPL violation. +}: stdenv.mkDerivation { pname = "vpnc"; @@ -20,22 +24,22 @@ stdenv.mkDerivation { # `ifconfig' as found in net-tools (not GNU Inetutils). propagatedBuildInputs = [ nettools ]; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [libgcrypt perl openssl ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optional (!opensslSupport) pkg-config; + buildInputs = [ libgcrypt perl ] + ++ (if opensslSupport then [ openssl ] else [ gnutls ]); makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc/vpnc" "SCRIPT_PATH=$(out)/etc/vpnc/vpnc-script" - ]; + ] ++ lib.optional opensslSupport "OPENSSL_GPL_VIOLATION=yes"; postPatch = '' patchShebangs makeman.pl ''; preConfigure = '' - sed -i 's|^#OPENSSL|OPENSSL|g' Makefile - substituteInPlace "vpnc-script" \ --replace "which" "type -P" \ --replace "awk" "${gawk}/bin/awk" \ @@ -56,11 +60,10 @@ stdenv.mkDerivation { cp README nortel.txt ChangeLog $out/share/doc/vpnc/ ''; - meta = { + meta = with lib; { homepage = "https://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.linux; + license = if opensslSupport then licenses.unfree else licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix new file mode 100644 index 0000000000000..6347a18c6fbff --- /dev/null +++ b/pkgs/tools/networking/xrootd/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, callPackage +, fetchFromGitHub +, cmake +, cppunit +, curl +, fuse +, libkrb5 +, libuuid +, libxml2 +, openssl +, pkg-config +, readline +, systemd +, zlib +, enableTests ? true +}: + +stdenv.mkDerivation rec { + pname = "xrootd"; + version = "5.4.0"; + + src = fetchFromGitHub { + owner = "xrootd"; + repo = "xrootd"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "A2yUz2KhuRBoo5lMpZwPLNCJlYQXqsZSBR+Knj+gWAk="; + }; + + outputs = [ "bin" "out" "dev" "man" ]; + + passthru.tests = lib.optionalAttrs enableTests { + test-runner = callPackage ./test-runner.nix { }; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + curl + libkrb5 + libuuid + libxml2 + openssl + readline + zlib + ] + ++ lib.optionals stdenv.isLinux [ + fuse + systemd + ] + ++ lib.optionals enableTests [ + cppunit + ]; + + preConfigure = '' + patchShebangs genversion.sh + + # Manually apply part of + # https://github.com/xrootd/xrootd/pull/1619 + # Remove after the above PR is merged. + sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake + ''; + + cmakeFlags = lib.optionals enableTests [ + "-DENABLE_TESTS=TRUE" + ]; + + meta = with lib; { + description = "High performance, scalable fault tolerant data access"; + homepage = "https://xrootd.slac.stanford.edu"; + license = licenses.lgpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/tools/networking/xrootd/test-runner.nix b/pkgs/tools/networking/xrootd/test-runner.nix new file mode 100644 index 0000000000000..5bcf1ae867590 --- /dev/null +++ b/pkgs/tools/networking/xrootd/test-runner.nix @@ -0,0 +1,27 @@ +{ lib +, runCommand +, xrootd +}: + +# These tests are specified in the test procedure of the upstream CD: +# https://github.com/xrootd/xrootd/blob/master/.github/workflows/build.yml#L90-L98 +runCommand "${xrootd.pname}-run-tests-${xrootd.version}" { + testRunnerPath = "${xrootd}/bin/test-runner"; + testLibraries = [ "XrdClTests" ]; + XrdClTestsSuites = [ "UtilsTest" "SocketTest" "PollerTest" ]; + pname = "${xrootd.pname}-run-tests"; + inherit (xrootd) version; + meta.mainProgram = "test-runner"; +} '' + for testLibrary in $testLibraries; do + echo "Testing $testLibrary" + testLibraryPath="${xrootd.out}/lib/lib''${testLibrary}.so" + testsuiteVarname="''${testLibrary}Suites" + for testsuite in ''${!testsuiteVarname}; do + echo "Doing test $testsuite" + "$testRunnerPath" "$testLibraryPath" "All Tests/$testsuite/" + done + done + mkdir -p "$out/bin" + ln -s "$testRunnerPath" "$out/bin/test-runner" +'' diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 9135e8e141616..7ed599345ebe2 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -1,20 +1,26 @@ { lib , rustPlatform , fetchFromGitHub +, testVersion +, alejandra }: rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - hash = "sha256-jj66PRqXASDNzdidkdfF2ezWM45Pw9Z+G4YNe8HRPhU="; + sha256 = "sha256-Gtz+z8ESIqY/2V6X/rLMweqio66IGaUVGmIT/Y20+JY="; }; - cargoSha256 = "sha256-701lWa/2u10vCSRplL1ebYz29DxjpHY0SqjSWme1X1U="; + cargoSha256 = "sha256-kydMIbx5Fu7+uwXn7KrrNd1fhXZQ5sabX4TBYpvmimk="; + + passthru.tests = { + version = testVersion { package = alejandra; }; + }; meta = with lib; { description = "The Uncompromising Nix Code Formatter"; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index b88275731b36e..0c791bbf80fbf 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-Sh+nAeFd163nr8h3jBJbfDiMt+8+6bi/B1OOVVGMTXo="; + sha256 = "sha256-KWLZdFpRwtdP17x71IU2MGFwd1SNnTRcgTUoW1p5Px4="; }; - cargoSha256 = "sha256-QPp/vO4ZBvxbBtXbvU1ZRLPXOmzMCaJ1/mtuTpL6UYw="; + cargoSha256 = "sha256-CTaEWANx3s7YCm8pqGWuvGqR362YtVjmbnc9V3kC8pI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ffbe598b92918..f7bb530480ccf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -58,8 +58,8 @@ in lib.makeExtensible (self: { }; nix_2_6 = common { - version = "2.6.0"; - sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; + version = "2.6.1"; + sha256 = "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0="; }; stable = self.nix_2_6; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 25ad5be89e830..15f94aceaa4e7 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -11,6 +11,7 @@ , vala , gtk-doc , nix +, nlohmann_json ? null , boost , meson , ninja @@ -26,18 +27,24 @@ , enableSystemd ? stdenv.isLinux , systemd }: +let + nix_version = lib.removeSuffix nix.VERSION_SUFFIX nix.version; + useNlohmann = lib.versionAtLeast "2.7" nix_version; +in + +assert useNlohmann -> nlohmann_json != null; stdenv.mkDerivation rec { pname = "packagekit"; - version = "1.2.5pre"; + version = "1.2.5.1pre"; outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "PackageKit"; repo = "PackageKit"; - rev = "9c2ef9cddf39ebde587907561f8e7ac99ed6be1a"; - sha256 = "05z1ds240kcmigygkbgjasr4spn7vd7cbpsbfrghhgnmszx9bjgl"; + rev = "33b847c49b4a42499e3c0f10fef62830c874e086"; + sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw="; }; buildInputs = [ @@ -52,6 +59,7 @@ stdenv.mkDerivation rec { nix boost ] ++ lib.optional enableSystemd systemd + ++ lib.optional useNlohmann nlohmann_json ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ vala diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 476d248c4343f..b1f5d8b56c308 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0ga3vf5gn7533iqnxn7kchb6xg5wvk92livlqzkhi5qvqhl1sbw0"; + sha256 = "sha256-5QtNAcInp1mUE8SHUUMS8/XURbPx/q8xMsvEEo/rnCs="; }; # Upstream has inconsistent vendoring, see https://github.com/kubernetes-sigs/aws-iam-authenticator/issues/377 deleteVendor = true; - vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME="; + vendorSha256 = null; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index d9fb4a26e89f5..40552d1490438 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "1.31.2"; + version = "1.31.3"; src = fetchurl { url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-5ayFTcvzfOtbwBXSpdr+5CL3jUZ19HPZnZt2JMCCxfo="; + sha256 = "sha256-ASL4+FZh5st3V5Z+jsfvLD26hG9KNVI+tht7kL8lbL4="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 1544194983d12..8959d6627de4f 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -3,7 +3,27 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + + # pycfmodel is pinned, https://github.com/Skyscanner/cfripper/issues/204 + pycfmodel = super.pycfmodel.overridePythonAttrs (oldAttrs: rec { + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = "pycfmodel"; + rev = version; + hash = "sha256-BlnLf0C/wxPXhoAH0SRB22eGWbbZ05L20rNy6qfOI+A="; + }; + }); + }; + }; +in +with py.pkgs; + +buildPythonApplication rec { pname = "cfripper"; version = "1.3.3"; @@ -14,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-y3h/atfFl/wDmr+YBdsWrCez4PQBEcl3xNDyTwXZIp4="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ boto3 cfn-flip click @@ -25,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + checkInputs = with py.pkgs; [ moto pytestCheckHook ]; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 54beab643a80f..5bfc16718bf7c 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hQFkbHOmtk0SqFSPw1+5nCvjq9cKsGzFPtK4jXDrubQ="; + sha256 = "sha256-37jahAGgQn7HwwdRTlAS/oJQ3BxTkMViI6iJMBYFgjI="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 5b4f0a5da146a..9ba91d186530d 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-92J9yRTSk2EP3lXCWH1+Ha+dx3dTNur6LIDMKbGmseI="; + sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU="; }; - vendorSha256 = "sha256-692PcWFYNInWcZm9NQHLQmRHGFV9XUSFoCqHo7fcGEU="; + vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 114862f86628e..c6c48b515e3ef 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-02-11"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-pSvjTL/vS3E9jYGxae9RUw+DD9u49PoF7oNM/UZOzDg="; + sha256 = "sha256-qmddjXZq4SLsAMEIMtpkXURfTUEDjXnkFGXLt/zrk9s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 636358f6ea63f..8e0fb95c7c432 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-jddkws4TXuW0AdLBEpS5RPk1a/mEkwYWMbYiLjt22LU="; + hash = "sha256-lqV09FEZAw1ir2cJr8ABhbgSoZoWnxhbxyA1HAufLQA="; }; - cargoHash = "sha256-bj77fMmpXeOqb1MzOPsEPQUh5AnZxBrapzt864V+IUU="; + cargoHash = "sha256-RMF4/WJRcpHuXKMvDYAGaJxUazcpkQCpv//u5XOd9Dg="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 49dc002133d3e..30206fab0eb96 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,14 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "grype"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jn28IusHgHHFFrvqZLIvbqCFMhMQ5K/gqC4hVQLffY0="; + sha256 = "sha256-RXEeJZeC6hA6DetZnUNWFtNZEy4HJpxviL8pySBLfts="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,9 +26,12 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-05/xFjgiqbXy7Y2LTGHcXtvusGgfZ/TwLQHaO8rIjvc="; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-2T2fw1nOycP1LxUuMSmz1ke2bg4yox/tIAveXCNJG9Y="; + + nativeBuildInputs = [ + installShellFiles + ]; ldflags = [ "-s" diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index e56e99909fffa..be6514630f56a 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gcc python3Packages.wrapPython perl makeWrapper ]; propagatedBuildInputs = (with python3Packages; [ dpkt scapy lxml ]) ++ # For pcap2john.py (with perlPackages; [ DigestMD4 DigestSHA1 GetoptLong # For pass_gen.pl + CompressRawLzma # For 7z2john.pl perlldap ]); # For sha-dump.pl # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 5cccc1dd5f528..beaa06fd8360c 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1bipphrzfz4dfzaqn1q60qazs7ylcx0b34gyl4q6d6jivsrhi8a4"; + sha256 = "sha256-GKjumkeo7aAYaECa6NoXCiXU2kqekBX3wCysRz8seW4="; }; - cargoSha256 = "0r254k85hqf2v8kdhwld8k7b350qjvkwfw2v22ikk2b41b2g4gbw"; + cargoSha256 = "sha256-rJ110kd18V2VGj0AHix3/vI09FG2kJ+TTOYKIthIrjQ="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 4e372e7dad837..1f53dc2a8aecd 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "5.9.1"; + version = "5.9.3"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI="; + sha256 = "sha256-vPQ1hBd33DwsW0b79kNH1yd7mrwkoftIYFgmMVxC+78="; }; vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo="; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index b49ce7305deb6..d93f0135c20a1 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-30P/YggrPEVpsh2qo751aW6RtrpIVe1XQWyYZm8P4yA="; + sha256 = "sha256-sfAmyx9MgzCVA1Da7hl6/sKxhS9ptaNLeSB8wmJIKDs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index bcff98114ca95..eb6e90ac77581 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.29" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.30" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 015ccc8ef39db..5711b8756e3f1 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 61b21e59fe8f4f65fba27f88d49782dece0aad00 - ref: refs/tags/6.1.29 + revision: aab66244adaadb275bd780c1301fea51f444426a + ref: refs/tags/6.1.30 specs: - metasploit-framework (6.1.29) + metasploit-framework (6.1.30) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.72) + metasploit-payloads (= 2.0.74) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -98,25 +98,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) - activesupport (6.1.4.4) + activemodel (6.1.4.6) + activesupport (= 6.1.4.6) + activerecord (6.1.4.6) + activemodel (= 6.1.4.6) + activesupport (= 6.1.4.6) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -128,16 +128,16 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.554.0) - aws-sdk-core (3.126.0) + aws-partitions (1.555.0) + aws-sdk-core (3.126.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.298.0) + aws-sdk-ec2 (1.299.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.66.0) + aws-sdk-iam (1.67.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.54.0) @@ -175,7 +175,7 @@ GEM eventmachine (1.2.7) faker (2.19.0) i18n (>= 1.6, < 2) - faraday (1.9.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -216,12 +216,12 @@ GEM domain_name (~> 0.5) http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) io-console (0.5.11) irb (1.3.6) reline (>= 0.2.5) - jmespath (1.5.0) + jmespath (1.6.0) jsobfu (0.4.2) rkelly-remix json (2.6.1) @@ -229,7 +229,7 @@ GEM logging (2.3.0) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.13.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.72) + metasploit-payloads (2.0.74) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -267,7 +267,7 @@ GEM mini_portile2 (2.7.1) minitest (5.15.0) mqtt (0.5.0) - msgpack (1.4.4) + msgpack (1.4.5) multi_json (1.15.0) multipart-post (2.1.1) mustermann (1.1.1) @@ -298,13 +298,13 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.1) + pg (1.3.2) public_suffix (4.0.6) - puma (5.6.1) + puma (5.6.2) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) - rack-protection (2.1.0) + rack-protection (2.2.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -313,9 +313,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) method_source rake (>= 0.13) thor (~> 1.0) @@ -334,7 +334,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.25) + rex-core (0.1.26) rex-encoder (0.1.6) metasm rex-arch @@ -353,7 +353,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.94) + rex-powershell (0.1.95) rex-random_identifier rex-text ruby-rc4 @@ -379,7 +379,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.2) + ruby_smb (3.0.4) bindata openssl-ccm openssl-cmac @@ -392,10 +392,10 @@ GEM faraday (> 0.8, < 2.0) simpleidn (0.2.1) unf (~> 0.1.4) - sinatra (2.1.0) + sinatra (2.2.0) mustermann (~> 1.0) rack (~> 2.2) - rack-protection (= 2.1.0) + rack-protection (= 2.2.0) tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) @@ -432,9 +432,9 @@ GEM logging (>= 1.6.1, < 3.0) nori (~> 2.0) rubyntlm (~> 0.6.0, >= 0.6.3) - xdr (3.0.2) - activemodel (>= 4.2, < 7.0) - activesupport (>= 4.2, < 7.0) + xdr (3.0.3) + activemodel (>= 4.2, < 8.0) + activesupport (>= 4.2, < 8.0) xmlrpc (0.3.2) webrick zeitwerk (2.5.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 71372903384e0..dcaeafc428a07 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.29"; + version = "6.1.30"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-S0R9D6Tih9+aVdYkpAodfwcRCq8WaqaJ5oYuPl7PgK8="; + sha256 = "sha256-QSKJIcHaWsxbHe2uTW5MnZFMoK1fOa6TejIT2Mq0z7k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7042ed35260c4..531b0b6c24e86 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; addressable = { groups = ["default"]; @@ -104,40 +104,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5dyi1hy9xawlicdfzakj279r514vmb93kpwfa92lbb9bz1plg5"; + sha256 = "0r3ihnddcizpf34mcfggyjii8lmjyy1q89mswpbzqa5mxvws85qg"; type = "gem"; }; - version = "1.554.0"; + version = "1.555.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002hgcpsch33r82jd5imyxj0h2w4v8ymmby42rnxdisd03jkygy9"; + sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v"; type = "gem"; }; - version = "3.126.0"; + version = "3.126.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s0xdcrhmcgbh4m1g57dnw04g45zviv6a4r3qaw8468bm6bi16z6"; + sha256 = "13kl993psm21mni2g3llyj6b1nzway8kcabnrblnrjkd4d4fg3v7"; type = "gem"; }; - version = "1.298.0"; + version = "1.299.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dr1lgg76syyqj12x8w0j6qvwn3410vdjhy0r9y8k930svrjlkh7"; + sha256 = "1iv8db2wb3lajcnqx6icn7bdvhrfd7di01c329r95kgw6gzsf7sc"; type = "gem"; }; - version = "1.66.0"; + version = "1.67.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.0"; }; faraday-em_http = { groups = ["default"]; @@ -564,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; io-console = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan"; + sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; jsobfu = { groups = ["default"]; @@ -644,10 +644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; type = "gem"; }; - version = "2.13.0"; + version = "2.14.0"; }; metasm = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "61b21e59fe8f4f65fba27f88d49782dece0aad00"; - sha256 = "1bw0rxg3wbl6ws4scshnmw5121vz3l5a896nanddz1z2lh7psi2b"; + rev = "aab66244adaadb275bd780c1301fea51f444426a"; + sha256 = "1ffgnk5dh4rjga9swfazmnh4r4cx9ip4vbpd3mdwqnnsq4hqj8j1"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.29"; + version = "6.1.30"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ybw1daczslifq684hjxmr5668w7db1fi0z6g53812yva7lf4sv6"; + sha256 = "03q70mqn38chhm9cmjh6k4ch5jsrgf2id09jv0ylkn3vsrrjfzpg"; type = "gem"; }; - version = "2.0.72"; + version = "2.0.74"; }; metasploit_data_models = { groups = ["default"]; @@ -776,10 +776,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; + sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; multi_json = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zn1miz2h3pki11jwf6f474540kvai3sc43jp8smi3mjx8brvws0"; + sha256 = "0m776cj2hik15wi730vhgczd5v9s0xmi45q2hgcf5m5cnqvfih35"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; public_suffix = { groups = ["default"]; @@ -997,10 +997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.6.1"; + version = "5.6.2"; }; racc = { groups = ["default"]; @@ -1027,10 +1027,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; rack-test = { groups = ["default"]; @@ -1067,10 +1067,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla"; + sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rake = { groups = ["default"]; @@ -1147,10 +1147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04w1pknswnjs02fgsqcr8dx6cz3qjmx7hs83kbhn836s4yfpyv6a"; + sha256 = "1hjc70q6wb580k0jk4g4s9aqwd25l48kr0pcyjjs2ffax0zcm4d0"; type = "gem"; }; - version = "0.1.25"; + version = "0.1.26"; }; rex-encoder = { groups = ["default"]; @@ -1217,10 +1217,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ib75d16j8z0chni7m9v74xpxf13164hh8kr7v7yg93zpsqxw6p5"; + sha256 = "0ydzvakfg8can56jn0i8qnrf742csyk82krj50b44sj93ncj7h54"; type = "gem"; }; - version = "0.1.94"; + version = "0.1.95"; }; rex-random_identifier = { groups = ["default"]; @@ -1357,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13sp6bqgj06h7jkw5qvafwawfh2akyrsj38vq8qkjfjdg79pkbxf"; + sha256 = "0w7ywnf3b3dsfqarj9yc21q1f5p29vs359x5d7sipvc0ljdwn95l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.4"; }; rubyntlm = { groups = ["default"]; @@ -1407,10 +1407,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; sqlite3 = { groups = ["default"]; @@ -1607,10 +1607,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "019yzxddyndc7m7basars0m380m27sfcq99vr5hk1ag4ymayqkwr"; + sha256 = "1vsimn1vha6qjh1zbkvma5biwlh3hzc6s24ksw7vsxg0z27m8bmz"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; xmlrpc = { groups = ["default"]; diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index d982d73f54119..663cc38291cb3 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,22 +4,22 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-15p4hm4Cvs/yLaQIcxctVdMKRWPjIIFwBcbru6QcjXo="; + sha256 = "sha256-y8klkb0hyITxLhcNWF7RYRVwF8rclDKzQF/MJs6y//Y="; }; - vendorSha256 = "sha256-XCCO4Vamzj5pJFmu1A8mpTLlVAtocrn20myYJVWtBrY="; + vendorSha256 = "sha256-0PPdnE3ND/YNIk50XkgBROpe5OhFiFre5Lwsml02DQU="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ packageToBuild ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/${packageToBuild}/app.GitVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/rekor/pkg/api.GitVersion=v${version}" ]; postInstall = '' installShellCompletion --cmd ${pname} \ diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index e3518799504e5..eaa2bc659a567 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; postInstall = '' + install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules installShellCompletion target/*/release/solo2.{bash,fish,zsh} ''; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 80c0fea6c3e1d..c7db9e363f9de 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.2"; - hash = "sha256-MXPfqxpEIJUbWyT6Ni/wnkNQ234fzrAPdIrisw8gytw="; + version = "1.2.3"; + hash = "sha256-vH167BL2ekWwxIhQWXkgJxl8z77S8SkmHVclW6XGc+8="; src = fetchFromGitHub { owner = "aristocratos"; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index c01a909668ec1..61ef270df7943 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "evemu"; - version = "2.6.0"; + version = "2.7.0"; # We could have downloaded a release tarball from cgit, but it changes hash # each time it is downloaded :/ src = fetchgit { url = "git://git.freedesktop.org/git/evemu"; rev = "refs/tags/v${version}"; - sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; + sha256 = "sha256-SQDaARuqBMBVlUz+Nw6mjdxaZfVOukmzTlIqy8U2rus="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3Packages.python ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; homepage = "https://www.freedesktop.org/wiki/Evemu/"; repositories.git = "git://git.freedesktop.org/git/evemu"; - license = licenses.gpl2; + license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 41e4d99f6a4cd..4204bf8994b29 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.13.1"; + version = "5.13.2"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bUzL9QkSgzJePBnGSYQvsKC975ss5b3kBdIgwgGzEtk="; + sha256 = "sha256-2HADEp1nDkIl56e5oxY6bC+lRWanQwjlCChm0aI0N9Q="; }; vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; @@ -45,7 +45,7 @@ buildGoModule rec { ''; homepage = "https://github.com/dundee/gdu"; license = with licenses; [ mit ]; - maintainers = [ maintainers.fab ]; + maintainers = [ maintainers.fab maintainers.zowoq ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 8a797e8ab13c4..79f829ffdfb18 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.33.0"; + version = "1.33.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-/1rLcfWbrg8gq5AnoSD5cBusc0WGJBc+i/sLyLwM/eY="; + sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 364d3c6edc459..9d56e2e4c1925 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "colordiff"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "daveewart"; repo = "colordiff"; rev = "v${version}"; - sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk"; + sha256 = "sha256-+TtVnUX88LMd8zmhLsKTyR9JlgR7IkUB18PF3LRgPB0="; }; nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ]; diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index c0b9c43436f5c..41ddcfac50a4f 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "0.3.12"; + version = "1.0.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1j3u9r5TjdewAyzuCwCkXl/A2yI9L/AS5QGRpz30N7U="; + sha256 = "sha256-tllwFUC+Si3PsYPmiO86D3PNdInuIxxhZW5dAuU4K14="; }; - cargoSha256 = "sha256-Z+LnWXvVfZa8Mtr9LrieqCBGxaQE1vj1joSttYM5Xhs="; + cargoSha256 = "sha256-j9CwldmxjWYVuiWfAHIV0kr5k/p1BFWHzZiVrv8m7uI="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index a4e5badeb92b9..b665c1823329a 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -1,13 +1,13 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "goawk"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - sha256 = "sha256-gd26j6c8ORy0qkeHvwPFLkymeRiFr8MLxJ6hIrBwAZw="; + sha256 = "sha256-ALzCcSZHnzidj4tQzZWXT8WDPIE147KWbn7n1JHCTRE="; }; vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 5309ee01b9ac9..061e1f709ebb4 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "sha256-xJlOEjGhxpfH3w+RvjXKjXoWPzQ6JkpldxLuKMkVvq0="; + sha256 = "sha256-tE7U/hE1Z/9VZTYt2jU0IE11cS01l6wTPVFuXH36sM4="; }; vendorSha256 = "sha256-ZYsQ+wE+G7xNrBN29npSxxPCz9+Wb/RsBzM5uwJkhO8="; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 67a7b03f180f7..4ed12b5b13449 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.15.0"; + version = "2.15.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-HWekPMrQYTizyiRu9QSztZfZXsDmybXYarj6alGWJag="; + sha256 = "sha256-akJgIS+jf2n9NC4A+/gNQR62BaJ6T9vvdxJggOTRHn8="; }; vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 6994cc25b3845..7407c3dc68ab7 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.30"; + version = "0.3.44"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE="; + sha256 = "sha256-ShL/j0vyKfbNcq/cAgEUCln6T7UE/qmPZOMw129210o="; }; - vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; + vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix new file mode 100644 index 0000000000000..4c254c9a59322 --- /dev/null +++ b/pkgs/tools/wayland/swaytools/default.nix @@ -0,0 +1,22 @@ +{ lib, python3Packages, slurp }: + +python3Packages.buildPythonApplication rec { + pname = "swaytools"; + version = "0.1.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1eb89259cbe027a0fa6bfc06ecf94e89b15e6f7b4965104e5b661c916ce7408c"; + }; + + propagatedBuildInputs = [ slurp ]; + + passthru.updateScript = ./update.py; + + meta = with lib; { + homepage = "https://github.com/tmccombs/swaytools"; + description = "Collection of simple tools for sway (and i3)"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/tools/wayland/swaytools/update.py b/pkgs/tools/wayland/swaytools/update.py new file mode 100755 index 0000000000000..141566848e387 --- /dev/null +++ b/pkgs/tools/wayland/swaytools/update.py @@ -0,0 +1,58 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p python39Packages.requests python39Packages.pip python39Packages.packaging + +import requests +import json +import subprocess +try: + from packaging.version import parse +except ImportError: + from pip._vendor.packaging.version import parse + + +URL_PATTERN = 'https://pypi.python.org/pypi/{package}/json' + +def findLine(key,derivation): + count = 0 + lines = [] + for line in derivation: + if key in line: + lines.append(count) + count += 1 + return lines + +def get_version(package, url_pattern=URL_PATTERN): + """Return version of package on pypi.python.org using json.""" + req = requests.get(url_pattern.format(package=package)) + version = parse('0') + if req.status_code == requests.codes.ok: + j = json.loads(req.text.encode(req.encoding)) + releases = j.get('releases', []) + for release in releases: + ver = parse(release) + if not ver.is_prerelease: + if ver > version: + version = ver + sha256 = j["releases"][release][-1]["digests"]["sha256"] + return version, sha256 + + +if __name__ == '__main__': + + nixpkgs = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode("utf-8").strip('\n') + swaytoolsFolder = "/pkgs/tools/wayland/swaytools/" + with open(nixpkgs + swaytoolsFolder + "default.nix", 'r') as arq: + derivation = arq.readlines() + + version, sha256 = get_version('swaytools') + + key = "version = " + line = findLine(key,derivation)[0] + derivation[line] = f' version = "{version}";\n' + + key = "sha256 = " + line = findLine(key,derivation)[0] + derivation[line] = f' sha256 = "{sha256}";\n' + + with open(nixpkgs + swaytoolsFolder + "default.nix", 'w') as arq: + arq.writelines(derivation) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ea5339ebc2e1..baaed5612284c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -216,6 +216,8 @@ with pkgs; beyond-identity = callPackage ../tools/security/beyond-identity {}; + bingo = callPackage ../development/tools/bingo {}; + breakpad = callPackage ../development/misc/breakpad { }; buf = callPackage ../development/tools/buf { }; @@ -253,11 +255,11 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../misc/emulators/cen64 { }; + cen64 = callPackage ../applications/emulators/cen64 { }; btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../misc/emulators/uxn { }; + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -345,6 +347,10 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; + probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; @@ -375,7 +381,7 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - proton-caller = callPackage ../misc/emulators/proton-caller { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -1083,6 +1089,8 @@ with pkgs; xcd = callPackage ../tools/misc/xcd { }; + xrootd = callPackage ../tools/networking/xrootd { }; + xtrt = callPackage ../tools/archivers/xtrt { }; yabridge = callPackage ../tools/audio/yabridge { @@ -1227,7 +1235,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; logseq = callPackage ../applications/misc/logseq { - electron = electron_16; + electron = electron_15; }; natls = callPackage ../tools/misc/natls { }; @@ -1786,6 +1794,8 @@ with pkgs; fspy = callPackage ../applications/misc/fspy { }; + fluffychat = callPackage ../applications/networking/instant-messengers/fluffychat { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genann = callPackage ../development/libraries/genann { }; @@ -1872,6 +1882,10 @@ with pkgs; openjdk = openjdk11; }; + gremlin-server = callPackage ../applications/misc/gremlin-server { + openjdk = openjdk11; + }; + grex = callPackage ../tools/misc/grex { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2267,7 +2281,7 @@ with pkgs; libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { cudaSupport = config.cudaSupport or false; cudatoolkit = cudatoolkit_10_0; - cudnn = cudnn_cudatoolkit_10_0; + cudnn = cudnn_7_4_cudatoolkit_10_0; }; libtensorflow = @@ -2311,7 +2325,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2367,9 +2381,9 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - simh = callPackage ../misc/emulators/simh { }; + simh = callPackage ../applications/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2494,19 +2508,19 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; cbor-diag = callPackage ../development/tools/cbor-diag { }; @@ -2644,6 +2658,8 @@ with pkgs; swayr = callPackage ../tools/wayland/swayr { }; + swaytools = callPackage ../tools/wayland/swaytools { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; @@ -2870,13 +2886,16 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; - dino = callPackage ../applications/networking/instant-messengers/dino { }; + dino = callPackage ../applications/networking/instant-messengers/dino { + inherit (gst_all_1) gstreamer gst-plugins-base; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; + }; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../misc/emulators/dlx { }; + dlx = callPackage ../applications/emulators/dlx { }; - dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -2915,7 +2934,7 @@ with pkgs; duf = callPackage ../tools/misc/duf { }; inherit (ocaml-ng.ocamlPackages_4_10) dune_1; - inherit (ocamlPackages) dune_2 dune-release; + inherit (ocamlPackages) dune_2 dune_3 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -3500,6 +3519,8 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { }; + mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; @@ -3671,7 +3692,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3693,7 +3714,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -4159,7 +4180,7 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../misc/emulators/citra { }; + citra = libsForQt5.callPackage ../applications/emulators/citra { }; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4229,6 +4250,8 @@ with pkgs; unifdef = callPackage ../development/tools/misc/unifdef { }; + uniffi-bindgen = callPackage ../development/tools/uniffi-bindgen { }; + unify = with python3Packages; toPythonApplication unify; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; @@ -4498,18 +4521,22 @@ with pkgs; cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) - cudnn_cudatoolkit_10 - cudnn_cudatoolkit_10_0 - cudnn_cudatoolkit_10_1 - cudnn_cudatoolkit_10_2 - cudnn_cudatoolkit_11 - cudnn_cudatoolkit_11_0 - cudnn_cudatoolkit_11_1 - cudnn_cudatoolkit_11_2 - cudnn_cudatoolkit_11_3 - cudnn_cudatoolkit_11_4; - - cudnn = cudnn_cudatoolkit_10; + cudnn_7_4_cudatoolkit_10_0 + cudnn_7_6_cudatoolkit_10_2 + cudnn_7_6_cudatoolkit_10 + cudnn_8_1_cudatoolkit_11_0 + cudnn_8_1_cudatoolkit_11_1 + cudnn_8_1_cudatoolkit_11_2 + cudnn_8_1_cudatoolkit_11 + cudnn_8_3_cudatoolkit_11_0 + cudnn_8_3_cudatoolkit_11_1 + cudnn_8_3_cudatoolkit_11_2 + cudnn_8_3_cudatoolkit_11_3 + cudnn_8_3_cudatoolkit_11_4 + cudnn_8_3_cudatoolkit_11_5 + cudnn_8_3_cudatoolkit_11; + + cudnn = cudnn_7_6_cudatoolkit_10; cutensorPackages = callPackages ../development/libraries/science/math/cutensor { }; inherit (cutensorPackages) @@ -4787,11 +4814,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; - dolphin-emu-primehack = qt5.callPackage ../misc/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -5169,7 +5196,7 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; - epsxe = callPackage ../misc/emulators/epsxe { }; + epsxe = callPackage ../applications/emulators/epsxe { }; escrotum = callPackage ../tools/graphics/escrotum { }; @@ -5389,7 +5416,7 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -7323,6 +7350,8 @@ with pkgs; nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; + nodenv = callPackage ../development/tools/nodenv { }; + nodejs = hiPrio nodejs-16_x; nodejs-slim = nodejs-slim-16_x; @@ -7363,7 +7392,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7794,11 +7823,11 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../misc/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { }; + mednaffe = callPackage ../applications/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -7814,7 +7843,7 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -8034,7 +8063,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -9274,7 +9303,7 @@ with pkgs; repseek = callPackage ../applications/science/biology/repseek { }; - reicast = callPackage ../misc/emulators/reicast { }; + reicast = callPackage ../applications/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9389,6 +9418,10 @@ with pkgs; rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnote = callPackage ../applications/graphics/rnote { + inherit (gst_all_1) gstreamer; + }; + rnp = callPackage ../tools/security/rnp { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -9460,7 +9493,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -9755,6 +9788,10 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair {}; + sketchybar = callPackage ../os-specific/darwin/sketchybar { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight; + }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { }; @@ -10312,7 +10349,7 @@ with pkgs; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../misc/emulators/tilem { }; + tilem = callPackage ../applications/emulators/tilem { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -10336,9 +10373,9 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyemu = callPackage ../applications/emulators/tinyemu { }; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; @@ -12537,8 +12574,8 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15; - openjfx = openjfx15; + inherit (javaPackages) openjfx11 openjfx15 openjfx17; + openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -12635,7 +12672,20 @@ with pkgs; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - libgit2 = libgit2_0_27; + libgit2 = libgit2.overrideAttrs (_: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + patches = []; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; + }); }; julia_15 = callPackage ../development/compilers/julia/1.5.nix { @@ -14094,7 +14144,7 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../misc/emulators/resim {}; + resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -15703,7 +15753,9 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; - turbogit = callPackage ../development/tools/turbogit { }; + turbogit = callPackage ../development/tools/turbogit { + libgit2 = libgit2_1_3_0; + }; tweak = callPackage ../applications/editors/tweak { }; @@ -15898,11 +15950,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { - db = if stdenv.isFreeBSD then db4 else db; - # XXX: only the db_185 interface was available through - # apr with db58 on freebsd (nov 2015), for unknown reasons - }; + aprutil = callPackage ../development/libraries/apr-util { }; aravis = callPackage ../development/libraries/aravis { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; @@ -16383,7 +16431,7 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -16718,32 +16766,19 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/git2 { + libgit2 = callPackage ../development/libraries/libgit2 { inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = libgit2.overrideAttrs (_: rec { - version = "0.27.10"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; - }; - meta.knownVulnerabilities = [ - "CVE-2020-12278" - "CVE-2020-12279" - ]; - }); - - libgit2_1_1 = libgit2.overrideAttrs (_: rec { - version = "1.1.1"; - src = fetchFromGitHub { + libgit2_1_3_0 = libgit2.overrideAttrs (_: rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; + sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; + patches = []; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -18335,7 +18370,7 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -19197,6 +19232,8 @@ with pkgs; nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; + nvidia-vaapi-driver = callPackage ../development/libraries/nvidia-vaapi-driver { }; + nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; @@ -20400,7 +20437,7 @@ with pkgs; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; - vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; @@ -21293,7 +21330,6 @@ with pkgs; mod_timestamp = apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { - stdenv = if (with stdenv; cc.isClang && isx86_64) then llvmPackages_8.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; }) mpd mpd-small mpdWithFeatures; @@ -21536,6 +21572,8 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 + mariadb_107 + mariadb_108 ; mariadb = mariadb_106; @@ -22284,6 +22322,8 @@ with pkgs; firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { }; + fwts = callPackage ../os-specific/linux/fwts { }; gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; @@ -22947,6 +22987,8 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); + quick-lint-js = callPackage ../development/tools/quick-lint-js { }; + linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; @@ -23935,6 +23977,8 @@ with pkgs; penna = callPackage ../data/fonts/penna { }; + pitch-black = callPackage ../data/themes/pitch-black {}; + plano-theme = callPackage ../data/themes/plano { }; plata-theme = callPackage ../data/themes/plata { @@ -24053,7 +24097,7 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; - qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -24160,7 +24204,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -25127,7 +25171,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/virtualization/dynamips { }; + dynamips = callPackage ../applications/emulators/dynamips { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -25629,6 +25673,8 @@ with pkgs; fftw = fftwSinglePrec; }; + gurk-rs = callPackage ../applications/networking/instant-messengers/gurk-rs { }; + gjay = callPackage ../applications/audio/gjay { }; photivo = callPackage ../applications/graphics/photivo { }; @@ -25705,9 +25751,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-bin"; - desktopName = "Firefox"; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { @@ -25717,7 +25761,6 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -25729,7 +25772,6 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; @@ -26171,7 +26213,7 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/virtualization/hercules { }; + hercules = callPackage ../applications/emulators/hercules { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -26336,7 +26378,7 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; super-productivity = callPackage ../applications/office/super-productivity { - electron = electron_13; + electron = electron_17; }; wlroots = wlroots_0_15; @@ -26711,7 +26753,7 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; kepubify = callPackage ../tools/misc/kepubify { }; @@ -26883,7 +26925,7 @@ with pkgs; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; lame = callPackage ../development/libraries/lame { }; @@ -27016,7 +27058,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -27201,7 +27243,7 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; @@ -27847,7 +27889,7 @@ with pkgs; obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -27998,9 +28040,9 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../applications/emulators/pcsxr { }; - pcsx2 = callPackage ../misc/emulators/pcsx2 { + pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; }; @@ -28530,7 +28572,7 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -28571,7 +28613,7 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../misc/emulators/sameboy { }; + sameboy = callPackage ../applications/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -28701,7 +28743,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -29819,7 +29861,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -30932,7 +30974,7 @@ with pkgs; katagoWithCuda = katago.override { enableCuda = true; - cudnn = cudnn_cudatoolkit_11; + cudnn = cudnn_8_3_cudatoolkit_11; cudatoolkit = cudatoolkit_11; }; @@ -31658,6 +31700,8 @@ with pkgs; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; + plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; + plasma-pass = libsForQt5.callPackage ../tools/security/plasma-pass { }; inherit (callPackages ../applications/misc/redshift { @@ -32265,7 +32309,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../misc/emulators/caprice32 { }; + caprice32 = callPackage ../applications/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -32778,11 +32822,11 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../misc/emulators/ares { }; + ares = callPackage ../applications/emulators/ares { }; - atari800 = callPackage ../misc/emulators/atari800 { }; + atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../misc/emulators/atari++ { }; + ataripp = callPackage ../applications/emulators/atari++ { }; atlantis = callPackage ../applications/networking/cluster/atlantis { }; @@ -32796,7 +32840,7 @@ with pkgs; swt = swt_jdk8; }; - attract-mode = callPackage ../misc/emulators/attract-mode { }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -32818,7 +32862,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../misc/emulators/ccemux { }; + ccemux = callPackage ../applications/emulators/ccemux { }; click = callPackage ../applications/networking/cluster/click { }; @@ -32896,13 +32940,13 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../misc/emulators/darcnes { }; + darcnes = callPackage ../applications/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { }; + desmume = callPackage ../applications/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32918,11 +32962,11 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox = callPackage ../applications/emulators/dosbox { }; - dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - emu2 = callPackage ../misc/emulators/emu2 { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; @@ -32934,7 +32978,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32944,7 +32988,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32978,7 +33022,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -32994,7 +33038,7 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -33003,7 +33047,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { }; @@ -33029,9 +33073,9 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gxemul = callPackage ../misc/emulators/gxemul { }; + gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../misc/emulators/hatari { }; + hatari = callPackage ../applications/emulators/hatari { }; hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -33142,7 +33186,7 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; @@ -33150,7 +33194,7 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -33170,7 +33214,7 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; @@ -33507,7 +33551,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33537,13 +33581,13 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../misc/emulators/punes { }; + punes = libsForQt5.callPackage ../applications/emulators/punes { }; pykms = callPackage ../tools/networking/pykms { }; @@ -33553,11 +33597,11 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../misc/emulators/uae { }; + uae = callPackage ../applications/emulators/uae { }; - fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; @@ -33583,12 +33627,12 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../misc/emulators/retroarch { + retroarchBare = callPackage ../applications/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { inherit retroarch; }; @@ -33601,11 +33645,11 @@ with pkgs; (builtins.attrValues libretro); }; - libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - retrofe = callPackage ../misc/emulators/retrofe { }; + retrofe = callPackage ../applications/emulators/retrofe { }; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; @@ -33914,11 +33958,11 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { }; + vbam = callPackage ../applications/emulators/vbam { }; vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../misc/emulators/vice { }; + vice = callPackage ../applications/emulators/vice { }; viddy = callPackage ../tools/misc/viddy { }; @@ -34018,7 +34062,7 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -34108,7 +34152,7 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../misc/emulators/yabause { + yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; openal = null; }; @@ -34131,11 +34175,11 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../misc/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../misc/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; inherit libsForQt5 fetchFromGitHub; }; @@ -34158,34 +34202,34 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../misc/emulators/xcpc { }; + xcpc = callPackage ../applications/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - openmsx = callPackage ../misc/emulators/openmsx { + openmsx = callPackage ../applications/emulators/openmsx { python = python3; }; - higan = callPackage ../misc/emulators/higan { }; + higan = callPackage ../applications/emulators/higan { }; - bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - yapesdl = callPackage ../misc/emulators/yapesdl { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { emulator = x16-emulator; rom = x16-rom; }; @@ -34484,6 +34528,8 @@ with pkgs; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; + usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules {}; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { }; @@ -34545,7 +34591,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 704457453779f..c1a29b60306f0 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -96,9 +96,7 @@ let topology = callPackage ../development/coq-modules/topology {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST { - compcert = self.compcert.override { version = "3.9"; }; - }; + VST = callPackage ../development/coq-modules/VST {}; zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ff23949ae4faf..d6ee88bc4f5e0 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -148,6 +148,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { lsusb = callPackage ../os-specific/darwin/lsusb { }; + moltenvk = callPackage ../os-specific/darwin/moltenvk { }; + opencflite = callPackage ../os-specific/darwin/opencflite { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index d291c1e830cda..1cd2c93da773d 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -14,16 +14,20 @@ let }; mkDerivation = mkDerivationWith stdenv.mkDerivation; - callPackage = self.newScope { + callPackage = self.newScope ({ inherit (gnuradio) # Packages that are potentially overriden and used as deps here. boost - uhd volk ; inherit mkDerivationWith mkDerivation; - }; - + } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { + inherit (gnuradio) uhd; + } // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then { + inherit (gnuradio) spdlog; + } else { + inherit (gnuradio) log4cpp; + })); in { inherit callPackage mkDerivation mkDerivationWith; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index cf6474f0da5b9..c8d9e85fbd77b 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,9 +8,10 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; in { - inherit mavenbuild fetchMaven openjfx11 openjfx15; + inherit mavenbuild fetchMaven openjfx11 openjfx15 openjfx17; compiler = let @@ -170,7 +171,7 @@ in { ../development/compilers/openjdk/darwin/17.nix { inherit openjdk17-bootstrap; - openjfx = openjfx15; + openjfx = openjfx17; }; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3e38ce116a458..d9a96164c6aa3 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -438,7 +438,9 @@ in { veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + vhba = callPackage ../applications/emulators/cdemu/vhba.nix { }; + + virtio_vmmci = callPackage ../os-specific/linux/virtio_vmmci { }; virtualbox = callPackage ../os-specific/linux/virtualbox { virtualbox = pkgs.virtualboxHardened; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a29602dfb7d6a..fe7fd7d856ae5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -310,6 +310,8 @@ let then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; + dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; + dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23a714597eec3..2212d4b5da0ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16715,12 +16715,12 @@ let NetSSLeay = buildPerlPackage { pname = "Net-SSLeay"; - version = "1.88"; + version = "1.92"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz"; - sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; + url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz"; + sha256 = "sha256-R8LyswDy5xYtcdaZ9jPdajWwYloAy9qMUKwBFEqTlqk="; }; - buildInputs = [ pkgs.openssl ]; + buildInputs = [ pkgs.openssl pkgs.zlib ]; doCheck = false; # Test performs network access. preConfigure = '' mkdir openssl @@ -24876,14 +24876,14 @@ let XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0206"; + version = "2.0207"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0206.tar.gz"; - sha256 = "068nhmld1031grgi4qm7k5niwxlbn6qd08zf6g1gj4c7qfas62q1"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0207.tar.gz"; + sha256 = "sha256-kDQ2yYWYdb71WTJDquhc7TKa0PtLV7v0WXXjJUfFDBU="; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] - ++ lib.optional stdenv.isDarwin pkgs.libiconv; + ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); propagatedBuildInputs = [ XMLSAX ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65704adecf1a2..ccbd8ed73d859 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -100,7 +100,7 @@ let # CUDA-related packages that are compatible with the currently packaged version # of TensorFlow, used to keep these versions in sync in related packages like `jaxlib`. tensorflow_compat_cudatoolkit = pkgs.cudatoolkit_11_2; - tensorflow_compat_cudnn = pkgs.cudnn_cudatoolkit_11_2; + tensorflow_compat_cudnn = pkgs.cudnn_8_1_cudatoolkit_11_2; tensorflow_compat_nccl = pkgs.nccl_cudatoolkit_11; in { @@ -664,6 +664,8 @@ in { assertpy = callPackage ../development/python-modules/assertpy { }; + asterisk-mbox = callPackage ../development/python-modules/asterisk-mbox { }; + asteval = callPackage ../development/python-modules/asteval { }; astor = callPackage ../development/python-modules/astor { }; @@ -1278,6 +1280,8 @@ in { blurhash = callPackage ../development/python-modules/blurhash { }; + bme280spi = callPackage ../development/python-modules/bme280spi { }; + bme680 = callPackage ../development/python-modules/bme680 { }; bokeh = callPackage ../development/python-modules/bokeh { }; @@ -1593,6 +1597,8 @@ in { chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; + chispa = callPackage ../development/python-modules/chispa { }; + ci-info = callPackage ../development/python-modules/ci-info { }; ci-py = callPackage ../development/python-modules/ci-py { }; @@ -1929,7 +1935,7 @@ in { cupy = callPackage ../development/python-modules/cupy { cudatoolkit = pkgs.cudatoolkit_11; - cudnn = pkgs.cudnn_cudatoolkit_11; + cudnn = pkgs.cudnn_8_1_cudatoolkit_11; nccl = pkgs.nccl_cudatoolkit_11; cutensor = pkgs.cutensor_cudatoolkit_11; }; @@ -2486,6 +2492,8 @@ in { dyn = callPackage ../development/python-modules/dyn { }; + dynalite-devices = callPackage ../development/python-modules/dynalite-devices { }; + dynd = callPackage ../development/python-modules/dynd { }; easydict = callPackage ../development/python-modules/easydict { }; @@ -2821,6 +2829,8 @@ in { hdf5 = pkgs.hdf5_1_10; }; + ffcv = callPackage ../development/python-modules/ffcv { }; + ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { }; @@ -3171,6 +3181,8 @@ in { gdown = callPackage ../development/python-modules/gdown { }; + gdtoolkit = callPackage ../development/python-modules/gdtoolkit { }; + ge25519 = callPackage ../development/python-modules/ge25519 { }; geant4 = toPythonModule (pkgs.geant4.override { @@ -3190,6 +3202,8 @@ in { generic = callPackage ../development/python-modules/generic { }; + geniushub-client = callPackage ../development/python-modules/geniushub-client { }; + genome-collector = callPackage ../development/python-modules/genome-collector { }; genpy = callPackage ../development/python-modules/genpy { }; @@ -3870,6 +3884,8 @@ in { inherit (pkgs) i2c-tools; }; + i2csense = callPackage ../development/python-modules/i2csense { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; @@ -5645,6 +5661,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; + oocsi = callPackage ../development/python-modules/oocsi { }; open-garage = callPackage ../development/python-modules/open-garage { }; @@ -6082,6 +6100,8 @@ in { pipdate = callPackage ../development/python-modules/pipdate { }; + pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pipx = callPackage ../development/python-modules/pipx { }; @@ -6149,6 +6169,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; + pyownet = callPackage ../development/python-modules/pyownet { }; pypoint = callPackage ../development/python-modules/pypoint { }; @@ -6910,7 +6932,9 @@ in { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { }; + pygit2 = callPackage ../development/python-modules/pygit2 { + libgit2 = pkgs.libgit2_1_3_0; + }; PyGithub = callPackage ../development/python-modules/pyGithub { }; @@ -8225,6 +8249,8 @@ in { pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { }; + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; @@ -9350,6 +9376,8 @@ in { inherit (pkgs) plantuml; }; + sphinxcontrib-programoutput = callPackage ../development/python-modules/sphinxcontrib-programoutput { }; + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; @@ -10565,6 +10593,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsdiscovery = callPackage ../development/python-modules/wsdiscovery { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; wsgiprox = callPackage ../development/python-modules/wsgiprox { }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 4f993bdf082c5..c8bdaeb426e73 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,42 +1,44 @@ { stdenv, config, callPackage, wineBuild }: rec { - fonts = callPackage ../misc/emulators/wine/fonts.nix {}; - minimal = callPackage ../misc/emulators/wine { + fonts = callPackage ../applications/emulators/wine/fonts.nix {}; + minimal = callPackage ../applications/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; }; base = minimal.override { gettextSupport = true; - fontconfigSupport = true; - alsaSupport = true; + fontconfigSupport = stdenv.isLinux; + alsaSupport = stdenv.isLinux; openglSupport = true; - vulkanSupport = stdenv.isLinux; + vulkanSupport = true; tlsSupport = true; cupsSupport = true; - dbusSupport = true; - cairoSupport = true; + dbusSupport = stdenv.isLinux; + cairoSupport = stdenv.isLinux; cursesSupport = true; - saneSupport = true; + saneSupport = stdenv.isLinux; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; - udevSupport = true; - xineramaSupport = true; + udevSupport = stdenv.isLinux; + xineramaSupport = stdenv.isLinux; sdlSupport = true; mingwSupport = true; + usbSupport = true; }; full = base.override { - gtkSupport = true; + gtkSupport = stdenv.isLinux; gstreamerSupport = true; openalSupport = true; openclSupport = true; odbcSupport = true; - netapiSupport = true; - vaSupport = true; + netapiSupport = stdenv.isLinux; + vaSupport = stdenv.isLinux; pcapSupport = true; - v4lSupport = true; + v4lSupport = stdenv.isLinux; gphoto2Support = true; + krb5Support = true; ldapSupport = true; vkd3dSupport = true; embedInstallers = true; |