diff --git a/.github/ISSUE_TEMPLATE/build_failure.md b/.github/ISSUE_TEMPLATE/build_failure.md new file mode 100644 index 00000000000..7e57b2e208a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/build_failure.md @@ -0,0 +1,34 @@ +--- +name: Build failure +about: Create a report to help us improve +title: '' +labels: '0.kind: build failure' +assignees: '' + +--- + +### Steps To Reproduce +Steps to reproduce the behavior: +1. build *X* + +### Build log +``` +log here if short otherwise a link to a gist +``` + +### Additional context +Add any other context about the problem here. + +### Notify maintainers + + +### Metadata +Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. + +```console +[user@system:~]$ nix-shell -p nix-info --run "nix-info -m" +output here +``` diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 2c30c8bd240..c6fb71de018 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -80,3 +80,49 @@ tests.fetchgit = invalidateFetcherByDrvHash fetchgit { sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; }; ``` + +## `nixosTest` {#tester-nixosTest} + +Run a NixOS VM network test using this evaluation of Nixpkgs. + +NOTE: This function is primarily for external use. NixOS itself uses `make-test-python.nix` directly. Packages defined in Nixpkgs [reuse NixOS tests via `nixosTests`, plural](#ssec-nixos-tests-linking). + +It is mostly equivalent to the function `import ./make-test-python.nix` from the +[NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests), +except that the current application of Nixpkgs (`pkgs`) will be used, instead of +letting NixOS invoke Nixpkgs anew. + +If a test machine needs to set NixOS options under `nixpkgs`, it must set only the +`nixpkgs.pkgs` option. + +### Parameter + +A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-tests), or path to it. Example: + +```nix +{ + name = "my-test"; + nodes = { + machine1 = { lib, pkgs, nodes, ... }: { + environment.systemPackages = [ pkgs.hello ]; + services.foo.enable = true; + }; + # machine2 = ...; + }; + testScript = '' + start_all() + machine1.wait_for_unit("foo.service") + machine1.succeed("hello | foo-send") + ''; +} +``` + +### Result + +A derivation that runs the VM test. + +Notable attributes: + + * `nodes`: the evaluated NixOS configurations. Useful for debugging and exploring the configuration. + + * `driverInteractive`: a script that launches an interactive Python session in the context of the `testScript`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2d13c3b6b2..43794589289 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -822,6 +822,16 @@ githubId = 1771266; name = "Vo Anh Duy"; }; + Anillc = { + name = "Anillc"; + email = "i@anillc.cn"; + github = "Anillc"; + githubId = 23411248; + keys = [{ + longkeyid = "ed25519/0x0BE8A88F47B2145C"; + fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; + }]; + }; anirrudh = { email = "anik597@gmail.com"; github = "anirrudh"; @@ -1588,6 +1598,12 @@ githubId = 185443; name = "Alexey Lebedeff"; }; + binsky = { + email = "timo@binsky.org"; + github = "binsky08"; + githubId = 30630233; + name = "Timo Triebensky"; + }; bjg = { email = "bjg@gnu.org"; name = "Brian Gough"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 312aa0dad92..acd26ee93c0 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -22,6 +22,8 @@ ldoc,https://github.com/stevedonovan/LDoc.git,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,lua5_1,lblasc +lmathx,,,,,lua5_3,alexshpilkin +lmpfrlib,,,,,lua5_3,alexshpilkin lpeg,,,,,,vyp lpeg_patterns,,,,,, lpeglabel,,,,,, diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index b61a0268dee..d9ebbe74d54 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -569,8 +569,9 @@ The NixOS VM test framework, - pkgs.nixosTest/make-test-python.nix, - now requires detaching commands such as + pkgs.nixosTest/make-test-python.nix + (pkgs.testers.nixosTest since 22.05), now + requires detaching commands such as succeed("foo &") and succeed("foo | xclip -i") to close stdout. This can be done with a redirect such as diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 310d32cfdd7..e673d6721a3 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -166,7 +166,7 @@ In addition to numerous new and upgraded packages, this release has the followin ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} -- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout. +- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout. This can be done with a redirect such as `succeed("foo >&2 &")`. This breaking change was necessitated by a race condition causing tests to fail or hang. It applies to all methods that invoke commands on the nodes, including `execute`, `succeed`, `fail`, `wait_until_succeeds`, `wait_until_fails`. diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 05d9ce89dbd..18af49db177 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -38,7 +38,7 @@ rec { { key = "no-revision"; # Make the revision metadata constant, in order to avoid needless retesting. # The human version (e.g. 21.05-pre) is left as is, because it is useful - # for external modules that test with e.g. nixosTest and rely on that + # for external modules that test with e.g. testers.nixosTest and rely on that # version number. config.system.nixos.revision = mkForce "constant-nixos-revision"; } diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index cd2bb2f9d4d..4ab3cf53045 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -119,6 +119,7 @@ rec { passthru = passthru // { inherit nodes; }; + meta.mainProgram = "nixos-test-driver"; } '' mkdir -p $out/bin diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 8aff02dc118..04be272742c 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -34,7 +34,7 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; - detectvirt = "${pkgs.systemd}/bin/systemd-detect-virt"; + detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; xserverEnabled = config.services.xserver.enable; diff --git a/nixos/modules/misc/mandoc.nix b/nixos/modules/misc/mandoc.nix index 3da60f2f8e6..838f2087656 100644 --- a/nixos/modules/misc/mandoc.nix +++ b/nixos/modules/misc/mandoc.nix @@ -53,7 +53,9 @@ in { # see: https://inbox.vuxu.org/mandoc-tech/20210906171231.GF83680@athene.usta.de/T/#e85f773c1781e3fef85562b2794f9cad7b2909a3c extraSetup = lib.mkIf config.documentation.man.generateCaches '' ${makewhatis} -T utf8 ${ - lib.concatMapStringsSep " " (path: "\"$out/${path}\"") cfg.manPath + lib.concatMapStringsSep " " (path: + "$out/" + lib.escapeShellArg path + ) cfg.manPath } ''; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index b1fcb0b461f..23d1344a57a 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -626,7 +626,7 @@ let session optional ${pkgs.otpw}/lib/security/pam_otpw.so '' + optionalString cfg.startSession '' - session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional ${config.systemd.package}/lib/security/pam_systemd.so '' + optionalString cfg.forwardXAuth '' session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99 @@ -1242,7 +1242,7 @@ in mr ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so, '' + optionalString (isEnabled (cfg: cfg.startSession)) '' - mr ${pkgs.systemd}/lib/security/pam_systemd.so, + mr ${config.systemd.package}/lib/security/pam_systemd.so, '' + optionalString (isEnabled (cfg: cfg.enableAppArmor) && config.security.apparmor.enable) '' diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json index b19fb33ec17..114afbfb0ea 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json @@ -61,6 +61,9 @@ { "application.process.binary": "teams" }, + { + "application.process.binary": "teams-insiders" + }, { "application.process.binary": "skypeforlinux" } diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index a08203dffe7..5d00feabe1c 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -109,7 +109,7 @@ in ''' # Read from journal pipe { - command => "''${pkgs.systemd}/bin/journalctl -f -o json" + command => "''${config.systemd.package}/bin/journalctl -f -o json" type => "syslog" codec => json {} } ''' diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index ac878222b26..3b10d8d2909 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -135,7 +135,7 @@ in User = "spamd"; Group = "spamd"; StateDirectory = "spamassassin"; - ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service"; + ExecStartPost = "+${config.systemd.package}/bin/systemctl -q --no-block try-reload-or-restart spamd.service"; }; script = '' diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 8df450a11c6..e111b311d68 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -226,10 +226,10 @@ in ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="${i}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="supplicant-${replaceChars [" "] ["-"] iface}.service", TAG+="SUPPLICANT_ASSIGNED"''))} ${optionalString (hasAttr "WLAN" cfg) '' - ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="${pkgs.systemd}/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service" + ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service" ''} ${optionalString (hasAttr "LAN" cfg) '' - ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="lan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="${pkgs.systemd}/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-lan@$result.service" + ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="lan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-lan@$result.service" ''} ''; })]; diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 53bd9efa5ac..3be0a8c700b 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -17,7 +17,7 @@ let else "sshg-fw-ipset"; in pkgs.writeText "sshguard.conf" '' BACKEND="${pkgs.sshguard}/libexec/${backend}" - LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}" + LOGREADER="LANG=C ${config.systemd.package}/bin/journalctl ${args}" ''; in { diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index a32b81a916f..b818f5c463a 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -88,7 +88,7 @@ in { account required pam_unix.so session required pam_unix.so session required pam_env.so conffile=/etc/pam/environment readenv=0 - session required ${pkgs.systemd}/lib/security/pam_systemd.so + session required ${config.systemd.package}/lib/security/pam_systemd.so ''; hardware.opengl.enable = mkDefault true; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 70ae6b8978d..4941d13c810 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -298,7 +298,7 @@ in session required pam_succeed_if.so audit quiet_success user = gdm session required pam_env.so conffile=/etc/pam/environment readenv=0 - session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional ${config.systemd.package}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 27dfed3cc14..302c8fe0d91 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -287,7 +287,7 @@ in session required pam_succeed_if.so audit quiet_success user = lightdm session required pam_env.so conffile=/etc/pam/environment readenv=0 - session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional ${config.systemd.package}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so ''; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 529a086381f..c44f24002e0 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -231,7 +231,7 @@ in session required pam_succeed_if.so audit quiet_success user = sddm session required pam_env.so conffile=/etc/pam/environment readenv=0 - session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional ${config.systemd.package}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke session optional pam_permit.so ''; diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index e683d181729..21be18ef866 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -52,7 +52,7 @@ with lib; ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; - environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf"; + environment.etc."modprobe.d/systemd.conf".source = "${config.systemd.package}/lib/modprobe.d/systemd.conf"; environment.systemPackages = [ pkgs.kmod ]; diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index d00dc761d6e..21a25cbfa96 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -190,7 +190,7 @@ in { nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; date = "${pkgs.coreutils}/bin/date"; readlink = "${pkgs.coreutils}/bin/readlink"; - shutdown = "${pkgs.systemd}/bin/shutdown"; + shutdown = "${config.systemd.package}/bin/shutdown"; upgradeFlag = optional (cfg.channel == null) "--upgrade"; in if cfg.allowReboot then '' ${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)} diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix index 4f2f8df90eb..9c2adb90bfd 100644 --- a/nixos/modules/virtualisation/amazon-init.nix +++ b/nixos/modules/virtualisation/amazon-init.nix @@ -11,7 +11,7 @@ let echo "attempting to fetch configuration from EC2 user data..." export HOME=/root - export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused pkgs.xz config.system.build.nixos-rebuild]}:$PATH + export PATH=${pkgs.lib.makeBinPath [ config.nix.package config.systemd.package pkgs.gnugrep pkgs.git pkgs.gnutar pkgs.gzip pkgs.gnused pkgs.xz config.system.build.nixos-rebuild]}:$PATH export NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels userData=/etc/ec2-metadata/user-data diff --git a/nixos/modules/virtualisation/digital-ocean-init.nix b/nixos/modules/virtualisation/digital-ocean-init.nix index 4339d91de16..df30104b7d7 100644 --- a/nixos/modules/virtualisation/digital-ocean-init.nix +++ b/nixos/modules/virtualisation/digital-ocean-init.nix @@ -46,7 +46,7 @@ in { RemainAfterExit = true; }; restartIfChanged = false; - path = [ pkgs.jq pkgs.gnused pkgs.gnugrep pkgs.systemd config.nix.package config.system.build.nixos-rebuild ]; + path = [ pkgs.jq pkgs.gnused pkgs.gnugrep config.systemd.package config.nix.package config.system.build.nixos-rebuild ]; environment = { HOME = "/root"; NIX_PATH = concatStringsSep ":" [ diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d8187d8e019..8bef4fad3dd 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -701,6 +701,85 @@ in { ''; }; + bcachefsSimple = makeInstallerTest "bcachefs-simple" { + extraInstallerConfig = { + boot.supportedFilesystems = [ "bcachefs" ]; + }; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.bcachefs -L root /dev/vda3", + "mount -t bcachefs /dev/vda3 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + + bcachefsEncrypted = makeInstallerTest "bcachefs-encrypted" { + extraInstallerConfig = { + boot.supportedFilesystems = [ "bcachefs" ]; + environment.systemPackages = with pkgs; [ keyutils ]; + }; + + # We don't want to use the normal way of unlocking bcachefs defined in tasks/filesystems/bcachefs.nix. + # So, override initrd.postDeviceCommands completely and simply unlock with the predefined password. + extraConfig = '' + boot.initrd.postDeviceCommands = lib.mkForce "echo password | bcachefs unlock /dev/vda3"; + ''; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "keyctl link @u @s", + "echo password | mkfs.bcachefs -L root --encrypted /dev/vda3", + "echo password | bcachefs unlock /dev/vda3", + "mount -t bcachefs /dev/vda3 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + + bcachefsMulti = makeInstallerTest "bcachefs-multi" { + extraInstallerConfig = { + boot.supportedFilesystems = [ "bcachefs" ]; + }; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M 4096M" # / + + " mkpart primary 4096M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.bcachefs -L root --metadata_replicas 2 --foreground_target ssd --promote_target ssd --background_target hdd --label ssd /dev/vda3 --label hdd /dev/vda4", + "mount -t bcachefs /dev/vda3:/dev/vda4 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + # Test a basic install using GRUB 1. grub1 = makeInstallerTest "grub1" rec { createPartitions = '' diff --git a/pkgs/applications/audio/cdparanoia/configure.patch b/pkgs/applications/audio/cdparanoia/configure.patch new file mode 100644 index 00000000000..81c50cec814 --- /dev/null +++ b/pkgs/applications/audio/cdparanoia/configure.patch @@ -0,0 +1,22 @@ +diff --git a/configure.in b/configure.ac +similarity index 90% +rename from configure.in +rename to configure.ac +index 3ad98ca11da..8fad378faf4 100644 +--- a/configure.in ++++ b/configure.ac +@@ -1,13 +1,8 @@ + AC_INIT(interface/interface.c) + +-cp $srcdir/configure.guess $srcdir/config.guess +-cp $srcdir/configure.sub $srcdir/config.sub +- + AC_CANONICAL_HOST + +-if test -z "$CC"; then +- AC_PROG_CC +-fi ++AC_PROG_CC + AC_PROG_RANLIB + AC_CHECK_PROG(AR,ar,ar) + AC_CHECK_PROG(INSTALL,install,install) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 10ff66de77e..7f699b82aef 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }: +{ lib, stdenv, fetchurl, fetchpatch +, updateAutotoolsGnuConfigScriptsHook, autoreconfHook +, IOKit, Carbon +}: stdenv.mkDerivation rec { pname = "cdparanoia-III"; @@ -10,16 +13,29 @@ stdenv.mkDerivation rec { }; patches = lib.optionals stdenv.isDarwin [ - (fetchurl { + (fetchpatch { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; - sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy"; + sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; + # Our configure patch will subsume it, but we want our configure + # patch to be used on all platforms so we cannot just start where + # this leaves off. + excludes = [ "configure.in" ]; }) (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; }) - ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch - ++ [./fix_private_keyword.patch]; + ] ++ [ + # Has to come after darwin patches + ./fix_private_keyword.patch + # Order does not matter + ./configure.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; + + nativeBuildInputs = [ + updateAutotoolsGnuConfigScriptsHook + autoreconfHook + ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Carbon @@ -28,13 +44,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = '' - unset CC - '' + lib.optionalString (!stdenv.hostPlatform.isx86) '' - cp ${gnu-config}/config.sub configure.sub - cp ${gnu-config}/config.guess configure.guess - ''; - # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 220a7c4eb3e..eb6dd471055 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/exaile \ --set PYTHONPATH $PYTHONPATH \ - ${lib.optionalString streamripperSupport "--prefix PATH : ${lib.makeBinPath [ streamripper ]}"} + --prefix PATH : ${lib.makeBinPath ([ python3 ] ++ lib.optionals streamripperSupport [ streamripper ]) } ''; meta = with lib; { diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 828c415ac5f..1e55dbe8f87 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; - buildInputs = [ glib libsndfile libpulseaudio libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] + buildInputs = [ glib libsndfile libjack2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" ]; diff --git a/pkgs/applications/audio/musikcube/0001-apple-cmake.patch b/pkgs/applications/audio/musikcube/0001-apple-cmake.patch new file mode 100644 index 00000000000..3c4630af4aa --- /dev/null +++ b/pkgs/applications/audio/musikcube/0001-apple-cmake.patch @@ -0,0 +1,14 @@ +diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt +index f42748aa..ae339946 100644 +--- a/src/musikcube/CMakeLists.txt ++++ b/src/musikcube/CMakeLists.txt +@@ -98,9 +98,6 @@ else() + endif() + + if (APPLE) +- message(STATUS "[ncurses] detected Darwin, linking statically") +- set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a") +- set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a") + else() + message(STATUS "[ncurses] not Darwin! will attempt to link against libtinfo") + find_library(LIBTINFO NAMES tinfo) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index ce51206b12d..0557ee2e676 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -1,6 +1,5 @@ { cmake , pkg-config -, alsa-lib , boost , curl , fetchFromGitHub @@ -11,12 +10,17 @@ , libev , libmicrohttpd , ncurses -, pulseaudio , lib , stdenv , taglib +# Linux Dependencies +, alsa-lib +, pulseaudio , systemdSupport ? stdenv.isLinux , systemd +# Darwin Dependencies +, Cocoa +, SystemConfiguration }: stdenv.mkDerivation rec { @@ -38,14 +42,15 @@ stdenv.mkDerivation rec { url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; }) + ./0001-apple-cmake.patch ]; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ - alsa-lib boost curl ffmpeg @@ -54,9 +59,14 @@ stdenv.mkDerivation rec { libev libmicrohttpd ncurses - pulseaudio taglib - ] ++ lib.optional systemdSupport systemd; + ] ++ lib.optional systemdSupport [ + systemd + ] ++ lib.optional stdenv.isLinux [ + alsa-lib pulseaudio + ] ++ lib.optional stdenv.isDarwin [ + Cocoa SystemConfiguration + ]; cmakeFlags = [ "-DDISABLE_STRIP=true" diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix new file mode 100644 index 00000000000..635dff4f92e --- /dev/null +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch +, cmake, pkg-config +, boost, miniupnpc, openssl, unbound +, zeromq, pcsclite, readline, libsodium, hidapi +, randomx, rapidjson +, easyloggingpp +, CoreData, IOKit, PCSC +, trezorSupport ? true, libusb1, protobuf, python3 +}: + +stdenv.mkDerivation rec { + pname = "haven-cli"; + version = "2.2.3"; + + src = fetchFromGitHub { + owner = "haven-protocol-org"; + repo = "haven-main"; + rev = "v${version}"; + sha256 = "sha256-nBVLNT0jWIewr6MPDGwDqXoVtyFLyls1IEQraVoWDQ4="; + fetchSubmodules = true; + }; + + patches = [ + ./use-system-libraries.patch + ]; + + postPatch = '' + # remove vendored libraries + rm -r external/{miniupnp,randomx,rapidjson,unbound} + # export patched source for haven-gui + cp -r . $source + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + boost miniupnpc openssl unbound + zeromq pcsclite readline + libsodium hidapi randomx rapidjson + protobuf + readline easyloggingpp + ] + ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_DEVICE_TREZOR=ON" + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + "-DReadline_INCLUDE_DIR=${readline.dev}/include/readline" + "-DRandomX_ROOT_DIR=${randomx}" + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + + outputs = [ "out" "source" ]; + + meta = with lib; { + description = "Haven Protocol is the world's only network of private stable asset"; + homepage = "https://havenprotocol.org/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ kim0 ]; + }; +} diff --git a/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch b/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch new file mode 100644 index 00000000000..cbf8ff849b5 --- /dev/null +++ b/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch @@ -0,0 +1,92 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb71d2d..3a710a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -200,11 +200,11 @@ if(NOT MANUAL_SUBMODULES) + endfunction () + + message(STATUS "Checking submodules") +- check_submodule(external/miniupnp) +- check_submodule(external/unbound) +- check_submodule(external/rapidjson) ++ # check_submodule(external/miniupnp) ++ # check_submodule(external/unbound) ++ # check_submodule(external/rapidjson) + check_submodule(external/trezor-common) +- check_submodule(external/randomx) ++ # check_submodule(external/randomx) + endif() + endif() + +@@ -300,7 +300,8 @@ endif() + # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*") + # set(BSDI TRUE) + +-include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external) ++include_directories(external/easylogging++ src contrib/epee/include external) ++#include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external) + + if(APPLE) + include_directories(SYSTEM /usr/include/malloc) +diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake +index ad2004a..7f4bb68 100644 +--- a/cmake/FindMiniupnpc.cmake ++++ b/cmake/FindMiniupnpc.cmake +@@ -37,7 +37,7 @@ set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args( +- MiniUPnPc DEFAULT_MSG ++ Miniupnpc DEFAULT_MSG + MINIUPNP_INCLUDE_DIR + MINIUPNP_LIBRARY + ) +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 71b165f..10189ce 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -37,19 +37,9 @@ + + find_package(Miniupnpc REQUIRED) + +-message(STATUS "Using in-tree miniupnpc") +-add_subdirectory(miniupnp/miniupnpc) +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() +-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") +-endif() +- +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++set(UPNP_STATIC false PARENT_SCOPE) ++set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + + find_package(Unbound) + +@@ -80,4 +70,3 @@ endif() + + add_subdirectory(db_drivers) + add_subdirectory(easylogging++) +-add_subdirectory(randomx EXCLUDE_FROM_ALL) +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index c626e22..be570ed 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -60,9 +60,9 @@ + #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" + +-#include +-#include +-#include ++#include ++#include ++#include + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 874a1bb63cc..ab9fcfe1ba4 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -6,6 +6,7 @@ , cacert , coreutils , dbus +, e2fsprogs , expat , fetchurl , findutils @@ -117,6 +118,9 @@ let libXrender libXtst + # No crash, but attempted to load at startup + e2fsprogs + # Gradle wants libstdc++.so.6 stdenv.cc.cc.lib # mksdcard wants 32 bit libstdc++.so.6 diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 8a5f4cf4b3a..032fd765b27 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, zip, wxGTK30-gtk3, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31-gtk3, gtk3 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: @@ -15,14 +15,55 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; - buildInputs = [ wxGTK30-gtk3 gtk3 ] + buildInputs = [ wxGTK31-gtk3 gtk3 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; - patches = [ ./writable-projects.patch ]; + patches = [ + ./writable-projects.patch + ./fix-clipboard-flush.patch + # Fix build on non-x86 machines + (fetchpatch { + name = "remove-int3.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/d76c015c456561d2c7987935a5f4dc6c0932b0c4.patch"; + sha256 = "sha256-dpH33vGf2aNdYTeLwxglYDNbvwoY2bGSG6YFRyoGw+A="; + }) + (fetchpatch { + name = "remove-pragmas.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/966949d5ab7f3cb86e2a2c7ef4e853ee209b5a1a.patch"; + sha256 = "sha256-XjejjGOvDk3gl1/n9R69XATGLj5n7tOZNyG8vIlwfyg="; + }) + # Fix build with GCC 11 + (fetchpatch { + name = "use-gcc11-openfilelist.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a5ea6ff7ff301d739d3dc8145db1578f504ee4ca.patch"; + sha256 = "sha256-kATaLej8kJf4xm0VicHfRetOepX8O9gOhwdna0qylvQ="; + }) + (fetchpatch { + name = "use-gcc11-ccmanager.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/04b7c50fb8c6a29b2d84579ee448d2498414d855.patch"; + sha256 = "sha256-VPy/M6IvNBxUE4hZRbLExFm0DJf4gmertrqrvsXQNz4="; + }) + # Fix build with wxGTK 3.1.5 + (fetchpatch { + name = "use-wxgtk315.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch"; + sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU="; + }) + (fetchpatch { + name = "fix-getstring.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch"; + sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ="; + }) + ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] - ++ optionals contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; + configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ + ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + "--with-boost-libdir=${boost}/lib" + ]; + postInstall = optionalString stdenv.isDarwin '' + ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins + ''; meta = { maintainers = [ maintainers.linquize ]; diff --git a/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch b/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch new file mode 100644 index 00000000000..ee4ebd61af0 --- /dev/null +++ b/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch @@ -0,0 +1,24 @@ +diff --git a/src/src/app.cpp b/src/src/app.cpp +index 81130fd..f98d37b 100644 +--- a/src/src/app.cpp ++++ b/src/src/app.cpp +@@ -602,7 +602,8 @@ bool CodeBlocksApp::OnInit() + m_BatchWindowAutoClose = true; + m_pSingleInstance = nullptr; + +- wxTheClipboard->Flush(); ++ if (wxTheClipboard->IsOpened()) ++ wxTheClipboard->Flush(); + + wxCmdLineParser& parser = *Manager::GetCmdLineParser(); + parser.SetDesc(cmdLineDesc); +@@ -851,7 +852,8 @@ bool CodeBlocksApp::OnInit() + + int CodeBlocksApp::OnExit() + { +- wxTheClipboard->Flush(); ++ if (wxTheClipboard->IsOpened()) ++ wxTheClipboard->Flush(); + + if (g_DDEServer) delete g_DDEServer; + diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix index 534466db8d7..509eee06e2b 100644 --- a/pkgs/applications/editors/gnome-inform7/default.nix +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -22,12 +22,12 @@ let pkg-config docbook2x docbook-xsl-nons + wrapGAppsHook ]; buildInputs = [ gtk3 gobject-introspection vala gtk-doc - wrapGAppsHook ]; }); diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix index 81222ff82f1..7f265aefcd0 100644 --- a/pkgs/applications/editors/thiefmd/default.nix +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "thiefmd"; - version = "0.2.4"; + version = "0.2.5-stability"; src = fetchFromGitHub { owner = "kmwallio"; repo = "ThiefMD"; - rev = "v${version}-easypdf"; - sha256 = "sha256-YN17o6GtpulxhXs+XYZLY36g9S8ggR6URNLrjs5PEoI="; + rev = "v${version}"; + sha256 = "sha256-cUZ7NVGe4e9ZISo9gjWFuDNCyF3rsQtrDX+ureyqtwM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index fe5d5b85080..8c505865849 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4609"; + version = "8.2.4816"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-IiWZJ4zT+VbcxwKChl847pS9jU9AlxZ/yQUIL8I2MhQ="; + sha256 = "1lgqr3ki50hwkz4vhdyaryirrs99qq4kgkhmpx7ygvn6aj2wapg5"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index bc317b91597..d5dd00b4aa6 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -3,7 +3,7 @@ , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins -, makeWrapper, makeBinaryWrapper +, makeWrapper , wrapGAppsHook , runtimeShell @@ -133,9 +133,7 @@ in stdenv.mkDerivation rec { ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext ++ lib.optional perlSupport perl - # Make the inner wrapper binary to avoid double wrapping issues with wrapPythonDrv - # (https://github.com/NixOS/nixpkgs/pull/164163) - ++ lib.optional (guiSupport == "gtk3") (wrapGAppsHook.override { makeWrapper = makeBinaryWrapper; }) + ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 427429404a0..3dbd1e0d77b 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS = "-lm"; meta = with lib; { diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index a496c4221a3..f1d809388a2 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.0-hotfix-2"; + version = "0.5.1-hotfix-1"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-8sv7GQopUbKv8JS1/UXRFeK++UZKk3CJBOzUMx9vZDU="; + hash = "sha256-Oq/RKeKICyImSPr4GSNjPXZWtuRQ7+9nRfl9MmC+UYI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-N0qsph68FAkwOpyr9QUw0bDQKn7t22Hbz9BYYOs4pCM="; + hash = "sha256-gdVy+7xSQVkI84Ta6KLOLR9UUsDoD2Cd0cuNU+OXf2M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 93a7d75ce45..d3c5b1c0b75 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -40,18 +40,19 @@ stdenv.mkDerivation { buildInputs = [ avahi libgphoto2 - libieee1284 libjpeg libpng libtiff libusb1 - libv4l - net-snmp curl - systemd libxml2 poppler gawk + ] ++ lib.optionals stdenv.isLinux [ + libieee1284 + libv4l + net-snmp + systemd ]; enableParallelBuilding = true; @@ -113,6 +114,6 @@ stdenv.mkDerivation { ''; homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index e7146052702..c2cf561524f 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -49,21 +49,9 @@ buildPythonApplication rec { hash = "sha256-o5dVJDbdKgo6hMMU9mKzoouSgVWl7xSAp+Aq61VcfeU="; }; - # Relax some dependencies - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'WTForms ==' 'WTForms >=' \ - --replace 'attrs == 20.2.0' 'attrs' \ - --replace 'elasticsearch ==' 'elasticsearch >=' \ - --replace 'python_dotenv ==' 'python_dotenv >=' \ - --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ - --replace 'requests ==' 'requests >=' \ - --replace 'validators ==' 'validators >=' \ - --replace 'flask-login == ' 'flask-login >= ' \ - --replace 'tinydb ==' 'tinydb >=' \ - --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ - --replace 'Flask ==' 'Flask >=' - ''; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = true; propagatedBuildInputs = [ appdirs diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d5055f04ed8..235794dd421 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config -, replace, fetchurl, zip, unzip, jq, xdg-utils, writeText +, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc @@ -176,7 +176,7 @@ let startupWMClass = wmClass; }; - nativeBuildInputs = [ makeWrapper lndir replace jq ]; + nativeBuildInputs = [ makeWrapper lndir jq ]; buildInputs = [ browser.gtk3 ]; @@ -206,48 +206,50 @@ let done # fix links and absolute references - cd "${browser}" find . -type l -print0 | while read -d $'\0' l; do - target="$(readlink "$l" | replace-literal -es -- "${browser}" "$out")" + target="$(readlink "$l")" + target=''${target/#"${browser}"/"$out"} ln -sfT "$target" "$out/$l" done - # This will not patch binaries, only "text" files. - # Its there for the wrapper mostly. - cd "$out" - replace-literal -esfR -- "${browser}" "$out" - # create the wrapper executablePrefix="$out/bin" executablePath="$executablePrefix/${applicationName}" + oldWrapperArgs=() - if [ ! -x "$executablePath" ] - then - echo "cannot find executable file \`${browser}/bin/${applicationName}'" - exit 1 - fi - - if [ ! -L "$executablePath" ] - then - # Careful here, the file at executablePath may already be - # a wrapper. That is why we postfix it with -old instead - # of -wrapped. - oldExe="$executablePrefix"/".${applicationName}"-old - mv "$executablePath" "$oldExe" - else + if [[ -L $executablePath ]]; then + # Symbolic link: wrap the link's target. oldExe="$(readlink -v --canonicalize-existing "$executablePath")" - fi - - if [ ! -x "${browser}/bin/${applicationName}" ] - then - echo "cannot find executable file \`${browser}/bin/${applicationName}'" - exit 1 + rm "$executablePath" + elif wrapperCmd=$(strings -dw "$executablePath" | sed -n '/^makeCWrapper/,/^$/ p'); [[ $wrapperCmd ]]; then + # If the executable is a binary wrapper, we need to update its target to + # point to $out, but we can't just edit the binary in-place because of length + # issues. So we extract the command used to create the wrapper and add the + # arguments to our wrapper. + parseMakeCWrapperCall() { + shift # makeCWrapper + oldExe=$1; shift + for arg do case $arg in + --inherit-argv0) oldWrapperArgs+=(--argv0 '$0');; # makeWrapper doesn't understand --inherit-argv0 + *) oldWrapperArgs+=("$arg");; + esac done + } + eval "parseMakeCWrapperCall ''${wrapperCmd//"${browser}"/"$out"}" + rm "$executablePath" + else + if read -rn2 shebang < "$executablePath" && [[ $shebang == '#!' ]]; then + # Shell wrapper: patch in place to point to $out. + sed -i "s@${browser}@$out@g" "$executablePath" + fi + # Suffix the executable with -old, because -wrapped might already be used by the old wrapper. + oldExe="$executablePrefix/.${applicationName}"-old + mv "$executablePath" "$oldExe" fi makeWrapper "$oldExe" \ - "$out/bin/${applicationName}${nameSuffix}" \ + "''${executablePath}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ @@ -258,9 +260,8 @@ let --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ - ${lib.optionalString forceWayland '' - --set MOZ_ENABLE_WAYLAND "1" \ - ''} + ${lib.optionalString forceWayland "--set MOZ_ENABLE_WAYLAND 1"} \ + "''${oldWrapperArgs[@]}" ############################# # # # END EXTRA PREF CHANGES # diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 681de76dda3..1c573eb1a58 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -6,39 +6,45 @@ , pkg-config , fribidi , harfbuzz -, libunistring , libwebp , mpg123 -, openssl -, pcre , SDL2 +, the-foundation , AppKit , zip -, zlib +, enableTUI ? false, ncurses, sealcurses }: stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.12.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-AVitXfHIJmCBBkhg+DLkHeCSoyH6YMaTMaa4REDXEFg="; - fetchSubmodules = true; + sha256 = "sha256-ZCG7i5WmhONockaTt/YCww7N+WvxCX2DIwQIFjAk+K8="; }; - postPatch = '' - rm -r lib/fribidi lib/harfbuzz - ''; - nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] + buildInputs = [ the-foundation ] + ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] + ++ lib.optionals enableTUI [ ncurses sealcurses ] ++ lib.optional stdenv.isDarwin AppKit; - installPhase = lib.optionalString stdenv.isDarwin '' + cmakeFlags = lib.optionals enableTUI [ + "-DENABLE_TUI=YES" + "-DENABLE_MPG123=NO" + "-DENABLE_WEBP=NO" + "-DENABLE_FRIBIDI=NO" + "-DENABLE_HARFBUZZ=NO" + "-DENABLE_POPUP_MENUS=NO" + "-DENABLE_IDLE_SLEEP=NO" + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" + ]; + + installPhase = lib.optionalString (stdenv.isDarwin && !enableTUI) '' mkdir -p $out/Applications mv Lagrange.app $out/Applications ''; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix new file mode 100644 index 00000000000..4d62dad4af6 --- /dev/null +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, roxctl }: + +buildGoModule rec { + pname = "roxctl"; + version = "3.69.1"; + + src = fetchFromGitHub { + owner = "stackrox"; + repo = "stackrox"; + rev = version; + sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4="; + }; + + vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "roxctl" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/stackrox/rox/pkg/version/internal.MainVersion=${version}" + ]; + + postInstall = '' + installShellCompletion --cmd roxctl \ + --bash <($out/bin/roxctl completion bash) \ + --fish <($out/bin/roxctl completion fish) \ + --zsh <($out/bin/roxctl completion zsh) + ''; + + passthru.tests.version = testVersion { + package = roxctl; + command = "roxctl version"; + }; + + meta = with lib; { + description = "Command-line client of the StackRox Kubernetes Security Platform"; + license = licenses.asl20; + homepage = "https://www.stackrox.io"; + maintainers = with maintainers; [ stehessel ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix deleted file mode 100644 index 4eb8da760bf..00000000000 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts -, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas -, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 -}: - -stdenv.mkDerivation rec { - pname = "feedreader"; - version = "2.11.0"; - - src = fetchFromGitHub { - owner = "jangernert"; - repo = pname; - rev = "v${version}"; - sha256 = "1agy1nkpkdsy2kbrrc8nrwphj5n86rikjjvwkr8klbf88mzl6civ"; - }; - - nativeBuildInputs = [ - meson ninja pkg-config vala gettext appstream-glib desktop-file-utils - libxml2 python3 wrapGAppsHook - ]; - - buildInputs = [ - curl glib json-glib libnotify libsecret sqlite gumbo gtk3 - libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas - gnome-online-accounts - ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good - ]); - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = pname; - }; - }; - - meta = with lib; { - description = "A modern desktop application designed to complement existing web-based RSS accounts"; - homepage = "https://jangernert.github.io/FeedReader/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 586d49cf96f..2b8edf319cf 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-BILi3+i7SCiK7dVbckv3cNMNyEwgKMf0ct0z/J1xysI="; + hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index 2992bf22cb3..c1eafe304a9 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index 9e352794881..f2b02ebdec4 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -6,13 +6,13 @@ postInstall = '' mkdir "$out/bin" echo '#!/bin/sh' >> "$out/bin/matrix-recorder" - echo "'${pkgs.nodejs-12_x}/bin/node'" \ + echo "'${pkgs.nodejs-14_x}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \ '"$@"' >> "$out/bin/matrix-recorder" echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html" echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html" echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html" - echo "'${pkgs.nodejs-12_x}/bin/node'" \ + echo "'${pkgs.nodejs-14_x}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ '.' >> "$out/bin/matrix-recorder-to-html" chmod a+x "$out/bin/matrix-recorder" diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 18e09326f35..06bbf293f1d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -79,6 +79,11 @@ stdenv.mkDerivation rec { in '' mkdir -p test/test-databases ln -s ${test-database} test/test-databases/database-v1.tar.xz + '' + # TODO: restore after resolved upstream + # https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html + + '' + rm test/T355-smime.sh ''; doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 9c50cb28ec1..fc10b706bdc 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,21 +4,21 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.19.2"; + version = "1.20.1"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "sha256-Zday5lBsRCl00vnnXNKu6VMlq8zmwgI0I+73Pir7ss4="; + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + hash = "sha256-QJevD/meVPEHnfwT1Eu3cwfVFU+ab/16eJBl6cuhGdA="; }; - vendorSha256 = "sha256-2yK0eE34cA7U1nDWRp/JigFpeveipmCuL4jP+94T3Sg="; + vendorSha256 = "sha256-NuiT2GytWaGkgSyl+qoe9DjCCL7wSHc6FU8C6rsy6Vc="; doCheck = false; - BUILD_USER="nix"; - BUILD_HOST="nix"; + BUILD_USER = "nix"; + BUILD_HOST = "nix"; buildPhase = '' runHook preBuild @@ -50,7 +50,8 @@ let }; }; -in { +in +{ syncthing = common { stname = "syncthing"; target = "syncthing"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a67c9c2a70a..c1744389e98 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome, glib, ncurses, libepoxy, gpgme +, gnome, glib, ncurses, libepoxy, gpgme, abseil-cpp , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -177,7 +177,6 @@ in (mkDrv rec { # this I actually hate, this should be a data consistency test! sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test - sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 @@ -190,9 +189,6 @@ in (mkDrv rec { # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -223,37 +219,6 @@ in (mkDrv rec { sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' @@ -412,7 +377,7 @@ in (mkDrv rec { mdds bluez5 libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses libepoxy - libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext + libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext abseil-cpp ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 9bfccf4c306..5ed0517e944 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -21,11 +21,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_75_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz"; - sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b"; + name = "boost_1_77_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_77_0.tar.xz"; + sha256 = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e"; md5 = ""; - md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz"; + md5name = "9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e-boost_1_77_0.tar.xz"; } { name = "box2d-2.3.1.tar.gz"; @@ -56,11 +56,11 @@ md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { - name = "cairo-1.16.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; - sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; + name = "cairo-1.17.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.17.4.tar.xz"; + sha256 = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"; md5 = ""; - md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; + md5name = "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705-cairo-1.17.4.tar.xz"; } { name = "libcdr-0.1.7.tar.xz"; @@ -126,11 +126,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.5.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; - sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; + name = "libepoxy-1.5.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz"; + sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4"; md5 = ""; - md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; + md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz"; } { name = "epm-3.7.tar.gz"; @@ -154,11 +154,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; - sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; + name = "expat-2.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; + sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; md5 = ""; - md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; + md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -168,11 +168,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.13.91.tar.gz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; - sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; + name = "fontconfig-2.13.94.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz"; + sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"; md5 = ""; - md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; + md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -315,25 +315,25 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.9.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; - sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; + name = "freetype-2.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.11.0.tar.xz"; + sha256 = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7"; md5 = ""; - md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; + md5name = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7-freetype-2.11.0.tar.xz"; } { - name = "glm-0.9.9.7.zip"; - url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; - sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + name = "glm-0.9.9.8.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; + sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; md5 = ""; - md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; + md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; } { - name = "gpgme-1.13.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2"; - sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"; + name = "gpgme-1.16.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.16.0.tar.bz2"; + sha256 = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0"; md5 = ""; - md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2"; + md5name = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0-gpgme-1.16.0.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -343,11 +343,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-2.6.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; - sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; + name = "harfbuzz-2.8.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.8.2.tar.xz"; + sha256 = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7"; md5 = ""; - md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; + md5name = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7-harfbuzz-2.8.2.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -371,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-69_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz"; - sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"; + name = "icu4c-70_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-70_1-src.tgz"; + sha256 = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5"; md5 = ""; - md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz"; + md5name = "8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5-icu4c-70_1-src.tgz"; } { - name = "icu4c-69_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip"; - sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"; + name = "icu4c-70_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-70_1-data.zip"; + sha256 = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e"; md5 = ""; - md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip"; + md5name = "c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e-icu4c-70_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,18 +462,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; - sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; + name = "libjpeg-turbo-2.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.1.tar.gz"; + sha256 = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4"; md5 = ""; - md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; + md5name = "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4-libjpeg-turbo-2.1.1.tar.gz"; } { - name = "language-subtag-registry-2021-08-06.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2"; - sha256 = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b"; + name = "language-subtag-registry-2021-12-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2"; + sha256 = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837"; md5 = ""; - md5name = "08452d3997c78e21f2d81e31409dc46557707be6dc1df3129674019659e5ff9b-language-subtag-registry-2021-08-06.tar.bz2"; + md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -483,18 +483,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.11.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz"; - sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e"; + name = "lcms2-2.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz"; + sha256 = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5"; md5 = ""; - md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz"; + md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; } { - name = "libassuan-2.5.3.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2"; - sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702"; + name = "libassuan-2.5.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2"; + sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"; md5 = ""; - md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2"; + md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -511,11 +511,11 @@ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.5.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; - sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; + name = "libexttextcat-3.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; + sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; md5 = ""; - md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; + md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; } { name = "libffi-3.3.tar.gz"; @@ -525,25 +525,25 @@ md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { - name = "libgpg-error-1.37.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2"; - sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"; + name = "libgpg-error-1.43.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.43.tar.bz2"; + sha256 = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"; md5 = ""; - md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2"; + md5name = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf-libgpg-error-1.43.tar.bz2"; } { - name = "liblangtag-0.6.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; - sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; + name = "liblangtag-0.6.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2"; + sha256 = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd"; md5 = ""; - md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; + md5name = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd-liblangtag-0.6.3.tar.bz2"; } { - name = "libnumbertext-1.0.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz"; - sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc"; + name = "libnumbertext-1.0.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.10.tar.xz"; + sha256 = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb"; md5 = ""; - md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz"; + md5name = "a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb-libnumbertext-1.0.10.tar.xz"; } { name = "ltm-1.0.zip"; @@ -553,25 +553,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.32.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz"; - sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043"; + name = "xmlsec1-1.2.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.33.tar.gz"; + sha256 = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931"; md5 = ""; - md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz"; + md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz"; } { - name = "libxml2-2.9.12.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; - sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; + name = "libxml2-2.9.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.13.tar.xz"; + sha256 = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"; md5 = ""; - md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; + md5name = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e-libxml2-2.9.13.tar.xz"; } { - name = "libxslt-1.1.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; - sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; + name = "libxslt-1.1.35.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; + sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; md5 = ""; - md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; + md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -595,11 +595,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.7.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2"; - sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf"; + name = "mdds-2.0.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-2.0.1.tar.bz2"; + sha256 = "3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6"; md5 = ""; - md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2"; + md5name = "3ab33fce58e6acf9540cc1a52264be6863ef80f55ac287194cc98cda48e71fe6-mdds-2.0.1.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -616,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.19.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz"; - sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af"; + name = "libmwaw-0.3.21.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; + sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; md5 = ""; - md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz"; + md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -679,11 +679,11 @@ md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; } { - name = "liborcus-0.16.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2"; - sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4"; + name = "liborcus-0.17.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2"; + sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143"; md5 = ""; - md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; + md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -693,18 +693,18 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4500.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2"; - sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304"; + name = "pdfium-4699.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4699.tar.bz2"; + sha256 = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf"; md5 = ""; - md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2"; + md5name = "ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf-pdfium-4699.tar.bz2"; } { - name = "pixman-0.34.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; - sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; - md5 = "e80ebae4da01e77f68744319f01d52a3"; - md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + name = "pixman-0.40.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/pixman-0.40.0.tar.gz"; + sha256 = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc"; + md5 = ""; + md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz"; } { name = "libpng-1.6.37.tar.xz"; @@ -791,11 +791,11 @@ md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; } { - name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; - sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d"; + name = "skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; + sha256 = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177"; md5 = ""; - md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + md5name = "97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177-skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -861,11 +861,11 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.11.tar.xz"; - url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; - sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; + name = "zlib-1.2.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz"; + sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"; md5 = ""; - md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; + md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; @@ -875,10 +875,17 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxing-cpp-1.1.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz"; - sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86"; + name = "zxing-cpp-1.2.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz"; + sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a"; + md5 = ""; + md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz"; + } + { + name = "libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"; + sha256 = "471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e"; md5 = ""; - md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz"; + md5name = "471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e-libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 1e0ee64bd1f..ace442176dd 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -3,9 +3,21 @@ attrs: { postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' + + sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + + sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' ''; configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") "--without-system-zxing" + "--without-system-cuckoo" ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 7d13558b935..50b28e6cf6b 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "7"; - minor = "2"; - patch = "5"; + minor = "3"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-Z8G/sFnUMyhrAlKpFWJ7M69ju19LbslQnRO53UdVEqc="; + sha256 = "sha256-7hK9vhYhwg4nRLxbbFlngQ8lpXYLmKxYEtVQqwCWhoU="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-9rnuRifsEX7RAUdsX6VVw/xQS6dZeS3RbKnoC39uMd8="; + sha256 = "sha256-uRsKSC+kLVnhYF85o5FxZuf/dr+o6bYtbu8KmwSzNRw="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-6vERLWh0fkQcSRkC37fw2HBqxVtbr9kPEhOyWXjMrfM="; + sha256 = "sha256-aIY07MuALBVklhJLOUwOxeIQWam2zQCVkw+edvnu/ps="; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 57eebe6ec6d..dddb89671b0 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -6,13 +6,6 @@ md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } - { - name = "commons-logging-1.2-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; - sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; - md5 = ""; - md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; - } { name = "apr-1.5.2.tar.gz"; url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; @@ -28,11 +21,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_71_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; - sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; + name = "boost_1_75_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz"; + sha256 = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b"; md5 = ""; - md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; + md5name = "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b-boost_1_75_0.tar.xz"; } { name = "box2d-2.3.1.tar.gz"; @@ -42,11 +35,11 @@ md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; } { - name = "breakpad.zip"; - url = "https://dev-www.libreoffice.org/src/breakpad.zip"; - sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91"; md5 = ""; - md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; + md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { name = "bsh-2.0b6-src.zip"; @@ -56,11 +49,11 @@ md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { - name = "bzip2-1.0.6.tar.gz"; - url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; - sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + name = "bzip2-1.0.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz"; + sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"; + md5 = ""; + md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; @@ -70,11 +63,11 @@ md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; - sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; + name = "libcdr-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; + sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; md5 = ""; - md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; + md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -119,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.78.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz"; - sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5"; + name = "curl-7.79.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz"; + sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689"; md5 = ""; - md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz"; + md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,25 +147,25 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; - sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; + name = "libetonyek-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; + sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; md5 = ""; - md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; + md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; - sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; + name = "expat-2.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; + sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; md5 = ""; - md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; + md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; } { - name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; - sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; + name = "Firebird-3.0.7.33374-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2"; + sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76"; md5 = ""; - md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { name = "fontconfig-2.13.91.tar.gz"; @@ -217,11 +210,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; - sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + name = "liberation-fonts-ttf-2.1.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; + sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; md5 = ""; - md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; + md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -266,11 +259,11 @@ md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { - name = "culmus-0.131.tar.gz"; - url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; - sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; + name = "culmus-0.133.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; + sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; md5 = ""; - md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; @@ -378,18 +371,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-68_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; - sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; + name = "icu4c-69_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz"; + sha256 = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"; md5 = ""; - md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; + md5name = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745-icu4c-69_1-src.tgz"; } { - name = "icu4c-68_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; - sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; + name = "icu4c-69_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip"; + sha256 = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"; md5 = ""; - md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; + md5name = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf-icu4c-69_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -476,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2021-03-05.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; - sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; + name = "language-subtag-registry-2021-12-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-12-29.tar.bz2"; + sha256 = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837"; md5 = ""; - md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; + md5name = "d9dcf20be5ad4856daef023087421bedc1477f9b4247fc8ea53bb32e07c97837-language-subtag-registry-2021-12-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -560,25 +553,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.30.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; - sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; + name = "xmlsec1-1.2.32.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz"; + sha256 = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043"; md5 = ""; - md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; + md5name = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043-xmlsec1-1.2.32.tar.gz"; } { - name = "libxml2-2.9.12.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; - sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; + name = "libxml2-2.9.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.13.tar.xz"; + sha256 = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e"; md5 = ""; - md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; + md5name = "276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e-libxml2-2.9.13.tar.xz"; } { - name = "libxslt-1.1.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; - sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; + name = "libxslt-1.1.35.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; + sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; md5 = ""; - md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; + md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -623,11 +616,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.17.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; - sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; + name = "libmwaw-0.3.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz"; + sha256 = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af"; md5 = ""; - md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; + md5name = "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af-libmwaw-0.3.19.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -651,11 +644,11 @@ md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz"; } { - name = "libodfgen-0.1.6.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; - sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + name = "libodfgen-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz"; + sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625"; md5 = ""; - md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; + md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz"; } { name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; @@ -672,11 +665,11 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.45.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; - sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; + name = "openldap-2.4.59.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; + sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; md5 = ""; - md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; + md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { name = "openssl-1.1.1l.tar.gz"; @@ -692,13 +685,6 @@ md5 = ""; md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } - { - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; - md5 = ""; - md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - } { name = "libpagemaker-0.0.4.tar.xz"; url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; @@ -707,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4306.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; - sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; + name = "pdfium-4500.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4500.tar.bz2"; + sha256 = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304"; md5 = ""; - md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; + md5name = "26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304-pdfium-4500.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -728,32 +714,32 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-21.01.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; - sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; + name = "poppler-21.11.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; + sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; md5 = ""; - md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; + md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; } { - name = "postgresql-13.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; - sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; + name = "poppler-data-0.4.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; + sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; md5 = ""; - md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; + md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; } { - name = "Python-3.8.8rc1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.8rc1.tar.xz"; - sha256 = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6"; + name = "postgresql-13.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; + sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; md5 = ""; - md5name = "bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6-Python-3.8.8rc1.tar.xz"; + md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; } { - name = "QR-Code-generator-1.4.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; - sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; + name = "Python-3.8.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; + sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; md5 = ""; - md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; + md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -798,18 +784,18 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "serf-1.2.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; - sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + name = "serf-1.3.9.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.3.9.tar.bz2"; + sha256 = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc"; md5 = ""; - md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; + md5name = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc-serf-1.3.9.tar.bz2"; } { - name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; - sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; + name = "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; + sha256 = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d"; md5 = ""; - md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + md5name = "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d-skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -888,4 +874,11 @@ md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } + { + name = "zxing-cpp-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.1.1.tar.gz"; + sha256 = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86"; + md5 = ""; + md5name = "e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86-zxing-cpp-1.1.1.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 186f4b17d6a..75fb085b9c9 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -3,11 +3,46 @@ attrs: { postConfigure = attrs.postConfigure + '' sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx + sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' ''; configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") - "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" - "--without-system-qrcodegen" + "--without-system-zxing" ]; - patches = attrs.patches or [] ++ [ ../xdg-open-brief.patch ]; # drop this when switching to 7.2 + + patches = attrs.patches or []; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 83179f2a136..52226fdc2d9 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "1"; - patch = "8"; - tweak = "1"; + minor = "2"; + patch = "6"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-TGcR2/TSQJOjq7G1vXSa4MaEA6fG95rHVZfnjoiqeJM="; + sha256 = "sha256-SDdlqYuS2Q6MjHNeCNM8KjS1/h+8jn9rH5x0rRoUHjE="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-jy5dUzKCEBYiTXh6dBwgdfW1Ok5l1iDGyL13icQHWEM="; + sha256 = "sha256-fUZflmrCi4mOa6iZTm+K9IvRTlSjcI4UJ4EoyK/HHck="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-tr2hmCeRRyft03Nfk8afSaurCV6DJSYuxKo4GPK/It4="; + sha256 = "sha256-TjAgz7yV7y5VNrEuT2eElkNGZzh6J58T1TC3u2Ap2o4="; }; } diff --git a/pkgs/applications/office/libreoffice/xdg-open-brief.patch b/pkgs/applications/office/libreoffice/xdg-open-brief.patch deleted file mode 100644 index 0a2f02e71fe..00000000000 --- a/pkgs/applications/office/libreoffice/xdg-open-brief.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh -index 4519e01f26e2..8985711a2c01 100755 ---- a/shell/source/unix/misc/senddoc.sh -+++ b/shell/source/unix/misc/senddoc.sh -@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in - MAILER=/usr/bin/kde-open - elif [ -x /usr/bin/xdg-open ] ; then - MAILER=/usr/bin/xdg-open -+ elif type -p xdg-open >/dev/null 2>&1 ; then -+ MAILER="$(type -p xdg-open)" - else - echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`" - exit 2 diff --git a/pkgs/applications/office/shelf/default.nix b/pkgs/applications/office/shelf/default.nix new file mode 100644 index 00000000000..7ad3b915188 --- /dev/null +++ b/pkgs/applications/office/shelf/default.nix @@ -0,0 +1,58 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +, poppler +}: + +mkDerivation rec { + pname = "shelf"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "shelf"; + rev = "v${version}"; + sha256 = "sha256-0a5UHrYrkLR35cezjin+K9cTk3+aLeUAkvBbmKMK61w="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + poppler + ]; + + meta = with lib; { + description = "Document and EBook collection manager"; + homepage = "https://invent.kde.org/maui/shelf"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 7ee46f7d7e2..4c3d1d4c1a7 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack ] ++ lib.optionals useMpi [ mpi scalapack ]; - enableParallelBuilding = true; + enableParallelBuilding = false; # Started making trouble with gcc-11 # Must do manualy becuase siesta does not do the regular # ./configure; make; make install @@ -35,17 +35,23 @@ stdenv.mkDerivation rec { cp gfortran.make arch.make ''; - preBuild = if useMpi then '' + preBuild = '' + # See https://gitlab.com/siesta-project/siesta/-/commit/a10bf1628e7141ba263841889c3503c263de1582 + # This may be fixed in the next release. makeFlagsArray=( + FFLAGS="-fallow-argument-mismatch" + ) + '' + (if useMpi then '' + makeFlagsArray+=( CC="mpicc" FC="mpifort" FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="." COMP_LIBS="" LIBS="-lblas -llapack -lscalapack" ); '' else '' - makeFlagsArray=( + makeFlagsArray+=( COMP_LIBS="" LIBS="-lblas -llapack" ); - ''; + ''); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 63dfe6c2837..a203db1204c 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtkWithQt5}: stdenv.mkDerivation rec { pname = "elmerfem"; @@ -13,19 +13,44 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake gfortran pkg-config git ]; - buildInputs = [ mpi blas liblapack qt4 qwt6_qt4 ]; + nativeBuildInputs = [ + cmake + gfortran + pkg-config + libsForQt5.wrapQtAppsHook + ]; + buildInputs = [ + mpi + blas + liblapack + libsForQt5.qtbase + libsForQt5.qtscript + libsForQt5.qwt + libGL + libGLU + opencascade + vtkWithQt5 + ]; preConfigure = '' patchShebangs ./ ''; + patches = [ + ./patches/0001-fix-import-of-QPainterPath.patch + ./patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch + ./patches/0003-ignore-qwt_compat.patch + ]; + storepath = placeholder "out"; cmakeFlags = [ "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" "-DWITH_OpenMP:BOOLEAN=TRUE" "-DWITH_MPI:BOOLEAN=TRUE" + "-DWITH_QT5:BOOLEAN=TRUE" + "-DWITH_OCC:BOOLEAN=TRUE" + "-DWITH_VTK:BOOLEAN=TRUE" "-DWITH_ELMERGUI:BOOLEAN=TRUE" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" diff --git a/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch b/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch new file mode 100644 index 00000000000..a9e1ba442b4 --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch @@ -0,0 +1,24 @@ +From 87885de957aa3f891fe963503c94685675c24f49 Mon Sep 17 00:00:00 2001 +From: grindhold +Date: Wed, 27 Apr 2022 19:16:42 +0200 +Subject: [PATCH] fix import of QPainterPath + +--- + ElmerGUI/Application/twod/renderarea.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ElmerGUI/Application/twod/renderarea.cpp b/ElmerGUI/Application/twod/renderarea.cpp +index 4c2515c5..65128ea9 100644 +--- a/ElmerGUI/Application/twod/renderarea.cpp ++++ b/ElmerGUI/Application/twod/renderarea.cpp +@@ -38,6 +38,7 @@ + * * + *****************************************************************************/ + #include ++#include + #include + #include + #include +-- +2.33.3 + diff --git a/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch b/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch new file mode 100644 index 00000000000..6c2782b9e0b --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch @@ -0,0 +1,82 @@ +From 06634e5fd46a27dca11b87d4a38e9ead561de3d5 Mon Sep 17 00:00:00 2001 +From: grindhold +Date: Thu, 28 Apr 2022 15:47:07 +0200 +Subject: [PATCH] fem: rename loopvars to avoid redefinition + +--- + fem/src/modules/DCRComplexSolve.F90 | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/fem/src/modules/DCRComplexSolve.F90 b/fem/src/modules/DCRComplexSolve.F90 +index 469214ee..268591fd 100644 +--- a/fem/src/modules/DCRComplexSolve.F90 ++++ b/fem/src/modules/DCRComplexSolve.F90 +@@ -502,14 +502,14 @@ CONTAINS + + IF ( SIZE(Hwrk,1) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,1:n ) = Hwrk( 1,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,2)) ++ Tensor( k,1:n ) = Hwrk( 1,1,1:n ) + END DO + + ELSE + +- DO i=1,MIN(3,SIZE(Hwrk,1)) +- Tensor( i,1:n ) = Hwrk( i,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) ++ Tensor( k,1:n ) = Hwrk( k,1,1:n ) + END DO + + END IF +@@ -1391,21 +1391,21 @@ contains + + IF ( SIZE(Hwrk,1) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,i,1:n ) = Hwrk( 1,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,2)) ++ Tensor( k,k,1:n ) = Hwrk( 1,1,1:n ) + END DO + + ELSE IF ( SIZE(Hwrk,2) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,1)) +- Tensor(i,i,1:n) = Hwrk(i,1,1:n) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) ++ Tensor(k,k,1:n) = Hwrk(k,1,1:n) + END DO + + ELSE + +- DO i=1,MIN(3,SIZE(Hwrk,1)) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) + DO j=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,j,1:n ) = Hwrk(i,j,1:n) ++ Tensor( k,j,1:n ) = Hwrk(k,j,1:n) + END DO + END DO + +@@ -1443,14 +1443,14 @@ contains + + IF ( SIZE(Hwrk,1) == 1 ) THEN + +- DO i=1,MIN(3,SIZE(Hwrk,2)) +- Tensor( i,1:n ) = Hwrk( 1,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,2)) ++ Tensor( k,1:n ) = Hwrk( 1,1,1:n ) + END DO + + ELSE + +- DO i=1,MIN(3,SIZE(Hwrk,1)) +- Tensor( i,1:n ) = Hwrk( i,1,1:n ) ++ DO k=1,MIN(3,SIZE(Hwrk,1)) ++ Tensor( k,1:n ) = Hwrk( k,1,1:n ) + END DO + + END IF +-- +2.33.3 + diff --git a/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch b/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch new file mode 100644 index 00000000000..26954008d5d --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch @@ -0,0 +1,36 @@ +From 26601fec36a4978e805aad40e6d0cbf268c653d2 Mon Sep 17 00:00:00 2001 +From: grindhold +Date: Thu, 28 Apr 2022 17:13:06 +0200 +Subject: [PATCH] ignore qwt_compat + +--- + ElmerGUI/Application/src/convergenceview.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ElmerGUI/Application/src/convergenceview.h b/ElmerGUI/Application/src/convergenceview.h +index 377b644b..64250149 100755 +--- a/ElmerGUI/Application/src/convergenceview.h ++++ b/ElmerGUI/Application/src/convergenceview.h +@@ -52,7 +52,7 @@ + #include + #include + /*#include <-- deprecated in Qwt6, using qwt_compat.h instead*/ +-#include ++/*#include */ + #include + #include + +@@ -76,8 +76,8 @@ public: + + private: + int d_count; +- QwtArray d_x; +- QwtArray d_y; ++ QVector d_x; ++ QVector d_y; + }; + + class Curve +-- +2.33.3 + diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index a7218347258..31ab40d7947 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -15,16 +15,15 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE="; }; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3.pkgs; [ sh pygit2 clint ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pygit2==0.28.2" "pygit2>=0.28.2" - ''; + pythonRelaxDeps = [ "pygit2" ]; doCheck = false; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 48987291599..96dc8302488 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${lib.optionalString fullBuild "-full"}"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-V7ikYdDOE9muOBfYqL35Ay407fqsPbzLO2a4NdzpM4g="; + sha256 = "sha256-pSgQ/AFAmCjEl00Lwsu1yA6UjVtYTPsadpliPpJKLyo="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-HYH7+OD11kdZdxFrx1KVle1NesS3fAgwVXJpAeiXDTo="; + sha256 = "sha256-OSaeOp+SjQ5n61jV8UthtQQqkneBYJhESoQDCwRSTco="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -151,6 +151,8 @@ let EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" + # include tests for native components + export HGMODULEPOLICY="rust+c" # extended timeout necessary for tests to pass on the busy CI workers export HGTESTFLAGS="--blacklist blacklists/nix --timeout 1800 -j$NIX_BUILD_CORES ${flags}" make check diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix new file mode 100644 index 00000000000..cd176972277 --- /dev/null +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -0,0 +1,22 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation { + pname = "rcshist"; + version = "1.04"; + + src = fetchurl { + url = "https://invisible-island.net/datafiles/release/rcshist.tar.gz"; + sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; + }; + + meta = { + description = "Utitity to display complete revision history of a set of RCS files"; + homepage = "https://invisible-island.net/rcshist/rcshist.html"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.kaction ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 169edb171db..9b9a21a1469 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -97,7 +97,7 @@ rec { }; # Same example, but re-fetches every time the fetcher implementation changes. # NOTE: Only use this for testing, or you'd be wasting a lot of time, network and space. - testNixFromDockerHub = pkgs.invalidateFetcherByDrvHash pullImage { + testNixFromDockerHub = pkgs.testers.invalidateFetcherByDrvHash pullImage { imageName = "nixos/nix"; imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357"; sha256 = "19fw0n3wmddahzr20mhdqv6jkjn1kanh6n2mrr08ai53dr8ph5n7"; diff --git a/pkgs/build-support/fetchfirefoxaddon/tests.nix b/pkgs/build-support/fetchfirefoxaddon/tests.nix index c407d0e74b8..fd70d0f82ac 100644 --- a/pkgs/build-support/fetchfirefoxaddon/tests.nix +++ b/pkgs/build-support/fetchfirefoxaddon/tests.nix @@ -1,7 +1,7 @@ -{ invalidateFetcherByDrvHash, fetchFirefoxAddon, fetchurl, ... }: +{ testers, fetchFirefoxAddon, fetchurl, ... }: { - simple = invalidateFetcherByDrvHash fetchFirefoxAddon { + simple = testers.invalidateFetcherByDrvHash fetchFirefoxAddon { name = "image-search-options"; # Chosen because its only 147KB url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; @@ -14,7 +14,7 @@ sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg="; }; in - invalidateFetcherByDrvHash fetchFirefoxAddon { + testers.invalidateFetcherByDrvHash fetchFirefoxAddon { name = "image-search-options"; src = image-search-options; }; diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index c558fb6efa4..b9ab66d9353 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -1,14 +1,14 @@ -{ invalidateFetcherByDrvHash, fetchgit, ... }: +{ testers, fetchgit, ... }: { - simple = invalidateFetcherByDrvHash fetchgit { + simple = testers.invalidateFetcherByDrvHash fetchgit { name = "nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; }; - sparseCheckout = invalidateFetcherByDrvHash fetchgit { + sparseCheckout = testers.invalidateFetcherByDrvHash fetchgit { name = "nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index ff2b81bf3a1..a42b7cd7d14 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -1,18 +1,18 @@ -{ invalidateFetcherByDrvHash, fetchpatch, ... }: +{ testers, fetchpatch, ... }: { - simple = invalidateFetcherByDrvHash fetchpatch { + simple = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; - relative = invalidateFetcherByDrvHash fetchpatch { + relative = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }; - full = invalidateFetcherByDrvHash fetchpatch { + full = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "test"; stripLen = 1; diff --git a/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix b/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix index a781dad8307..19451466f24 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix @@ -1,15 +1,15 @@ -{ invalidateFetcherByDrvHash, fetchYarnDeps, ... }: +{ testers, fetchYarnDeps, ... }: { - simple = invalidateFetcherByDrvHash fetchYarnDeps { + simple = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./simple.lock; sha256 = "sha256-Erdkw2E8wWT09jFNLXGkrdwKl0HuSZWnUDJUrV95vSE="; }; - gitDep = invalidateFetcherByDrvHash fetchYarnDeps { + gitDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./git.lock; sha256 = "sha256-lAqN4LpoE+jgsQO1nDtuORwcVEO7ogEV53jCu2jFJUI="; }; - githubDep = invalidateFetcherByDrvHash fetchYarnDeps { + githubDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./github.lock; sha256 = "sha256-Tsfgyjxz8x6gNmfN0xR7G/NQNoEs4svxRN/N+26vfJU="; }; diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh index 986be5b9e11..3931b37c242 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh @@ -33,6 +33,7 @@ assertExecutable() { # To troubleshoot a binary wrapper after you compiled it, # use the `strings` command or open the binary file in a text editor. makeWrapper() { + local NIX_CFLAGS_COMPILE= NIX_CFLAGS_LINK= local original="$1" local wrapper="$2" shift 2 @@ -44,6 +45,7 @@ makeWrapper() { makeDocumentedCWrapper "$original" "$@" | \ @CC@ \ -Wall -Werror -Wpedantic \ + -Wno-overlength-strings \ -Os \ -x c \ -o "$wrapper" - diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index d0ea088bf71..8c10f67c152 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , makeSetupHook -, makeWrapper +, makeBinaryWrapper , gobject-introspection , isGraphical ? true , gtk3 @@ -34,7 +34,7 @@ makeSetupHook { ] ++ [ # We use the wrapProgram function. - makeWrapper + makeBinaryWrapper ]; substitutions = { passthru.tests = let @@ -59,8 +59,8 @@ makeSetupHook { tested = basic; in testLib.runTest "basic-contains-dconf" ( testLib.skip stdenv.isDarwin '' - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES=" "${dconf.lib}/lib/gio/modules"} - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GIO_EXTRA_MODULES=" "${dconf.lib}/lib/gio/modules"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES" "${dconf.lib}/lib/gio/modules"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GIO_EXTRA_MODULES" "${dconf.lib}/lib/gio/modules"} '' ); @@ -98,8 +98,8 @@ makeSetupHook { typelib-user-has-gi-typelib-path = let tested = typelib-user; in testLib.runTest "typelib-user-has-gi-typelib-path" '' - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH=" "${typelib-Mahjong}/lib/girepository-1.0"} - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH=" "${typelib-Mahjong}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH" "${typelib-Mahjong}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH" "${typelib-Mahjong}/lib/girepository-1.0"} ''; # Simple derivation containing a gobject-introspection typelib in lib output. @@ -143,8 +143,8 @@ makeSetupHook { typelib-multiout-user-has-gi-typelib-path = let tested = typelib-multiout-user; in testLib.runTest "typelib-multiout-user-has-gi-typelib-path" '' - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH=" "${typelib-Bechamel.lib}/lib/girepository-1.0"} - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH=" "${typelib-Bechamel.lib}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH" "${typelib-Bechamel.lib}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH" "${typelib-Bechamel.lib}/lib/girepository-1.0"} ''; # Simple derivation that contains a typelib as well as a program using it. @@ -169,8 +169,8 @@ makeSetupHook { typelib-self-user-has-gi-typelib-path = let tested = typelib-self-user; in testLib.runTest "typelib-self-user-has-gi-typelib-path" '' - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH=" "${typelib-self-user}/lib/girepository-1.0"} - ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH=" "${typelib-self-user}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GI_TYPELIB_PATH" "${typelib-self-user}/lib/girepository-1.0"} + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/libexec/bar" "GI_TYPELIB_PATH" "${typelib-self-user}/lib/girepository-1.0"} ''; }; }; diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix index 1757bdbbe25..42866c3419d 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/tests/lib.nix @@ -1,5 +1,4 @@ -{ runCommand -}: +{ lib, runCommand }: rec { runTest = name: body: runCommand name { } '' @@ -19,12 +18,14 @@ rec { ''; expectSomeLineContainingYInFileXToMentionZ = file: filter: expected: '' - if ! cat "${file}" | grep "${filter}"; then - ${fail "The file “${file}” should include a line containing “${filter}”."} + file=${lib.escapeShellArg file} filter=${lib.escapeShellArg filter} expected=${lib.escapeShellArg expected} + + if ! grep --text --quiet "$filter" "$file"; then + ${fail "The file “$file” should include a line containing “$filter”."} fi - if ! cat "${file}" | grep "${filter}" | grep ${expected}; then - ${fail "The file “${file}” should include a line containing “${filter}” that also contains “${expected}”."} + if ! grep --text "$filter" "$file" | grep --text --quiet "$expected"; then + ${fail "The file “$file” should include a line containing “$filter” that also contains “$expected”."} fi ''; } diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index cd651965407..1988d95212c 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -22,7 +22,7 @@ , postInstall # : list Maintainer , maintainers ? [ ] - # : passtrhu arguments (e.g. tests) + # : passthru arguments (e.g. tests) , passthru ? { } }: diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 8b79843b833..3ab97760e72 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, callPackage, runCommand }: +{ pkgs, lib, callPackage, runCommand, stdenv }: # Documentation is in doc/builders/testers.chapter.md { testEqualDerivation = callPackage ./test-equal-derivation.nix { }; @@ -15,4 +15,49 @@ echo "$output" >&2 && exit 1 fi ''; + + # See doc/builders/testers.chapter.md or + # https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash + invalidateFetcherByDrvHash = f: args: + let + drvPath = (f args).drvPath; + # It's safe to discard the context, because we don't access the path. + salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath)); + # New derivation incorporating the original drv hash in the name + salted = f (args // { name = "${args.name or "source"}-salted-${salt}"; }); + # Make sure we did change the derivation. If the fetcher ignores `name`, + # `invalidateFetcherByDrvHash` doesn't work. + checked = + if salted.drvPath == drvPath + then throw "invalidateFetcherByDrvHash: Adding the derivation hash to the fixed-output derivation name had no effect. Make sure the fetcher's name argument ends up in the derivation name. Otherwise, the fetcher will not be re-run when its implementation changes. This is important for testing." + else salted; + in checked; + + # See doc/builders/testers.chapter.md or + # https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash + nixosTest = + let + /* The nixos/lib/testing-python.nix module, preapplied with arguments that + * make sense for this evaluation of Nixpkgs. + */ + nixosTesting = + (import ../../../nixos/lib/testing-python.nix { + inherit (stdenv.hostPlatform) system; + inherit pkgs; + extraConfigurations = [( + { lib, ... }: { + config.nixpkgs.pkgs = lib.mkDefault pkgs; + } + )]; + }); + in + test: + let + loadedTest = if builtins.typeOf test == "path" + then import test + else test; + calledTest = lib.toFunction loadedTest pkgs; + in + nixosTesting.makeTest calledTest; + } diff --git a/pkgs/build-support/testers/test/README.md b/pkgs/build-support/testers/test/README.md new file mode 100644 index 00000000000..2d6b4bdc43f --- /dev/null +++ b/pkgs/build-support/testers/test/README.md @@ -0,0 +1,8 @@ +# Tests _for the testers_ + + cd nixpkgs + nix-build -A tests.testers + +Tests generally derive their own correctness from simplicity, which in the +case of testers (themselves functions) does not always work out. +Hence the need for tests that test the testers. diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix new file mode 100644 index 00000000000..30e778cf652 --- /dev/null +++ b/pkgs/build-support/testers/test/default.nix @@ -0,0 +1,27 @@ +{ testers, lib, pkgs, ... }: +let + pkgs-with-overlay = pkgs.extend(final: prev: { + proof-of-overlay-hello = prev.hello; + }); + + dummyVersioning = { + revision = "test"; + versionSuffix = "test"; + label = "test"; + }; + +in +lib.recurseIntoAttrs { + # Check that the wiring of nixosTest is correct. + # Correct operation of the NixOS test driver should be asserted elsewhere. + nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { + name = "nixosTest-test"; + nodes.machine = { pkgs, ... }: { + system.nixos = dummyVersioning; + environment.systemPackages = [ pkgs.proof-of-overlay-hello figlet ]; + }; + testScript = '' + machine.succeed("hello | figlet >/dev/console") + ''; + }); +} diff --git a/pkgs/build-support/trivial-builders/test/references.nix b/pkgs/build-support/trivial-builders/test/references.nix index 989722121cb..3e1eb16eecd 100644 --- a/pkgs/build-support/trivial-builders/test/references.nix +++ b/pkgs/build-support/trivial-builders/test/references.nix @@ -1,4 +1,4 @@ -{ lib, nixosTest, pkgs, writeText, hello, figlet, stdenvNoCC }: +{ lib, testers, pkgs, writeText, hello, figlet, stdenvNoCC }: # -------------------------------------------------------------------------- # # @@ -22,7 +22,7 @@ let lib.attrValues (import file { inherit pkgs; }) ); in -nixosTest { +testers.nixosTest { name = "nixpkgs-trivial-builders"; nodes.machine = { ... }: { virtualisation.writableStore = true; diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index 14c8d36f28b..cdc7a978e6b 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -1,18 +1,18 @@ { lib, fetchzip }: let - version = "40.0"; + version = "41.0"; in fetchzip rec { name = "cldr-annotations-${version}"; - url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip"; + url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; postFetch = '' mkdir -p $out/share/unicode/cldr unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*' ''; - sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM="; + sha256 = "sha256-3dHVZGx3FmR97fzhlTSx/xp6YTAV+sMExl6gpLzl1MY="; meta = with lib; { description = "Names and keywords for Unicode characters from the Common Locale Data Repository"; diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index e57191f0a1d..7720fd1724d 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 +{ lib, stdenv, fetchurl, fetchpatch +, meson, ninja, pkg-config, wrapGAppsHook, python3 , gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: stdenv.mkDerivation rec { @@ -10,9 +11,24 @@ stdenv.mkDerivation rec { sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like gcc-10: + # https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/2 + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitlab.gnome.org/GNOME/atomix/-/commit/be7f44f1945a569494d46c60eaf6e7b39b2bb48b.patch"; + sha256 = "0nrwl6kb1als9mxd5s0la45z63xwshqlnxqjaax32w8yrl6kz7l8"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ]; + # When building with clang ceil() is not inlined: + # ld: src/libatomix.a.p/canvas_helper.c.o: undefined reference to symbol 'ceil@@GLIBC_2.2.5' + # https://gitlab.gnome.org/GNOME/atomix/-/merge_requests/3 + NIX_LDFLAGS = "-lm"; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 229810edde1..47551cedfb2 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, - ddcutil, networkmanager-qt, plasma-workspace, qtx11extras, solid, udev + networkmanager-qt, plasma-workspace, qtx11extras, solid, udev }: mkDerivation { @@ -13,9 +13,5 @@ mkDerivation { kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kglobalaccel ki18n kio kidletime kwayland libkscreen networkmanager-qt plasma-workspace qtx11extras - ddcutil - ]; - cmakeFlags = [ - "-DHAVE_DDCUTIL=On" ]; } diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 79e682e88c4..607c9eeac2f 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -52,7 +52,13 @@ with lib; with builtins; let majorVersion = "11"; - version = "${majorVersion}.2.0"; + # The patch below for aarch64-darwin does not apply to 11.3.0 and an + # updated version is not available. Keep aarch64-darwin on 11.2.0 so the + # large body of packages which depend on gfortran are still functional + # until GCC 12 is the default. + # On x86_64-darwin, building libgcc suffers from some different issues with 11.3.0. + version = if stdenv.isDarwin then + "${majorVersion}.2.0" else "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -91,7 +97,9 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os="; + sha256 = if stdenv.isDarwin + then "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=" + else "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk="; }; inherit patches; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index f7250885f14..2a65c3fc2ec 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.4"; + version = "1.6.6"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; + hash = "sha256-Z7ERzm84YVA7n8wcrln8NNASJWbT7P7zoGSiF0EhpFI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 9c3c34c73aa..5d6e8e02507 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -197,14 +197,14 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.3.7"; # Mar 15, 2022 + crossVersion = "31dac3e264a7f1f53dbf49570771123ebd514055"; # May 03, 2022 perl-cross-src = fetchFromGitHub { - name = "perl-cross-${crossVersion}"; + name = "perl-cross-unstable-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-F7Vi3RAgIE/3NPlbD5zQ3Q8Ex9ddXTC4zoCRaOxXK0A="; + sha256 = "sha256-5hLUP34WwTFRsG0o8zSJm8WM3WfBAhHeYrrQF2MtMKc="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index cb5ef87826a..34c6a72662d 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -124,6 +124,15 @@ in rec { }; } ./python-recompile-bytecode-hook.sh ) {}; + pythonRelaxDepsHook = callPackage ({ wheel }: + makeSetupHook { + name = "python-relax-deps-hook"; + deps = [ wheel ]; + substitutions = { + inherit pythonInterpreter; + }; + } ./python-relax-deps-hook.sh) {}; + pythonRemoveBinBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-remove-bin-bytecode-hook"; @@ -161,8 +170,8 @@ in rec { deps = [ ensureNewerSourcesForZipFilesHook ]; substitutions = { inherit pythonInterpreter; - }; - } ./venv-shell-hook.sh) {}); + }; + } ./venv-shell-hook.sh) {}); wheelUnpackHook = callPackage ({ wheel }: makeSetupHook { diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh new file mode 100644 index 00000000000..7e1cfe51724 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -0,0 +1,83 @@ +# shellcheck shell=bash + +# Setup hook that modifies Python dependencies versions. +# +# Example usage in a derivation: +# +# { …, pythonPackages, … }: +# +# pythonPackages.buildPythonPackage { +# … +# nativeBuildInputs = [ pythonPackages.pythonRelaxDepsHook ]; +# +# # This will relax the dependency restrictions +# # e.g.: abc>1,<=2 -> abc +# pythonRelaxDeps = [ "abc" ]; +# # This will relax all dependencies restrictions instead +# # pythonRelaxDeps = true; +# # This will remove the dependency +# # e.g.: cde>1,<=2 -> +# pythonRemoveDeps = [ "cde" ]; +# # This will remove all dependencies from the project +# # pythonRemoveDeps = true; +# … +# } + +_pythonRelaxDeps() { + local -r metadata_file="$1" + + if [[ -z "${pythonRelaxDeps:-}" ]] || [[ "$pythonRelaxDeps" == 0 ]]; then + return + elif [[ "$pythonRelaxDeps" == 1 ]]; then + sed -i "$metadata_file" -r \ + -e 's/(Requires-Dist: \S*) \(.*\)/\1/' + else + for dep in $pythonRelaxDeps; do + sed -i "$metadata_file" -r \ + -e "s/(Requires-Dist: $dep) \(.*\)/\1/" + done + fi +} + +_pythonRemoveDeps() { + local -r metadata_file="$1" + + if [[ -z "${pythonRemoveDeps:-}" ]] || [[ "$pythonRemoveDeps" == 0 ]]; then + return + elif [[ "$pythonRemoveDeps" == 1 ]]; then + sed -i "$metadata_file" \ + -e '/Requires-Dist:.*/d' + else + for dep in $pythonRemoveDeps; do + sed -i "$metadata_file" \ + -e "/Requires-Dist: $dep/d" + done + fi + +} + +pythonRelaxDepsHook() { + pushd dist + + local -r package="$pname-$version" + local -r unpack_dir="unpacked" + local -r metadata_file="$unpack_dir/$package/$package.dist-info/METADATA" + local -r wheel=$(echo "$package"*".whl") + + @pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" + rm -rf "$wheel" + + _pythonRelaxDeps "$metadata_file" + _pythonRemoveDeps "$metadata_file" + + if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo "pythonRelaxDepsHook: resulting METADATA:" + cat "$unpack_dir/$package/$package.dist-info/METADATA" + fi + + @pythonInterpreter@ -m wheel pack "$unpack_dir/$package" + + popd +} + +postBuild+=" pythonRelaxDepsHook" diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index 89a95e98219..958a9378ef1 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -12,10 +12,10 @@ setuptoolsBuildPhase() { args+="$setupPyGlobalFlags" fi if [ -n "$enableParallelBuilding" ]; then - setupPyBuildFlags+="--parallel $NIX_BUILD_CORES" + setupPyBuildFlags+=" --parallel $NIX_BUILD_CORES" fi if [ -n "$setupPyBuildFlags" ]; then - args+="build_ext $setupPyBuildFlags" + args+=" build_ext $setupPyBuildFlags" fi eval "@pythonInterpreter@ nix_run_setup $args bdist_wheel" diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 35a79e3b358..2cca0078aff 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.6.2"; + version = "0.6.3"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1dp645gg6d3pzjh82srq1d7qvyxi5h22k7yfdjiyzbyry8pxdh2h"; + sha256 = "pBCv63zVlwsWuabOfazPSVsaXpEhqdZELeDAKP1Uols="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 88e584f5e41..a417f3e2639 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,8 +1,21 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage, fetchurl, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.59.0"; + boostBuildPatches = [ + # Fixes a segfault on aarch64-darwin from an implicitly defined varargs function. + # https://github.com/boostorg/build/pull/238 + (fetchpatch { + url = "https://github.com/boostorg/build/commit/48e9017139dd94446633480661e5447c7e0d8b1b.diff"; + excludes = [ + # Doesn't apply, isn't critical. + "src/engine/filesys.h" + ]; + sha256 = "sha256-/HLOJKBcGqcK9yBYKSRCSMmTNhCH3sSpK1s3OzkIqx8"; + }) + ]; + src = fetchurl { url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"; sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 34ab5554e74..b9bdec0cd07 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -15,6 +15,7 @@ , enableNumpy ? false , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] +, boostBuildPatches ? [] , useMpi ? false , mpi , extraB2Args ? [] @@ -170,6 +171,10 @@ stdenv.mkDerivation { (stdenv.hostPlatform.isMips64n64 && (versionOlder version "1.65")); }; + passthru = { + inherit boostBuildPatches; + }; + preConfigure = optionalString useMpi '' cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index a05f3b71fb4..da20ac59ec9 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "0zbss0dssn17mjmvk17qfi5cmvm0lcyzs62cwvqr219hhl864xcq"; + sha256 = "sha256-95uPkEt0nj4NIK/q3s+CScVbLjLU67CJrjeN9HncryU="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 7f906e19224..8c7cba42eb2 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -7,6 +7,21 @@ # LCD filtering is also known as ClearType and covered by several Microsoft patents. # This option allows it to be disabled. See http://www.freetype.org/patents.html. useEncumberedCode ? true + +# for passthru.tests +, cairo +, fontforge +, ghostscript +, graphicsmagick +, gtk3 +, harfbuzz +, imagemagick +, pango +, poppler +, python3 +, qt5 +, texmacs +, ttfautohint }: @@ -52,6 +67,23 @@ stdenv.mkDerivation rec { --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; + passthru.tests = { + inherit + cairo + fontforge + ghostscript + graphicsmagick + gtk3 + harfbuzz + imagemagick + pango + poppler + texmacs + ttfautohint; + inherit (python3.pkgs) freetype-py; + inherit (qt5) qtbase; + }; + meta = with lib; { description = "A font rendering engine"; longDescription = '' diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index a8e39047256..aee2dec5a9c 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.7"; + version = "3.2.11"; pname = "gmime"; - src = fetchurl { - url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"; + src = fetchurl { # https://github.com/jstedfast/gmime/releases + url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; + sha256 = "5e023855a215b427645b400f5e55cf19cfd229f971317007e03e7bae72569bf8"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index c736c5cc761..5e0dcf6ce03 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -30,7 +30,7 @@ , gnome , gsettings-desktop-schemas , sassc -, trackerSupport ? stdenv.isLinux +, trackerSupport ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , tracker , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux @@ -39,12 +39,13 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux -, withGtkDoc ? stdenv.isLinux +, withGtkDoc ? stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) , cups , AppKit , Cocoa , QuartzCore , broadwaySupport ? true +, wayland-scanner }: let @@ -85,6 +86,9 @@ stdenv.mkDerivation rec { ./patches/3.0-darwin-x11.patch ]; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ gettext gobject-introspection @@ -94,12 +98,15 @@ stdenv.mkDerivation rec { pkg-config python3 sassc + gdk-pixbuf ] ++ setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 docbook-xsl-nons gtk-doc # For xmllint libxml2 + ] ++ lib.optionals waylandSupport [ + wayland-scanner ]; buildInputs = [ @@ -151,6 +158,7 @@ stdenv.mkDerivation rec { "-Dbroadway_backend=${lib.boolToString broadwaySupport}" "-Dx11_backend=${lib.boolToString x11Support}" "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; doCheck = false; # needs X11 diff --git a/pkgs/development/libraries/icu/71.nix b/pkgs/development/libraries/icu/71.nix new file mode 100644 index 00000000000..456dffc322a --- /dev/null +++ b/pkgs/development/libraries/icu/71.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "71.1"; + sha256 = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8="; +} diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 1447a327e0d..26f904b49b0 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -2,9 +2,13 @@ # Image file formats , libjpeg, libtiff, giflib, libpng, libwebp # imlib2 can load images from ID3 tags. -, libid3tag +, libid3tag, librsvg, libheif , freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null +# Compilation error on Darwin with librsvg. For more information see: +# https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 +, svgSupport ? !stdenv.isDarwin +, heifSupport ? !stdenv.isDarwin }: let @@ -12,17 +16,19 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.5"; + version = "1.8.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; - hash = "sha256-RY2DAKp6bUzjU1GDi7pdn9+wiES9WxU8WTjs/kP/Ngo="; + hash = "sha256-Ui4ecOZbwO3f4gdhfRXJo5VmKnwJBmHaqiwpT7fZ/ao="; }; buildInputs = [ libjpeg libtiff giflib libpng libwebp bzip2 freetype libid3tag - ] ++ optional x11Support xlibsWrapper; + ] ++ optional x11Support xlibsWrapper + ++ optional heifSupport libheif + ++ optional svgSupport librsvg; nativeBuildInputs = [ pkg-config ]; @@ -31,6 +37,8 @@ stdenv.mkDerivation rec { # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors configureFlags = optional stdenv.isDarwin "--enable-amd64=no" + ++ optional (!svgSupport) "--without-svg" + ++ optional (!heifSupport) "--without-heif" ++ optional (!x11Support) "--without-x"; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index e3d34095540..5ab33fcf46f 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -6,7 +6,7 @@ , qtbase , qttranslations , kcoreaddons -, python2 +, python3 , sqlite , postgresql , libmysqlclient @@ -36,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysqlclient ]; + buildInputs = [ qttranslations kcoreaddons python3 sqlite postgresql libmysqlclient ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 46d55b1f550..1c8470204f8 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2 + qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python3 }: mkDerivation rec { @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python2 ]; + buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python3 ]; meta = with lib; { description = "A framework for creation and generation of reports in multiple formats"; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 76e5a32316d..066ea8b60dd 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -40,18 +40,21 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)" - declare -a skip_tests=( + declare -a skip_test_paths=( # test won't work in nix sandbox - 'test_write_disk_perms' + 'libarchive/test/test_write_disk_perms.c' # can't be sure builder will have sparse-capable fs - 'test_sparse_basic' + 'libarchive/test/test_sparse_basic.c' # can't even be sure builder will have hardlink-capable fs - 'test_write_disk_hardlink' + 'libarchive/test/test_write_disk_hardlink.c' + # access-time-related tests flakey on some systems + 'cpio/test/test_option_a.c' + 'cpio/test/test_option_t.c' ) - for test_name in "''${skip_tests[@]}" ; do - sed -i "/$test_name/d" Makefile.am - rm "libarchive/test/$test_name.c" + for test_path in "''${skip_test_paths[@]}" ; do + substituteInPlace Makefile.am --replace "$test_path" "" + rm "$test_path" done ''; diff --git a/pkgs/development/libraries/libgtkflow/default.nix b/pkgs/development/libraries/libgtkflow/default.nix new file mode 100644 index 00000000000..3e08f0dee77 --- /dev/null +++ b/pkgs/development/libraries/libgtkflow/default.nix @@ -0,0 +1,39 @@ +{stdenv, lib, vala, meson, ninja, pkg-config, fetchFromGitea, gobject-introspection, glib, gtk3}: + +stdenv.mkDerivation rec { + pname = "libgtkflow"; + version = "0.8.0"; + + src = fetchFromGitea { + domain = "notabug.org"; + owner = "grindhold"; + repo = pname; + rev = version; + hash = "sha256:1m30rvj5hx3b4cj8lbzrxv4j8lp3hx4jlb8vpf4rh46vc1rdkxpz"; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + ]; + + mesonFlags = [ + "-Denable_valadoc=true" + ]; + + meta = with lib; { + description = "Flow graph widget for GTK 3"; + homepage = "https://notabug.org/grindhold/libgtkflow"; + maintainers = with maintainers; [ grindhold ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index eb89fa124c4..de3f2141c2e 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.7.9"; + version = "0.7.11"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36"; + sha256 = "3VaC7GgiAznhHFFZt+ASIEoxjdGzaDoJxILKQhqwc3U="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index b4f71587204..97f21d0cb94 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -71,11 +71,9 @@ let moveToOutput "bin/nc" "$nc" moveToOutput "bin/openssl" "$bin" moveToOutput "bin/ocspcheck" "$bin" - moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" + moveToOutput "share/man/man1/nc.1.gz" "$nc" ''; - dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://www.libressl.org"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 6ef67af4b19..c442c14b517 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.54.0"; + version = "2.54.1"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "uvjrwUfxRrQmG7PQzQ+slEv427Sx8jR9IzQfl03MMIU="; + sha256 = "1VV++9zEFaQYDhEWt/c2y3EbJT0RDZX6huyDD3ACZiU="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index d0e8bd163dd..fbc8a026af5 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, getopt, util-linux, gperf, nix-update-script }: +{ lib, stdenv, fetchurl, getopt, util-linuxMinimal, which, gperf, nix-update-script }: stdenv.mkDerivation rec { pname = "libseccomp"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - checkInputs = [ util-linux ]; - doCheck = false; # dependency cycle + checkInputs = [ util-linuxMinimal which ]; + doCheck = true; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rfv src"; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index dbe108f586f..a319de5ce6b 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.0.31"; + version = "1.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1alba3iv8i7i2jb5fd6q5s7j9bcj48sf28nfjd3qigz2n2is5jl2"; + sha256 = "sha256-bhIXVSKuUnUzs5aaLDHt21RcnqekEpLU414sFtl2Lro="; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 3b7cae36a0e..06c073c718a 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.13"; + version = "2.9.14"; outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J2EwYC0S/khOzANEfuXnWdBGVVj7yda9FE43RTBuvw4="; + sha256 = "1vnzk33wfms348lgz9pvkq9li7jm44pvm73lbr3w1khwgljlmmv0"; }; patches = [ diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index cedc24909bc..8cc4ad06e35 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.0.164"; + version = "2.0.194"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-0Ou0j9KaNkX/SFmid+wphvtu3wDTXkw+8xdck6lEE3w="; + sha256 = "sha256-5dgSBXJIeGXT+jGqT2MFqtsEFcIn+ULjybnyXz+95Gk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 6818418ad68..26a89fe47a4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -178,8 +178,8 @@ in { openssl_1_1 = common rec { - version = "1.1.1n"; - sha256 = "sha256-QNzrUaT2pSdb3g5r8g70uRv8Mu1XwFUuLo4VRjNysXo="; + version = "1.1.1o"; + sha256 = "sha256-k4SisFcN2ANYhBRkZ3EV33he25QccSEfdQdtcv5rQ48="; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index da594346c29..96d8c9c2052 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , fetchFromGitLab -, fetchpatch , removeReferencesTo , python3 , meson @@ -68,7 +67,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.49"; + version = "0.3.51"; outputs = [ "out" @@ -86,7 +85,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-8heX/9BsPguIOzHOuqEQdt6MS3eS4HxR4A+FUZKNpdo="; + sha256 = "sha256-k5OdKgkQUaelvrGS4KtO0MtSJg6cF2Nf8RrsR8Kf+C8="; }; patches = [ @@ -102,12 +101,6 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Fixes missing function declarations in pipewire headers - # Should be removed after the next release - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a2e98e28c1e6fb58b273ef582398d8bee4d2b769.patch"; - sha256 = "sha256-tqiiAW2fTEp23HT59XR2D/G08pVENJtpxUI7UVufj/A="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index 7e2be4bec04..e47bb62e736 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.3"; - sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ="; + version = "3.19.4"; + sha256 = "sha256-mxQ8XonVgctfaNAyd3vqQHMLHVnkjBa9EObk47vxH24="; } diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 4c8249abe87..6ad8e06b145 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script }: +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script + +# for passthru.tests +, bazel +, chromium +, grpc +, haskellPackages +, mercurial +, ninja +, python3 +}: stdenv.mkDerivation rec { pname = "re2"; @@ -39,6 +52,16 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { attrPath = pname; }; + tests = { + inherit + chromium + grpc + mercurial; + inherit (python3.pkgs) + fb-re2 + google-re2; + haskellPackages-re2 = haskellPackages.re2; + }; }; meta = { diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/development/libraries/sealcurses/default.nix new file mode 100644 index 00000000000..21ee2a782a2 --- /dev/null +++ b/pkgs/development/libraries/sealcurses/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitea, cmake, pkg-config, ncurses, the-foundation }: + +stdenv.mkDerivation rec { + pname = "sealcurses"; + version = "unstable-2022-04-28"; # No release yet + + src = fetchFromGitea { + domain = "git.skyjake.fi"; + owner = "skyjake"; + repo = pname; + rev = "abf27cfd2567a0765aaa115cabab0abb7f862253"; + hash = "sha256-c4zi/orHyr1hkuEisqZ9V8SaiH1IoxIbeGMrLBEkZ0A="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ ncurses the-foundation ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + meta = with lib; { + description = "SDL Emulation and Adaptation Layer for Curses (ncursesw)"; + homepage = "https://git.skyjake.fi/skyjake/sealcurses"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/signond/default.nix b/pkgs/development/libraries/signond/default.nix index 7e986ed2635..ff5aeca626e 100644 --- a/pkgs/development/libraries/signond/default.nix +++ b/pkgs/development/libraries/signond/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "signond"; - version = "8.60"; + version = "8.61"; src = fetchFromGitLab { owner = "accounts-sso"; repo = pname; rev = "VERSION_${version}"; - sha256 = "pFpeJ13ut5EoP37W33WrYL2LzkX/k7ZKJcRpPO5l8i4="; + sha256 = "sha256-d7JZmGpjIvSN9l1nvKbBZjF0OR5L5frPTGHF/pNEqHE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 0d80a83e8ed..726ccff02bb 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.38.2"; + version = "3.38.3"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-55dKoUMLrWkKXp95pu5chJKtqCadxnWHWtD7dH18raQ="; + sha256 = "sha256-YfLdk6LjjDNGi3EllnwyGL+fTdg2Xe9gJeMU+QXclC4="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 73ce1c35f50..d112515c8e9 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.38.2"; + version = "3.38.3"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-x8DwcKM4yS6wiAWQXAXyVPpG0cTdo1SKAkdPb7VnMpo="; + sha256 = "sha256-oQTUk+CEAGvXT/H/esLrKzh8fAo7Y7pv6i+vtBGDE68="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index ef30c5916ea..848fd57336e 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, python2 , libidn , lua , miniupnpc @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python2 libidn lua miniupnpc diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix new file mode 100644 index 00000000000..012d13964c4 --- /dev/null +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, pkg-config +, curl +, libunistring +, openssl +, pcre +, zlib +}: + +stdenv.mkDerivation rec { + pname = "the-foundation"; + version = "1.4.0"; + + src = fetchFromGitea { + domain = "git.skyjake.fi"; + owner = "skyjake"; + repo = "the_Foundation"; + rev = "v${version}"; + hash = "sha256-IHwWJryG4HcrW9Bf8KJrisCrbF86RBQj6Xl1HTmcr6k="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ curl libunistring openssl pcre zlib ]; + + meta = with lib; { + description = "Opinionated C11 library for low-level functionality"; + homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index b95bcb2b869..5e918e8122f 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -2,4 +2,13 @@ import ./generic.nix { majorVersion = "9.0"; minorVersion = "3"; sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo="; + + patchesToFetch = [ + # Add missing header includes. + # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 + { + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f4fbbfe7470c6207db0fc3f3952db633cb.patch"; + sha256 = "ggmDisS3qoMquOqrmIYlCIT7TLxP/DUtW29ktjaEnlM="; + } + ]; } diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index 1ce3c2d9fa8..c9fafdd2766 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; }; - patches = [ ./enable-riscv.patch ]; + patches = [ + ./enable-riscv.patch + ./enable-powerpc.patch + ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); diff --git a/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch b/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch new file mode 100644 index 00000000000..636cae4df85 --- /dev/null +++ b/pkgs/development/libraries/webrtc-audio-processing/enable-powerpc.patch @@ -0,0 +1,37 @@ +This patch was extracted from the Gentoo powerpc64le-qtwebengine +patchset, referenced here: + + https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild + +and downloaded from here: + + https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz + +From 4bbb4482e14ad27cf0bd5032b1b5d4abba29dc99 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 27 Nov 2020 13:05:45 -0800 +Subject: [PATCH] 5.15.2 ppc64le patchet + +diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h +index ce1f3e8..fd39a16 100644 +--- a/webrtc/typedefs.h ++++ b/webrtc/typedefs.h +@@ -38,6 +38,18 @@ + #define WEBRTC_ARCH_X86 + #define WEBRTC_ARCH_32_BITS + #define WEBRTC_ARCH_LITTLE_ENDIAN ++#elif defined(__PPC__) ++#define WEBRTC_ARCH_PPC_FAMILY ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++#define WEBRTC_ARCH_LITTLE_ENDIAN ++#else ++#define WEBRTC_ARCH_BIG_ENDIAN ++#endif ++#if defined(__LP64__) ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif + #elif defined(__ARMEL__) + // TODO(ajm): We'd prefer to control platform defines here, but this is + // currently provided by the Android makefiles. Commented to avoid duplicate diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 9a1861f6044..9ee55a47797 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -97,5 +97,7 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; + # no match for 'operator!=' + broken = true; }; } diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 38b106d474b..475ebc7517e 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20"; + sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2089cdea46f..5c02026cbe3 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -659,6 +659,57 @@ buildLuarocksPackage { }; }) {}; +lmathx = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { + pname = "lmathx"; + version = "20150624-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lmathx-20150624-1.rockspec"; + sha256 = "181wzsj1mxjyia43y8zwaydxahnl7a70qzcgc8jhhgic7jyi9pgv"; + }).outPath; + src = fetchurl { + url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.3/lmathx.tar.gz"; + sha256 = "1r0ax3lq4xx6469aqc6qlfl3jynlghzhl5j65mpdj0kyzv4nknzf"; + }; + + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lmathx"; + description = "C99 extensions for the math library"; + maintainers = with lib.maintainers; [ alexshpilkin ]; + license.fullName = "Public domain"; + }; +}) {}; + +lmpfrlib = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { + pname = "lmpfrlib"; + version = "20170112-2"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lmpfrlib-20170112-2.rockspec"; + sha256 = "1x7qiwmk5b9fi87fn7yvivdsis8h9fk9r3ipqiry5ahx72vzdm7d"; + }).outPath; + src = fetchurl { + url = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.c"; + sha256 = "00d32cwvk298k3vyrjkdmfjgc69x1fwyks3hs7dqr2514zdhgssm"; + }; + + disabled = with lua; (luaOlder "5.3") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.html"; + description = "Lua API for the GNU MPFR library"; + maintainers = with lib.maintainers; [ alexshpilkin ]; + license.fullName = "LGPL"; + }; +}) {}; + lpeg = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchurl, lua }: diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 10744653ca1..3ca4b219950 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -129,6 +129,48 @@ with prev; ''; }); + lmathx = prev.lib.overrideLuarocks prev.lmathx (drv: + if luaAtLeast "5.1" && luaOlder "5.2" then { + version = "20120430.51-1"; + knownRockspec = (pkgs.fetchurl { + url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; + sha256 = "148vbv2g3z5si2db7rqg5bdily7m4sjyh9w6r3jnx3csvfaxyhp0"; + }).outPath; + src = pkgs.fetchurl { + url = "https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmathx.tar.gz"; + sha256 = "0sa553d0zlxhvpsmr4r7d841f16yq4wr3fg7i07ibxkz6yzxax51"; + }; + } else + if luaAtLeast "5.2" && luaOlder "5.3" then { + version = "20120430.52-1"; + knownRockspec = (pkgs.fetchurl { + url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; + sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; + }).outPath; + src = pkgs.fetchurl { + url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/lmathx.tar.gz"; + sha256 = "19dwa4z266l2njgi6fbq9rak4rmx2fsx1s0p9sl166ar3mnrdwz5"; + }; + } else + { + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + # works fine with 5.4 as well + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace 'lua ~> 5.3' 'lua >= 5.3, < 5.5' + ''; + }); + + lmpfrlib = prev.lib.overrideLuarocks prev.lmpfrlib (drv: { + externalDeps = [ + { name = "GMP"; dep = pkgs.gmp; } + { name = "MPFR"; dep = pkgs.mpfr; } + ]; + unpackPhase = '' + cp $src $(stripHash $src) + ''; + }); + lrexlib-gnu = prev.lib.overrideLuarocks prev.lrexlib-gnu (drv: { buildInputs = [ pkgs.gnulib diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 8f5ca85f829..e159a093af2 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -111,10 +111,6 @@ let meta.broken = since "10"; }; - jshint = super.jshint.override { - buildInputs = [ pkgs.phantomjs2 ]; - }; - dat = super.dat.override { buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; meta.broken = since "12"; diff --git a/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch b/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch deleted file mode 100644 index 0d319eb2a0d..00000000000 --- a/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch +++ /dev/null @@ -1,498 +0,0 @@ -From 17b5be250cb5ecf95cf4f77c8c930450d876efa6 Mon Sep 17 00:00:00 2001 -From: dzen -Date: Thu, 12 Mar 2020 08:32:29 +0100 -Subject: [PATCH 1/3] Moves to pamqp 3.0 - ---- - aioamqp/channel.py | 114 +++++++++++++++++++------------------- - aioamqp/frame.py | 1 - - aioamqp/protocol.py | 22 ++++---- - aioamqp/tests/testcase.py | 2 +- - 4 files changed, 69 insertions(+), 70 deletions(-) - -diff --git a/aioamqp/channel.py b/aioamqp/channel.py -index 7f0f402..ea164c4 100644 ---- a/aioamqp/channel.py -+++ b/aioamqp/channel.py -@@ -9,7 +9,7 @@ - from itertools import count - import warnings - --import pamqp.specification -+import pamqp.commands - - from . import frame as amqp_frame - from . import exceptions -@@ -78,35 +78,35 @@ def connection_closed(self, server_code=None, server_reason=None, exception=None - - async def dispatch_frame(self, frame): - methods = { -- pamqp.specification.Channel.OpenOk.name: self.open_ok, -- pamqp.specification.Channel.FlowOk.name: self.flow_ok, -- pamqp.specification.Channel.CloseOk.name: self.close_ok, -- pamqp.specification.Channel.Close.name: self.server_channel_close, -- -- pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok, -- pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok, -- pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok, -- pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok, -- -- pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok, -- pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok, -- pamqp.specification.Queue.BindOk.name: self.queue_bind_ok, -- pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok, -- pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok, -- -- pamqp.specification.Basic.QosOk.name: self.basic_qos_ok, -- pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok, -- pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok, -- pamqp.specification.Basic.GetOk.name: self.basic_get_ok, -- pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty, -- pamqp.specification.Basic.Deliver.name: self.basic_deliver, -- pamqp.specification.Basic.Cancel.name: self.server_basic_cancel, -- pamqp.specification.Basic.Ack.name: self.basic_server_ack, -- pamqp.specification.Basic.Nack.name: self.basic_server_nack, -- pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok, -- pamqp.specification.Basic.Return.name: self.basic_return, -- -- pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok, -+ pamqp.commands.Channel.OpenOk.name: self.open_ok, -+ pamqp.commands.Channel.FlowOk.name: self.flow_ok, -+ pamqp.commands.Channel.CloseOk.name: self.close_ok, -+ pamqp.commands.Channel.Close.name: self.server_channel_close, -+ -+ pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok, -+ pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok, -+ pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok, -+ pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok, -+ -+ pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok, -+ pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok, -+ pamqp.commands.Queue.BindOk.name: self.queue_bind_ok, -+ pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok, -+ pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok, -+ -+ pamqp.commands.Basic.QosOk.name: self.basic_qos_ok, -+ pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok, -+ pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok, -+ pamqp.commands.Basic.GetOk.name: self.basic_get_ok, -+ pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty, -+ pamqp.commands.Basic.Deliver.name: self.basic_deliver, -+ pamqp.commands.Basic.Cancel.name: self.server_basic_cancel, -+ pamqp.commands.Basic.Ack.name: self.basic_server_ack, -+ pamqp.commands.Basic.Nack.name: self.basic_server_nack, -+ pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok, -+ pamqp.commands.Basic.Return.name: self.basic_return, -+ -+ pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok, - } - - if frame.name not in methods: -@@ -144,7 +144,7 @@ async def _write_frame_awaiting_response(self, waiter_id, channel_id, request, - - async def open(self): - """Open the channel on the server.""" -- request = pamqp.specification.Channel.Open() -+ request = pamqp.commands.Channel.Open() - return (await self._write_frame_awaiting_response( - 'open', self.channel_id, request, no_wait=False, check_open=False)) - -@@ -159,7 +159,7 @@ async def close(self, reply_code=0, reply_text="Normal Shutdown"): - if not self.is_open: - raise exceptions.ChannelClosed("channel already closed or closing") - self.close_event.set() -- request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) -+ request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) - return (await self._write_frame_awaiting_response( - 'close', self.channel_id, request, no_wait=False, check_open=False)) - -@@ -169,7 +169,7 @@ async def close_ok(self, frame): - self.protocol.release_channel_id(self.channel_id) - - async def _send_channel_close_ok(self): -- request = pamqp.specification.Channel.CloseOk() -+ request = pamqp.commands.Channel.CloseOk() - await self._write_frame(self.channel_id, request) - - async def server_channel_close(self, frame): -@@ -183,7 +183,7 @@ async def server_channel_close(self, frame): - self.connection_closed(results['reply_code'], results['reply_text']) - - async def flow(self, active): -- request = pamqp.specification.Channel.Flow(active) -+ request = pamqp.commands.Channel.Flow(active) - return (await self._write_frame_awaiting_response( - 'flow', self.channel_id, request, no_wait=False, - check_open=False)) -@@ -201,7 +201,7 @@ async def flow_ok(self, frame): - - async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False, - auto_delete=False, no_wait=False, arguments=None): -- request = pamqp.specification.Exchange.Declare( -+ request = pamqp.commands.Exchange.Declare( - exchange=exchange_name, - exchange_type=type_name, - passive=passive, -@@ -222,7 +222,7 @@ async def exchange_declare_ok(self, frame): - return future - - async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False): -- request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) -+ request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) - return await self._write_frame_awaiting_response( - 'exchange_delete', self.channel_id, request, no_wait) - -@@ -235,7 +235,7 @@ async def exchange_bind(self, exchange_destination, exchange_source, routing_key - no_wait=False, arguments=None): - if arguments is None: - arguments = {} -- request = pamqp.specification.Exchange.Bind( -+ request = pamqp.commands.Exchange.Bind( - destination=exchange_destination, - source=exchange_source, - routing_key=routing_key, -@@ -255,7 +255,7 @@ async def exchange_unbind(self, exchange_destination, exchange_source, routing_k - if arguments is None: - arguments = {} - -- request = pamqp.specification.Exchange.Unbind( -+ request = pamqp.commands.Exchange.Unbind( - destination=exchange_destination, - source=exchange_source, - routing_key=routing_key, -@@ -297,7 +297,7 @@ async def queue_declare(self, queue_name=None, passive=False, durable=False, - - if not queue_name: - queue_name = 'aioamqp.gen-' + str(uuid.uuid4()) -- request = pamqp.specification.Queue.Declare( -+ request = pamqp.commands.Queue.Declare( - queue=queue_name, - passive=passive, - durable=durable, -@@ -327,7 +327,7 @@ async def queue_delete(self, queue_name, if_unused=False, if_empty=False, no_wai - if_empty: bool, the queue is deleted if it has no messages. Raise if not. - no_wait: bool, if set, the server will not respond to the method - """ -- request = pamqp.specification.Queue.Delete( -+ request = pamqp.commands.Queue.Delete( - queue=queue_name, - if_unused=if_unused, - if_empty=if_empty, -@@ -346,7 +346,7 @@ async def queue_bind(self, queue_name, exchange_name, routing_key, no_wait=False - if arguments is None: - arguments = {} - -- request = pamqp.specification.Queue.Bind( -+ request = pamqp.commands.Queue.Bind( - queue=queue_name, - exchange=exchange_name, - routing_key=routing_key, -@@ -367,7 +367,7 @@ async def queue_unbind(self, queue_name, exchange_name, routing_key, arguments=N - if arguments is None: - arguments = {} - -- request = pamqp.specification.Queue.Unbind( -+ request = pamqp.commands.Queue.Unbind( - queue=queue_name, - exchange=exchange_name, - routing_key=routing_key, -@@ -383,7 +383,7 @@ async def queue_unbind_ok(self, frame): - logger.debug("Queue unbound") - - async def queue_purge(self, queue_name, no_wait=False): -- request = pamqp.specification.Queue.Purge( -+ request = pamqp.commands.Queue.Purge( - queue=queue_name, nowait=no_wait - ) - return (await self._write_frame_awaiting_response( -@@ -406,7 +406,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, - if properties is None: - properties = {} - -- method_request = pamqp.specification.Basic.Publish( -+ method_request = pamqp.commands.Basic.Publish( - exchange=exchange_name, - routing_key=routing_key, - mandatory=mandatory, -@@ -417,7 +417,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, - - header_request = pamqp.header.ContentHeader( - body_size=len(payload), -- properties=pamqp.specification.Basic.Properties(**properties) -+ properties=pamqp.commands.Basic.Properties(**properties) - ) - await self._write_frame(self.channel_id, header_request, drain=False) - -@@ -446,7 +446,7 @@ async def basic_qos(self, prefetch_size=0, prefetch_count=0, connection_global=F - settings should apply per-consumer channel; and global=true to mean - that the QoS settings should apply per-channel. - """ -- request = pamqp.specification.Basic.Qos( -+ request = pamqp.commands.Basic.Qos( - prefetch_size, prefetch_count, connection_global - ) - return (await self._write_frame_awaiting_response( -@@ -490,7 +490,7 @@ async def basic_consume(self, callback, queue_name='', consumer_tag='', no_local - if arguments is None: - arguments = {} - -- request = pamqp.specification.Basic.Consume( -+ request = pamqp.commands.Basic.Consume( - queue=queue_name, - consumer_tag=consumer_tag, - no_local=no_local, -@@ -561,7 +561,7 @@ async def server_basic_cancel(self, frame): - callback, error) - - async def basic_cancel(self, consumer_tag, no_wait=False): -- request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait) -+ request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait) - return (await self._write_frame_awaiting_response( - 'basic_cancel', self.channel_id, request, no_wait=no_wait) - ) -@@ -575,7 +575,7 @@ async def basic_cancel_ok(self, frame): - logger.debug("Cancel ok") - - async def basic_get(self, queue_name='', no_ack=False): -- request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack) -+ request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack) - return (await self._write_frame_awaiting_response( - 'basic_get', self.channel_id, request, no_wait=False) - ) -@@ -606,11 +606,11 @@ async def basic_get_empty(self, frame): - future.set_exception(exceptions.EmptyQueue) - - async def basic_client_ack(self, delivery_tag, multiple=False): -- request = pamqp.specification.Basic.Ack(delivery_tag, multiple) -+ request = pamqp.commands.Basic.Ack(delivery_tag, multiple) - await self._write_frame(self.channel_id, request) - - async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True): -- request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue) -+ request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue) - await self._write_frame(self.channel_id, request) - - async def basic_server_ack(self, frame): -@@ -620,15 +620,15 @@ async def basic_server_ack(self, frame): - fut.set_result(True) - - async def basic_reject(self, delivery_tag, requeue=False): -- request = pamqp.specification.Basic.Reject(delivery_tag, requeue) -+ request = pamqp.commands.Basic.Reject(delivery_tag, requeue) - await self._write_frame(self.channel_id, request) - - async def basic_recover_async(self, requeue=True): -- request = pamqp.specification.Basic.RecoverAsync(requeue) -+ request = pamqp.commands.Basic.RecoverAsync(requeue) - await self._write_frame(self.channel_id, request) - - async def basic_recover(self, requeue=True): -- request = pamqp.specification.Basic.Recover(requeue) -+ request = pamqp.commands.Basic.Recover(requeue) - return (await self._write_frame_awaiting_response( - 'basic_recover', self.channel_id, request, no_wait=False) - ) -@@ -681,7 +681,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma - delivery_tag = next(self.delivery_tag_iter) # pylint: disable=stop-iteration-return - fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag)) - -- method_request = pamqp.specification.Basic.Publish( -+ method_request = pamqp.commands.Basic.Publish( - exchange=exchange_name, - routing_key=routing_key, - mandatory=mandatory, -@@ -689,7 +689,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma - ) - await self._write_frame(self.channel_id, method_request, drain=False) - -- properties = pamqp.specification.Basic.Properties(**properties) -+ properties = pamqp.commands.Basic.Properties(**properties) - header_request = pamqp.header.ContentHeader( - body_size=len(payload), properties=properties - ) -@@ -710,7 +710,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma - async def confirm_select(self, *, no_wait=False): - if self.publisher_confirms: - raise ValueError('publisher confirms already enabled') -- request = pamqp.specification.Confirm.Select(nowait=no_wait) -+ request = pamqp.commands.Confirm.Select(nowait=no_wait) - - return (await self._write_frame_awaiting_response( - 'confirm_select', self.channel_id, request, no_wait) -diff --git a/aioamqp/frame.py b/aioamqp/frame.py -index d70cfd7..af27ab5 100644 ---- a/aioamqp/frame.py -+++ b/aioamqp/frame.py -@@ -42,7 +42,6 @@ - import socket - - import pamqp.encode --import pamqp.specification - import pamqp.frame - - from . import exceptions -diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py -index e111dea..f0b928d 100644 ---- a/aioamqp/protocol.py -+++ b/aioamqp/protocol.py -@@ -5,9 +5,9 @@ - import asyncio - import logging - -+import pamqp.commands - import pamqp.frame - import pamqp.heartbeat --import pamqp.specification - - from . import channel as amqp_channel - from . import constants as amqp_constants -@@ -159,7 +159,7 @@ async def close(self, no_wait=False, timeout=None): - """Close connection (and all channels)""" - await self.ensure_open() - self.state = CLOSING -- request = pamqp.specification.Connection.Close( -+ request = pamqp.commands.Connection.Close( - reply_code=0, - reply_text='', - class_id=0, -@@ -254,11 +254,11 @@ async def dispatch_frame(self, frame_channel=None, frame=None): - """Dispatch the received frame to the corresponding handler""" - - method_dispatch = { -- pamqp.specification.Connection.Close.name: self.server_close, -- pamqp.specification.Connection.CloseOk.name: self.close_ok, -- pamqp.specification.Connection.Tune.name: self.tune, -- pamqp.specification.Connection.Start.name: self.start, -- pamqp.specification.Connection.OpenOk.name: self.open_ok, -+ pamqp.commands.Connection.Close.name: self.server_close, -+ pamqp.commands.Connection.CloseOk.name: self.close_ok, -+ pamqp.commands.Connection.Tune.name: self.tune, -+ pamqp.commands.Connection.Start.name: self.start, -+ pamqp.commands.Connection.OpenOk.name: self.open_ok, - } - if frame_channel is None and frame is None: - frame_channel, frame = await self.get_frame() -@@ -395,7 +395,7 @@ async def start_ok(self, client_properties, mechanism, auth, locale): - def credentials(): - return '\0{LOGIN}\0{PASSWORD}'.format(**auth) - -- request = pamqp.specification.Connection.StartOk( -+ request = pamqp.commands.Connection.StartOk( - client_properties=client_properties, - mechanism=mechanism, - locale=locale, -@@ -417,7 +417,7 @@ async def server_close(self, frame): - self._stream_writer.close() - - async def _close_ok(self): -- request = pamqp.specification.Connection.CloseOk() -+ request = pamqp.commands.Connection.CloseOk() - await self._write_frame(0, request) - - async def tune(self, frame): -@@ -426,7 +426,7 @@ async def tune(self, frame): - self.server_heartbeat = frame.heartbeat - - async def tune_ok(self, channel_max, frame_max, heartbeat): -- request = pamqp.specification.Connection.TuneOk( -+ request = pamqp.commands.Connection.TuneOk( - channel_max, frame_max, heartbeat - ) - await self._write_frame(0, request) -@@ -436,7 +436,7 @@ async def secure_ok(self, login_response): - - async def open(self, virtual_host, capabilities='', insist=False): - """Open connection to virtual host.""" -- request = pamqp.specification.Connection.Open( -+ request = pamqp.commands.Connection.Open( - virtual_host, capabilities, insist - ) - await self._write_frame(0, request) -diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py -index 120104b..d6d702b 100644 ---- a/aioamqp/tests/testcase.py -+++ b/aioamqp/tests/testcase.py -@@ -147,7 +147,7 @@ def server_version(self, amqp=None): - if amqp is None: - amqp = self.amqp - -- server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.')) -+ server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.')) - return server_version - - async def check_exchange_exists(self, exchange_name): - -From c900f6d5e8ef273000d221d0e46ab81ed4aed2a2 Mon Sep 17 00:00:00 2001 -From: dzen -Date: Wed, 25 Mar 2020 11:02:04 +0100 -Subject: [PATCH 2/3] fix pamqp version for tests on travis - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index a740243..2277b28 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,7 +25,7 @@ - 'aioamqp', - ], - install_requires=[ -- 'pamqp>=2.2.0,<3', -+ 'pamqp>=3.0.0', # TODO(bcalvez): for tests purpose, until 3.0 is released - ], - classifiers=[ - "Development Status :: 4 - Beta", - -From 836340e8d881a93b0111b9aed6f2bb2926f38de6 Mon Sep 17 00:00:00 2001 -From: dzen -Date: Wed, 25 Mar 2020 11:37:45 +0100 -Subject: [PATCH 3/3] pamqp 3.0 is no more compatible with 3.5 - ---- - .travis.yml | 1 - - setup.cfg | 2 +- - setup.py | 2 +- - 3 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 1069e7c..46d6fea 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -1,7 +1,6 @@ - language: python - dist: bionic - python: --- 3.5 - - 3.6 - - 3.7-dev - - 3.8 -diff --git a/setup.cfg b/setup.cfg -index 0ab7d0b..d0ba16e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,2 +1,2 @@ - [bdist_wheel] --python-tag = py35.py36.py37.py38 -+python-tag = py36.py37.py38 -diff --git a/setup.py b/setup.py -index 2277b28..c413078 100644 ---- a/setup.py -+++ b/setup.py -@@ -27,6 +27,7 @@ - install_requires=[ - 'pamqp==3.0.0a6', # TODO(bcalvez): for tests purpose, until 3.0 is released - ], -+ python_requires=">=3.6", - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", -@@ -34,7 +35,6 @@ - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 3", -- "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index a2882ce1288..5d8c934e427 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -2,43 +2,38 @@ , buildPythonPackage , fetchFromGitHub , pamqp -, pytest -, asynctest -, pyrabbit2 -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "aioamqp"; - version = "0.14.0"; - disabled = isPy27; + version = "0.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Polyconseil"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1gpfsrc2vi6w33c9zsycd2qn589pr7a222rb41r85m915283zy48"; + hash = "sha256-fssPknJn1tLtzb+2SFyZjfdhUdD8jqkwlInoi5uaplk="; }; - patches = [ ./compat-pamqp-3.patch ]; - propagatedBuildInputs = [ pamqp ]; - checkInputs = [ - pytest - asynctest - pyrabbit2 - ]; - - # tests assume rabbitmq server running + # Tests assume rabbitmq server running doCheck = false; + pythonImportsCheck = [ + "aioamqp" + ]; + meta = with lib; { - homepage = "https://github.com/polyconseil/aioamqp"; description = "AMQP implementation using asyncio"; + homepage = "https://github.com/polyconseil/aioamqp"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index dd2f26e92d1..1a087e323c0 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "5.0.1"; + version = "5.0.2"; pname = "approvaltests"; format = "setuptools"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lmH/nw/7woLCDepR/rDQUqwrhuLFY+TO8sdgK1+apgc="; + sha256 = "sha256-yEzfDbYHGm3Za4+yIk5lIWM4I+5TnqfluZj8OLN9oK0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 1b40d506abc..79260173c54 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; + # cf. https://github.com/chainer/chainer/issues/8621 + preCheck = '' + export CHAINER_WARN_VERSION_MISMATCH=0 + ''; + disabledTests = [ "gpu" "cupy" @@ -39,8 +44,6 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible framework of neural networks for deep learning"; homepage = "https://chainer.org/"; - # Un-break me when updating chainer next time! - broken = cudaSupport && (lib.versionAtLeast cupy.version "8.0.0"); license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 1a0f4e2d9fe..7a66e479664 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { disabledTests = [ "test_aside_basic" # times out + "test_write_timeout" # flaky, does not always time out "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest "test_ssl_outgoing" # touches network - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals stdenv.isDarwin [ "test_unix_echo" # socket bind error on hydra when built with other packages "test_unix_ssl_server" # socket bind error on hydra when built with other packages ]; diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index 35470cb8b60..da1f9fa5106 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -1,50 +1,49 @@ { lib -, pythonOlder , buildPythonPackage , fetchFromGitHub -, pkgs +, nose , numpy +, pythonOlder , scipy - # check inputs -, nose }: buildPythonPackage rec { pname = "ecos"; - version = "2.0.8"; + version = "2.0.10"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "embotech"; repo = "ecos-python"; - rev = version; - sha256 = "sha256-2OJqbcOZceeD2fO5cu9fohuUVaA2LwQOQSWR4jRv3mk="; + rev = "v${version}"; + sha256 = "sha256-TPxrTyVZ1KXgPoDbZZqXT5+NEIEndg9qepujqFQwK+Q="; fetchSubmodules = true; }; - prePatch = '' - echo '__version__ = "${version}"' >> ./src/ecos/version.py - ''; - propagatedBuildInputs = [ numpy scipy ]; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; + checkPhase = '' - # Run tests cd ./src nosetests test_interface.py test_interface_bb.py ''; - pythonImportsCheck = [ "ecos" ]; + + pythonImportsCheck = [ + "ecos" + ]; meta = with lib; { description = "Python package for ECOS: Embedded Cone Solver"; - downloadPage = "https://github.com/embotech/ecos-python/releases"; - homepage = pkgs.ecos.meta.homepage; - license = licenses.asl20; + homepage = "https://github.com/embotech/ecos-python"; + license = licenses.gpl3Only; maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 32e446d71a3..e90a6efdc63 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { chmod +w -R source/tests ''; - nativeBuildInputs = [ + checkInputs = [ cmake ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "EditorConfig File Locator and Interpreter for Python"; - homepage = "https://editorconfig.org"; + homepage = "https://github.com/editorconfig/editorconfig-core-py"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 57c51964fc8..40f9aa451b6 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.3.6"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-aIqwb2YHw/kYHBqydelTRs2+75WimgJ+4X0BYcwogh8="; + hash = "sha256-o0RQgAP38W7paVJonrfj54y2OhMmTihT9xiipEyNVaM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 2f3f5fe16ab..137f034d51a 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.2"; + version = "4.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; - rev = "v${version}"; - hash = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4="; + rev = "refs/tags/v${version}"; + hash = "sha256-79113cUVl07oeXjlDaqfdfwNZvD7EWJK8JKHsPnBRG8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 58bbae87283..8051fbb55bf 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -80,6 +80,11 @@ buildPythonPackage rec { "tests" ]; + disabledTestPaths = [ + # needs a running server + "tests/asgi/test_asgi_servers.py" + ]; + meta = with lib; { description = "An unladen web framework for building APIs and app backends"; homepage = "https://falconframework.org/"; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 1af875d4bbc..25f02b87c9e 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -1,23 +1,28 @@ { lib +, aniso8601 +, blinker , buildPythonPackage , fetchPypi -, aniso8601 , flask -, pytz -, six -, blinker , mock , nose , pytestCheckHook +, pythonOlder +, pytz +, six }: buildPythonPackage rec { - pname = "Flask-RESTful"; + pname = "flask-restful"; version = "0.3.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c"; + pname = "Flask-RESTful"; + inherit version; + hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4="; }; patches = [ @@ -32,19 +37,24 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook + blinker mock nose - blinker + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flask_restful" ]; meta = with lib; { + description = "Framework for creating REST APIs"; homepage = "https://flask-restful.readthedocs.io"; - description = "Simple framework for creating REST APIs"; longDescription = '' Flask-RESTful provides the building blocks for creating a great REST API. ''; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/http-sfv/default.nix b/pkgs/development/python-modules/http-sfv/default.nix index 264065b6efa..0e5407420ca 100644 --- a/pkgs/development/python-modules/http-sfv/default.nix +++ b/pkgs/development/python-modules/http-sfv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "http-sfv"; - version = "0.9.5"; + version = "0.9.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mnot"; repo = "http_sfv"; rev = "http_sfv-${version}"; - hash = "sha256-hzg5vRX0vNKS/hYLF6n8mLK5qiwP7do4M8YMlBAA66I="; + hash = "sha256-S+cbcDx+cXwN2TpfiUpr6xK1GFRxSYgfHdUavfzeyAE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 7f028c478fc..5b8d84ec308 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -39,11 +39,14 @@ buildPythonPackage rec { anyio certifi h11 - h2 sniffio - socksio ]; + passthru.extras-require = { + http2 = [ h2 ]; + socks = [ socksio ]; + }; + checkInputs = [ pproxy pytest-asyncio @@ -53,7 +56,8 @@ buildPythonPackage rec { trio trustme uvicorn - ]; + ] ++ passthru.extras-require.http2 + ++ passthru.extras-require.socks; pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index e45e6a85487..3bfbf2327f2 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -33,15 +33,16 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - async-timeout - curio - httpcore httpx + httpcore python-socks - sniffio - trio ]; + passthru.extras-require = { + asyncio = [ async-timeout ]; + trio = [ trio ]; + }; + checkInputs = [ flask hypercorn diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index dbf8d1745c0..d75dbaa1c9b 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -3,12 +3,19 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, brotlicffi , certifi , charset-normalizer , httpcore , rfc3986 , sniffio +, h2 +, socksio +, isPyPy +, brotli +, brotlicffi +, click +, rich +, pygments , python , pytestCheckHook , pytest-asyncio @@ -33,7 +40,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - brotlicffi certifi charset-normalizer httpcore @@ -43,6 +49,13 @@ buildPythonPackage rec { async_generator ]; + passthru.extras-require = { + http2 = [ h2 ]; + socks = [ socksio ]; + brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; + cli = [ click rich pygments ]; + }; + checkInputs = [ pytestCheckHook pytest-asyncio @@ -50,7 +63,9 @@ buildPythonPackage rec { trustme typing-extensions uvicorn - ]; + ] ++ passthru.extras-require.http2 + ++ passthru.extras-require.brotli + ++ passthru.extras-require.socks; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 0d0c1159332..1f6975ff255 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -3,17 +3,18 @@ , fetchPypi , twisted , passlib -, pyopenssl , pyparsing , service-identity +, six , zope_interface -, isPy3k +, pythonOlder , python }: buildPythonPackage rec { pname = "ldaptor"; version = "21.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -21,18 +22,27 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - twisted passlib pyopenssl pyparsing service-identity zope_interface - ]; + passlib + pyparsing + six + twisted + zope_interface + ] ++ twisted.extras-require.tls; - disabled = !isPy3k; + checkInputs = [ + twisted + ]; checkPhase = '' - ${python.interpreter} -m twisted.trial ldaptor + trial -j$NIX_BUILD_CORES ldaptor ''; - meta = { + meta = with lib; { description = "A Pure-Python Twisted library for LDAP"; homepage = "https://github.com/twisted/ldaptor"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + # tests hang or fail with "no space left on device" + broken = true; }; } diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 7cb622df047..afc777e1d85 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -1,21 +1,84 @@ -{ lib, fetchPypi, buildPythonPackage, six }: +{ lib +, buildPythonPackage +, deprecated +, fetchFromGitHub +, hiro +, packaging +, pymemcache +, pymongo +, pytest-asyncio +, pytest-lazy-fixture +, pytestCheckHook +, pythonOlder +, redis +, setuptools +, typing-extensions +}: buildPythonPackage rec { pname = "limits"; - version = "2.4.0"; + version = "2.6.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-jiK2PfJjECB6d7db1HRZnwpGE6fZFjZQ7TpCjpzHrjU="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "alisaifee"; + repo = pname; + rev = version; + # Upstream uses versioneer, which relies on git attributes substitution. + # This leads to non-reproducible archives on github. Remove the substituted + # file here, and recreate it later based on our version info. + extraPostFetch = '' + rm "$out/limits/_version.py" + ''; + hash = "sha256-ja+YbRHCcZ5tFnoofdR44jbkkdDroVUdKeDOt6yE0LI="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + deprecated + packaging + setuptools + typing-extensions + ]; + + checkInputs = [ + hiro + pymemcache + pymongo + pytest-asyncio + pytest-lazy-fixture + pytestCheckHook + redis + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=limits" "" \ + --replace "-K" "" + # redis-py-cluster doesn't support redis > 4 + substituteInPlace tests/conftest.py \ + --replace "import rediscluster" "" + + # Recreate _version.py, deleted at fetch time due to non-reproducibility. + echo 'def get_versions(): return {"version": "${version}"}' > limits/_version.py + ''; - doCheck = false; # ifilter + pythonImportsCheck = [ + "limits" + ]; + + pytestFlagsArray = [ + # All other tests require a running Docker instance + "tests/test_limits.py" + "tests/test_ratelimit_parser.py" + "tests/test_limit_granularities.py" + ]; meta = with lib; { description = "Rate limiting utilities"; - license = licenses.mit; homepage = "https://limits.readthedocs.org/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index cc118d9f0ab..933fd3865d6 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { - version = "3.5.1"; + version = "3.5.2"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c"; + sha256 = "18h78s5ld1i6mz00w258hy29909nfr3ddq6ry9kq18agw468bks8"; }; XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 73f1c75a519..b7f0f049db7 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.18.2"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "v${version}"; - hash = "sha256-U9fdMcxPdtLiUStgTez99SPRh93WLZNVn8uIj4lNWh4="; + hash = "sha256-Ym3AbIEf8eMSrtP8W1dPXqL0mTVN2bd8hlxdFhW/dkQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 211bdec41fe..38417ddb9c6 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,16 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python }: +{ lib +, buildPythonPackage +, django +, dnspython +, fetchFromGitHub +, protobuf +, pythonOlder +}: -let - py = python; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.24"; + version = "8.0.29"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7"; + hash = "sha256-X0qiXNYkNoR00ESUdByPj4dPnEnjLyopm25lm1JvkAk="; }; patches = [ @@ -22,16 +30,19 @@ in buildPythonPackage rec { ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch ]; - propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; + propagatedBuildInputs = [ + dnspython + protobuf + ]; - # Tests are failing (TODO: unknown reason) - # TypeError: __init__() missing 1 required positional argument: 'string' - # But the library should be working as expected. - doCheck = false; + pythonImportsCheck = [ + "mysql" + ]; - pythonImportsCheck = [ "mysql" ]; + # Tests require a running MySQL instance + doCheck = false; - meta = { + meta = with lib; { description = "A MySQL driver"; longDescription = '' A MySQL driver that does not depend on MySQL C client libraries and @@ -39,7 +50,7 @@ in buildPythonPackage rec { ''; homepage = "https://github.com/mysql/mysql-connector-python"; changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; - license = [ lib.licenses.gpl2Only ]; - maintainers = with lib.maintainers; [ neosimsim turion ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ neosimsim turion ]; }; } diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 9fbb336c386..b9bfb95e2e8 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-aCDw3JwX8LVrJp3jYvuYQ3ycRHjSnWU0n1LdTjV08VA="; + sha256 = "sha256-zmmJ3F2Fl4u7vOx1h5Z0LtWL0/5xmZiFRY2NU8Tc0MY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index c24886d7101..4b11263017d 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.0.22"; + version = "0.0.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0="; + hash = "sha256-z59TJ+P7WNMcTyevi4etWUFUnBJXAVhDOnO4GXjjuR0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index fc593e6a48f..105beaccb9b 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -1,8 +1,15 @@ -{ lib, buildPythonPackage, fetchPypi, pkg-config }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pkg-config +, pytestCheckHook +}: buildPythonPackage rec { pname = "pkgconfig"; version = "1.5.5"; + format = "pyproject"; inherit (pkg-config) setupHooks @@ -10,28 +17,39 @@ buildPythonPackage rec { suffixSalt targetPrefix baseBinName - ; + ; - src = fetchPypi { - inherit pname version; - sha256 = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899"; + src = fetchFromGitHub { + owner = "matze"; + repo = "pkgconfig"; + rev = "v${version}"; + sha256 = "sha256-uuLUGRNLCR3NS9g6OPCI+qG7tPWsLhI3OE5WmSI3vm8="; }; - - propagatedNativeBuildInputs = [ pkg-config ]; - - doCheck = false; - patches = [ ./executable.patch ]; + postPatch = '' - substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"' + rm pkgconfig/pkgconfig.py.orig + substituteInPlace pkgconfig/pkgconfig.py \ + --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"' + + # those pc files are missing and pkg-config validates that they exist + substituteInPlace data/fake-openssl.pc \ + --replace "Requires: libssl libcrypto" "" ''; + nativeBuildInputs = [ poetry-core ]; + + propagatedNativeBuildInputs = [ pkg-config ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pkgconfig" ]; meta = with lib; { description = "Interface Python with pkg-config"; homepage = "https://github.com/matze/pkgconfig"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index ca68c8cb54c..914f12a1546 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -56,5 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/ProtonMail/proton-python-client"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 44e4b8e237d..31247cbc199 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -53,5 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/ProtonVPN/protonvpn-nm-lib"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 1af942b9267..0aaf105a52f 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , nose , numpy +, stdenv }: buildPythonPackage { @@ -28,6 +29,11 @@ buildPythonPackage { cffi ]; + # this test is known to fail on darwin + checkPhase = '' + nosetests ${lib.optionalString stdenv.isDarwin " --exclude=test_tv2_1d"} + ''; + propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ blas lapack ]; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index ef056d296b2..60a8ee7f17f 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -1,24 +1,46 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }: +{ lib +, stdenv +, boost +, buildPythonPackage +, exiv2 +, fetchPypi +, libcxx +, pythonOlder +}: buildPythonPackage rec { pname = "py3exiv2"; - version = "0.9.3"; - disabled = !(isPy3k); + version = "0.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "838836e58ca22557d83d1f0ef918bcce899b4c2666340b924b940dcdebf1d18c"; + hash = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ="; }; - buildInputs = [ exiv2 boost ]; + buildInputs = [ + boost + exiv2 + ]; + + # Work around Python distutils compiling C++ with $CC (see issue #26709) + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + "-I${lib.getDev libcxx}/include/c++/v1" + ]; + + pythonImportsCheck = [ + "pyexiv2" + ]; - # work around python distutils compiling C++ with $CC (see issue #26709) - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + # Tests are not shipped + doCheck = false; meta = with lib; { + description = "Python binding to the library exiv2"; homepage = "https://launchpad.net/py3exiv2"; - description = "A Python3 binding to the library exiv2"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ vinymeuh ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix index 6e7f71cee30..f6a2b715ad9 100644 --- a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix +++ b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.7"; + version = "1.0.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GfzFM3S4yk0V2zTaQ+rkljyHdvC0ETUNSccZImqoLIU="; + hash = "sha256-3BTh7as4CikvVfUx2xBZlUOaq/dAQNNFHpuRxWg/5N0="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index e7f3b87ad0c..4b0e215f22c 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPyPy , fetchPypi +, fetchpatch , pythonOlder , curl , openssl @@ -20,6 +21,16 @@ buildPythonPackage rec { sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; }; + patches = [ + # Pull upstream patch for curl-3.83: + # https://github.com/pycurl/pycurl/pull/753 + (fetchpatch { + name = "curl-3.83.patch"; + url = "https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1.patch"; + sha256 = "sha256-/lGq7O7ZyytzBAxWJPigcWdvypM7OHLBcp9ItmX7z1g="; + }) + ]; + preConfigure = '' substituteInPlace setup.py --replace '--static-libs' '--libs' export PYCURL_SSL_LIBRARY=openssl diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index 6626ee19d92..9ca7638538a 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -1,11 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, ipykernel, ipywidgets, pythonOlder, pytestCheckHook, pandas }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, ipykernel +, ipywidgets +, pythonOlder +, pytestCheckHook +, pandas +, jinja2 +, numpy +, traitlets +}: buildPythonPackage rec { pname = "pydeck"; version = "0.7.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; + patches = [ + # fixes build with latest setuptools + (fetchpatch { + url = "https://github.com/visgl/deck.gl/commit/9e68f73b28aa3bf0f2a887a4d8ccd2dc35677039.patch"; + sha256 = "sha256-YVVoVbVdY5nV+17OwYIs9AwKGyzgKZHi655f4BLcdMU="; + stripLen = 2; + }) + ]; + src = fetchPypi { inherit pname version; sha256 = "907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e"; @@ -14,12 +36,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydeck" ]; checkInputs = [ pytestCheckHook pandas ]; + # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; propagatedBuildInputs = [ ipykernel ipywidgets + jinja2 + numpy + traitlets ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 02226feff2c..255231f8a49 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.8.1"; + version = "2.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8LlUmof4e6fEE/E2edE3Jx4LN/HzmwEJrOOCV9TRSNY="; + sha256 = "sha256-PCnWzmVUYVcReho0ejA+zfzxp1ke1nn8iM3vQQiEWHg="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 4faf04d289e..9d6d799fc32 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -1,43 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, matchpy , pytools -, pytest -, six -, sympy -, pexpect -, symengine +, pytestCheckHook }: buildPythonPackage rec { pname = "pymbolic"; - version = "2021.1"; + version = "2022.1"; src = fetchPypi { inherit pname version; - sha256 = "67d08ef95568408901e59f79591ba41fd3f2caaecb42b7497c38fc82fd60358c"; + sha256 = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI="; }; - postConfigure = '' - substituteInPlace setup.py \ - --replace "\"pytest>=2.3\"," "" - ''; - - checkInputs = [ sympy pexpect symengine pytest ]; propagatedBuildInputs = [ pytools - six ]; - # too many tests fail - doCheck = false; - checkPhase = '' - pytest test - ''; + checkInputs = [ + matchpy + pytestCheckHook + ]; meta = with lib; { description = "A package for symbolic computation"; - homepage = "https://mathema.tician.de/software/pymbolic"; + homepage = "https://documen.tician.de/pymbolic/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 0c34eb375bb..2a55491ac0d 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.17"; + version = "2.0.19"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-MzbZVG6/+YirgKsfrsSaT6jS0fTq/TBhlduZzgQKU+M="; + hash = "sha256-HcUawiKlPS0zqB5kEScfV82xnLG0n62owzK5upOLn4I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index e7e52991f6e..2a3c7166f0c 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - sha256 = "sha256-CCbLRb8eoMuYH3it2onfiUzHLW6sirePR/lqATpp4K0="; + sha256 = "sha256-VdoAtY+uZ4M6UNjYplqxx8S11eyKzqypW7IYCXOO2kQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index d00d26f1bae..c9ee34c05c6 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "12.0.0"; + version = "12.1.0"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-1zoLd4J7aCR5omMpCZhlttWDu7mYyKCypH3JEB4VGXg="; + hash = "sha256-o4kfZLkEs+XYor2sS2lfuDZkPfHrB+rDoxroc4f55gc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index addc12b3637..4def2f46317 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rich"; - version = "12.2.0"; + version = "12.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "02zypmnc9sijlipki0riywh82piamd3hlrl5xbg2bxlldnlnwx1d"; + sha256 = "sha256-/BPJcFjUldbTa/M3i9jGGU7apbrTcWbF+yrrFuLXcHY="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 5b80bb00dd6..cfb84743ff3 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.20"; + version = "0.0.22"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3gNHWncP9laevuX3EcnmNJ825eQehoLp75WJ5V5/R9w="; + hash = "sha256-hV0BusvuJUEGfmue7OHR3YYmpBcFTgbQE7UuHmTUBo0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 24c60839fe0..10f46fecf6f 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.2.0"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CkraR56Mfj2L18tW4aKazCsruYwjJQUbDNy1fX8Fbeg="; + sha256 = "sha256-lYxb9Ktkg9Wdq4iFOBIYccxQBjVKQvsPvVCs8Dyq0d4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sjcl/default.nix b/pkgs/development/python-modules/sjcl/default.nix new file mode 100644 index 00000000000..41da6669b54 --- /dev/null +++ b/pkgs/development/python-modules/sjcl/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pycryptodome +, python +}: + +buildPythonPackage rec { + pname = "sjcl"; + version = "0.2.1"; + + format = "setuptools"; + + # PyPi release is missing tests + src = fetchFromGitHub { + owner = "berlincode"; + repo = pname; + # commit from: 2018-08-16, because there aren't any tags on git + rev = "e8bdad312fa99c89c74f8651a1240afba8a9f3bd"; + sha256 = "1v8rc55v28v8cl7nxcavj34am005wi63zcvwnbc6pyfbv4ss30ab"; + }; + + propagatedBuildInputs = [ pycryptodome ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "sjcl" + ]; + + meta = with lib; { + description = "Decrypt and encrypt messages compatible to the \"Stanford Javascript Crypto Library (SJCL)\" message format. This is a wrapper around pycrypto."; + homepage = "https://github.com/berlincode/sjcl"; + license = licenses.bsd3; + maintainers = with maintainers; [ binsky ]; + }; +} diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 84900ad5477..430d0374ef2 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , pbr , python-mimeparse , extras @@ -20,15 +21,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr python-mimeparse extras ]; buildInputs = [ traceback2 ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; # testscenarios has a circular dependency on testtools doCheck = false; checkInputs = [ testscenarios ]; - # testtools 2.0.0 and up has a circular run-time dependency on futures - postPatch = '' - substituteInPlace requirements.txt --replace "fixtures>=1.3.0" "" - ''; + pythonRemoveDeps = [ "fixtures" ]; meta = { description = "A set of extensions to the Python standard library's unit testing framework"; diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 23c24f3e514..02cf7c0fda6 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -5,7 +5,6 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, six , twisted , zope_interface }: @@ -21,7 +20,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - six twisted zope_interface ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index f39aa12152a..f545acb9761 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -41,5 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/harfbuzz/uharfbuzz"; license = licenses.asl20; maintainers = with maintainers; [ wolfangaukang ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index ef78dee484c..5fa96494cc1 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.5"; + version = "0.38.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - hash = "sha256-QmmVxrvBPEwsmD/XJZClNQj4PUX+7X+75ZWSOO4/C24="; + hash = "sha256-P5yAXh/5J5/giOZTOuk9ay3PF8MNxPOJgtoWeX7xxFk="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" - # Starting with 0.38.5: AssertionError: assert [('add', '_ht..._tcp.local.')] + # Starting with 0.38.6: AssertionError: assert [('add', '_ht..._tcp.local.')] "test_service_browser_expire_callbacks" ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 2ebf6e017b5..118a3a2c44a 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "An event publishing system"; - homepage = "https://pypi.python.org/pypi/zope.event"; + homepage = "https://pypi.org/project/zope.event/"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 5ce79a09248..ff27c68bee3 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: +{ lib, stdenv, qmake, qtbase, perl, php, kcachegrind, wrapQtAppsHook }: stdenv.mkDerivation { pname = "qcachegrind"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = kcachegrind.src; - buildInputs = [ qtbase perl python2 php ]; + buildInputs = [ qtbase perl php ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; @@ -15,7 +15,6 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree - cp -p converters/hotshot2calltree.in $out/bin/hotshot2calltree cp -p converters/memprof2calltree $out/bin/memprof2calltree cp -p converters/op2calltree $out/bin/op2calltree cp -p converters/pprof2calltree $out/bin/pprof2calltree diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 044589a9664..cc15d9a67cc 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation { sourceRoot="$sourceRoot/tools/build" ''; + patches = useBoost.boostBuildPatches or []; + # Upstream defaults to gcc on darwin, but we use clang. postPatch = '' substituteInPlace src/build-system.jam \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix deleted file mode 100644 index 6168c4a477f..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ /dev/null @@ -1,390 +0,0 @@ -{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper -, zip, unzip, bash, writeCBin, coreutils -, which, python3, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils -# Apple dependencies -, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation -# Allow to independently override the jdks used to build and run respectively -, buildJdk, runJdk -, buildJdkName -, runtimeShell -# Always assume all markers valid (don't redownload dependencies). -# Also, don't clean up environment variables. -, enableNixHacks ? false -}: - -let - srcDeps = [ - # From: $REPO_ROOT/WORKSPACE - (fetchurl { - url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip"; - sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7"; - }) - (fetchurl { - url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz"; - sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f"; - }) - (fetchurl { - url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"; - sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52"; - }) - (fetchurl { - url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"; - sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_linux-v3.1.zip"; - sha256 = "a0cd51f9db1bf05a722ff7f5c60a07fa1c7d27428fff0815c342d32aa6c53576"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_darwin-v3.1.zip"; - sha256 = "c646aad8808b8ec5844d6a80a1287fc8e13203375fe40d6af4819eff48b9bbaf"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip"; - sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889"; - }) - (fetchurl { - url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"; - sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0"; - }) - (fetchurl { - url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz"; - sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f"; - }) - ]; - - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; - - defaultShellPath = lib.makeBinPath - # Keep this list conservative. For more exotic tools, prefer to use - # @rules_nixpkgs to pull in tools from the nix repository. Example: - # - # WORKSPACE: - # - # nixpkgs_git_repository( - # name = "nixpkgs", - # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", - # ) - # - # # This defines an external Bazel workspace. - # nixpkgs_package( - # name = "bison", - # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, - # ) - # - # some/BUILD.bazel: - # - # genrule( - # ... - # cmd = "$(location @bison//:bin/bison) -other -args", - # tools = [ - # ... - # "@bison//:bin/bison", - # ], - # ) - # - [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ]; - - # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; - stdenv' = if stdenv.isDarwin then llvmPackages_8.libcxxStdenv else stdenv; - -in -stdenv'.mkDerivation rec { - - version = "0.26.0"; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel/"; - description = "Build tool that builds code quickly and reliably"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - }; - - # Additional tests that check bazel’s functionality. Execute - # - # nix-build . -A bazel.tests - # - # in the nixpkgs checkout root to exercise them locally. - passthru.tests = { - pythonBinPath = callPackage ./python-bin-path-test.nix {}; - bashTools = callPackage ./bash-tools-test.nix {}; - }; - - pname = "bazel"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2"; - }; - - # Necessary for the tests to pass on Darwin with sandbox enabled. - # Bazel starts a local server and needs to bind a local address. - __darwinAllowLocalNetworking = true; - - sourceRoot = "."; - - patches = [ - ./glibc.patch - ./python-stub-path-fix.patch - ] ++ lib.optional enableNixHacks ../nix-hacks.patch; - - # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. - - customBash = writeCBin "bash" '' - #include - #include - #include - #include - - extern char **environ; - - int main(int argc, char *argv[]) { - char *path = getenv("PATH"); - char *pathToAppend = "${defaultShellPath}"; - char *newPath; - if (path != NULL) { - int length = strlen(path) + 1 + strlen(pathToAppend) + 1; - newPath = malloc(length * sizeof(char)); - snprintf(newPath, length, "%s:%s", path, pathToAppend); - } else { - newPath = pathToAppend; - } - setenv("PATH", newPath, 1); - execve("${bash}/bin/bash", argv, environ); - return 0; - } - ''; - - postPatch = let - - darwinPatches = '' - bazelLinkFlags () { - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done - } - - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - - # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails - export GCOV=${coreutils}/bin/false - - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${llvmPackages_8.libcxx}/include/c++/v1" - - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv'.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD - - # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead - sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc - - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - ''; - - genericPatches = '' - # Substitute python's stub shebang to plain python path. (see TODO add pr URL) - # See also `postFixup` where python is added to $out/nix-support - substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\ - --replace "/usr/bin/env python" "${python3.interpreter}" \ - --replace "NIX_STORE_PYTHON_PATH" "${python3.interpreter}" \ - - # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|' \ - src/BUILD - - # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do - # If you add more replacements here, you must change the grep above! - # Only files containing /bin are taken into account. - substituteInPlace "$path" \ - --replace /bin/bash ${customBash}/bin/bash \ - --replace /usr/bin/env ${coreutils}/bin/env \ - --replace /bin/true ${coreutils}/bin/true - done - - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${customBash}/bin/bash - - # add nix environment vars to .bazelrc - cat >> .bazelrc <> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - - patchShebangs . - ''; - in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches - + genericPatches; - - buildInputs = [ - buildJdk - ]; - - strictDeps = true; - - # when a command can’t be found in a bazel build, you might also - # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - zip - python3 - unzip - makeWrapper - which - customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools CoreFoundation CoreServices Foundation ]; - - # Bazel makes extensive use of symlinks in the WORKSPACE. - # This causes problems with infinite symlinks if the build output is in the same location as the - # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a - # subdirectory. - # Failing to do this causes "infinite symlink expansion detected" - preBuildPhases = ["preBuildPhase"]; - preBuildPhase = '' - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - ''; - - buildPhase = '' - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" - ./bazel_src/compile.sh - ./bazel_src/scripts/generate_bash_completion.sh \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.bash \ - --prepend=./bazel_src/scripts/bazel-complete-header.bash \ - --prepend=./bazel_src/scripts/bazel-complete-template.bash - ''; - - installPhase = '' - mkdir -p $out/bin - - # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-real - cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - mv ./bazel_src/output/bazel $out/bin/bazel-real - - wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}" - - # shell completion files - mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel - cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ - ''; - - # Temporarily disabling for now. A new approach is needed for this derivation as Bazel - # accesses the internet during the tests which fails in a sandbox. - doInstallCheck = false; - installCheckPhase = '' - export TEST_TMPDIR=$(pwd) - - hello_test () { - $out/bin/bazel test \ - --test_output=errors \ - --java_toolchain='${javaToolchain}' \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - } - - cd ./bazel_src - - # test whether $WORKSPACE_ROOT/tools/bazel works - - mkdir -p tools - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exit 1 - EOF - chmod +x tools/bazel - - # first call should fail if tools/bazel is used - ! hello_test - - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exec "$BAZEL_REAL" "$@" - EOF - - # second call succeeds because it defers to $out/bin/bazel-real - hello_test - ''; - - # Save paths to hardcoded dependencies so Nix can detect them. - postFixup = '' - mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends - # The templates get tar’d up into a .jar, - # so nix can’t detect python is needed in the runtime closure - echo "${python3}" >> $out/nix-support/depends - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch deleted file mode 100644 index c4de48068f1..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch +++ /dev/null @@ -1,78 +0,0 @@ -From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 -From: Benjamin Peterson -Date: Fri, 3 May 2019 08:11:00 -0700 -Subject: [PATCH] Rename gettid() functions. - -glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. ---- - src/core/lib/gpr/log_linux.cc | 6 ++---- - src/core/lib/gpr/log_posix.cc | 4 ++-- - src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc -index 81026e5689b..8b597b4cf2f 100644 ---- a/third_party/grpc/src/core/lib/gpr/log_linux.cc -+++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc -@@ -40,7 +40,7 @@ - #include - #include - --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - struct tm tm; - static __thread long tid = 0; -- if (tid == 0) tid = gettid(); -+ if (tid == 0) tid = sys_gettid(); - - timer = static_cast(now.tv_sec); - final_slash = strrchr(args->file, '/'); -diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc -index b6edc14ab6b..2f7c6ce3760 100644 ---- a/third_party/grpc/src/core/lib/gpr/log_posix.cc -+++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc -@@ -31,7 +31,7 @@ - #include - #include - --static intptr_t gettid(void) { return (intptr_t)pthread_self(); } -+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { - char* prefix; - gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", - gpr_log_severity_string(args->severity), time_buffer, -- (int)(now.tv_nsec), gettid(), display_file, args->line); -+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); - - fprintf(stderr, "%-70s %s\n", prefix, args->message); - gpr_free(prefix); -diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc -index c2d80c08ddb..4a83cb6c215 100644 ---- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc -+++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc -@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, - } - - #ifndef NDEBUG --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - #endif - - /* pollset->mu lock must be held by the caller before calling this. -@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, - #define WORKER_PTR (&worker) - #endif - #ifndef NDEBUG -- WORKER_PTR->originator = gettid(); -+ WORKER_PTR->originator = sys_gettid(); - #endif - if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { - gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch deleted file mode 100644 index cbc4192d2d9..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -index dac21c9a83..69b11c283f 100644 ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -@@ -67,7 +67,7 @@ def FindPythonBinary(module_space): - return os.path.join(module_space, PYTHON_BINARY) - else: - # Case 4: Path has to be looked up in the search path. -- return SearchPath(PYTHON_BINARY) -+ return "NIX_STORE_PYTHON_PATH" - - def CreatePythonPathEntries(python_imports, module_space): - parts = python_imports.split(':'); diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix deleted file mode 100644 index 91131bc02c6..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix +++ /dev/null @@ -1,560 +0,0 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs -# this package (through the fixpoint glass) -, bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, gawk, gnused, gnutar, gnugrep, gzip, findutils -# updater -, python27, python3, writeScript -# Apple dependencies -, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation -# Allow to independently override the jdks used to build and run respectively -, buildJdk, runJdk -, buildJdkName -, runtimeShell -# Downstream packages for tests -, bazel-watcher -# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). -# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). -, enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook -, file -, substituteAll -, writeTextFile -}: - -let - version = "0.29.1"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1rcd6xy61n07n7m6dgcw23275r8z3gkwmqdkd48nwrq8yb7m4al7"; - }; - - # Update with `eval $(nix-build -A bazel.updater)`, - # then add new dependencies from the dict in ./src-deps.json as required. - srcDeps = lib.attrsets.attrValues srcDepsSet; - srcDepsSet = - let - srcs = lib.importJSON ./src-deps.json; - toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; - sha256 = d.sha256; - }); - in builtins.listToAttrs (map toFetchurl [ - srcs.desugar_jdk_libs - srcs.io_bazel_skydoc - srcs.bazel_skylib - srcs.io_bazel_rules_sass - srcs.platforms - (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v4.0.zip" - else srcs."java_tools_javac11_linux-v4.0.zip") - srcs."coverage_output_generator-v1.0.zip" - srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.8.tar.gz" - srcs."0.27.1.tar.gz" - srcs.rules_pkg - srcs.rules_cc - srcs.rules_java - srcs.rules_proto - ]); - - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; - - defaultShellPath = lib.makeBinPath - # Keep this list conservative. For more exotic tools, prefer to use - # @rules_nixpkgs to pull in tools from the nix repository. Example: - # - # WORKSPACE: - # - # nixpkgs_git_repository( - # name = "nixpkgs", - # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", - # ) - # - # # This defines an external Bazel workspace. - # nixpkgs_package( - # name = "bison", - # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, - # ) - # - # some/BUILD.bazel: - # - # genrule( - # ... - # cmd = "$(location @bison//:bin/bison) -other -args", - # tools = [ - # ... - # "@bison//:bin/bison", - # ], - # ) - # - [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; - - # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - # This repository is fetched by bazel at runtime - # however it contains prebuilt java binaries, with wrong interpreter - # and libraries path. - # We prefetch it, patch it, and override it in a global bazelrc. - system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - - remote_java_tools = stdenv.mkDerivation { - name = "remote_java_tools_${system}"; - - src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip"; - - nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ gcc-unwrapped ]; - - sourceRoot = "."; - - buildPhase = '' - mkdir $out; - ''; - - installPhase = '' - cp -Ra * $out/ - touch $out/WORKSPACE - ''; - }; - - bazelRC = writeTextFile { - name = "bazel-rc"; - text = '' - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - build --distdir=${distDir} - startup --server_javabase=${runJdk} - - # load default location for the system wide configuration - try-import /etc/bazel.bazelrc - ''; - }; - stdenv' = if stdenv.isDarwin then llvmPackages_8.libcxxStdenv else stdenv; - -in -stdenv'.mkDerivation rec { - pname = "bazel"; - inherit version; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel/"; - description = "Build tool that builds code quickly and reliably"; - license = licenses.asl20; - maintainers = lib.teams.bazel.members; - inherit platforms; - }; - - inherit src; - sourceRoot = "."; - - patches = [ - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' - # This is breaking the build of any C target. This patch removes the last - # argument if it's found to be an empty string. - ../trim-last-argument-to-gcc-if-empty.patch - ./glibc.patch - - # --experimental_strict_action_env (which may one day become the default - # see bazelbuild/bazel#2574) hardcodes the default - # action environment to a non hermetic value (e.g. "/usr/local/bin"). - # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. - # So we are replacing this bazel paths by defaultShellPath, - # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; - strictActionEnvPatch = defaultShellPath; - }) - - # bazel reads its system bazelrc in /etc - # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; - bazelSystemBazelRCPath = bazelRC; - }) - ] ++ lib.optional enableNixHacks ../nix-hacks.patch; - - - # Additional tests that check bazel’s functionality. Execute - # - # nix-build . -A bazel.tests - # - # in the nixpkgs checkout root to exercise them locally. - passthru.tests = - let - runLocal = name: attrs: script: - let - attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 ] ++ (attrs.buildInputs or []); - in - runCommandCC name ({ - inherit buildInputs; - preferLocalBuild = true; - meta.platforms = platforms; - } // attrs') script; - - # bazel wants to extract itself into $install_dir/install every time it runs, - # so let’s do that only once. - extracted = bazelPkg: - let install_dir = - # `install_base` field printed by `bazel info`, minus the hash. - # yes, this path is kinda magic. Sorry. - "$HOME/.cache/bazel/_bazel_nixbld"; - in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' - export HOME=$(mktemp -d) - touch WORKSPACE # yeah, everything sucks - install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" - # assert it’s actually below install_dir - [[ "$install_base" =~ ${install_dir} ]] \ - || (echo "oh no! $install_base but we are \ - trying to copy ${install_dir} to $out instead!"; exit 1) - cp -R ${install_dir} $out - ''; - - bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: - let - be = extracted bazelPkg; - in runLocal name { inherit buildInputs; } ( - # skip extraction caching on Darwin, because nobody knows how Darwin works - (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - # set up home with pre-unpacked bazel - export HOME=$(mktemp -d) - mkdir -p ${be.install_dir} - cp -R ${be}/install ${be.install_dir} - - # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 - # Bazel checks whether the mtime of the install dir files - # is >9 years in the future, otherwise it extracts itself again. - # see PosixFileMTime::IsUntampered in src/main/cpp/util - # What the hell bazel. - ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} - '') - + - '' - # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 - # about why to create a subdir for the workspace. - cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - - ${bazelScript} - - touch $out - ''); - - bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; - - bazel-examples = fetchFromGitHub { - owner = "bazelbuild"; - repo = "examples"; - rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; - sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; - }; - - in (if !stdenv.hostPlatform.isDarwin then { - # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; - } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - # downstream packages using buildBazelPackage - # fixed-output hashes of the fetch phase need to be spot-checked manually - downstream = recurseIntoAttrs ({ - inherit bazel-watcher; - }); - }; - - # update the list of workspace dependencies - passthru.updater = writeScript "update-bazel-deps.sh" '' - #!${runtimeShell} - cat ${runCommand "bazel-deps.json" {} '' - ${unzip}/bin/unzip ${src} WORKSPACE - ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out - ''} > ${builtins.toString ./src-deps.json} - ''; - - # Necessary for the tests to pass on Darwin with sandbox enabled. - # Bazel starts a local server and needs to bind a local address. - __darwinAllowLocalNetworking = true; - - # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. - customBash = writeCBin "bash" '' - #include - #include - #include - #include - - extern char **environ; - - int main(int argc, char *argv[]) { - char *path = getenv("PATH"); - char *pathToAppend = "${defaultShellPath}"; - char *newPath; - if (path != NULL) { - int length = strlen(path) + 1 + strlen(pathToAppend) + 1; - newPath = malloc(length * sizeof(char)); - snprintf(newPath, length, "%s:%s", path, pathToAppend); - } else { - newPath = pathToAppend; - } - setenv("PATH", newPath, 1); - execve("${bash}/bin/bash", argv, environ); - return 0; - } - ''; - - postPatch = let - - darwinPatches = '' - bazelLinkFlags () { - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done - } - - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - - # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails - export GCOV=${coreutils}/bin/false - - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${llvmPackages_8.libcxx}/include/c++/v1" - - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv'.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD - - # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead - sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc - - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - ''; - - genericPatches = '' - # Substitute j2objc and objc wrapper's python shebang to plain python path. - # These scripts explicitly depend on Python 2.7, hence we use python27. - # See also `postFixup` where python27 is added to $out/nix-support - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - - # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|' \ - src/BUILD - - # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do - # If you add more replacements here, you must change the grep above! - # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support - substituteInPlace "$path" \ - --replace /bin/bash ${customBash}/bin/bash \ - --replace "/usr/bin/env bash" ${customBash}/bin/bash \ - --replace "/usr/bin/env python" ${python3}/bin/python \ - --replace /usr/bin/env ${coreutils}/bin/env \ - --replace /bin/true ${coreutils}/bin/true - done - - # bazel test runner include references to /bin/bash - substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${customBash}/bin/bash - - for i in $(find tools/cpp/ -type f) - do - substituteInPlace $i \ - --replace /bin/bash ${customBash}/bin/bash - done - - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${customBash}/bin/bash - - # add nix environment vars to .bazelrc - cat >> .bazelrc <> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - - patchShebangs . - ''; - in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches - + genericPatches; - - buildInputs = [ - buildJdk - python3 - ]; - - # when a command can’t be found in a bazel build, you might also - # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - zip - python3 - unzip - makeWrapper - which - customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools CoreFoundation CoreServices Foundation ]; - - # Bazel makes extensive use of symlinks in the WORKSPACE. - # This causes problems with infinite symlinks if the build output is in the same location as the - # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a - # subdirectory. - # Failing to do this causes "infinite symlink expansion detected" - preBuildPhases = ["preBuildPhase"]; - preBuildPhase = '' - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - ''; - - buildPhase = '' - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" - ./bazel_src/compile.sh - ./bazel_src/scripts/generate_bash_completion.sh \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.bash \ - --prepend=./bazel_src/scripts/bazel-complete-header.bash \ - --prepend=./bazel_src/scripts/bazel-complete-template.bash - ''; - - installPhase = '' - mkdir -p $out/bin - - # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-real - cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - mv ./bazel_src/output/bazel $out/bin/bazel-real - - # shell completion files - mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel - cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ - ''; - - doInstallCheck = true; - installCheckPhase = '' - export TEST_TMPDIR=$(pwd) - - hello_test () { - $out/bin/bazel test --distdir=${distDir} \ - --test_output=errors \ - --java_toolchain='${javaToolchain}' \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - } - - cd ./bazel_src - - # test whether $WORKSPACE_ROOT/tools/bazel works - - mkdir -p tools - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exit 1 - EOF - chmod +x tools/bazel - - # first call should fail if tools/bazel is used - ! hello_test - - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exec "$BAZEL_REAL" "$@" - EOF - - # second call succeeds because it defers to $out/bin/bazel-real - hello_test - ''; - - # Save paths to hardcoded dependencies so Nix can detect them. - postFixup = '' - mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends - # The templates get tar’d up into a .jar, - # so nix can’t detect python is needed in the runtime closure - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # runtime dependencies. - echo "${python27}" >> $out/nix-support/depends - echo "${python3}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' - echo "${cctools}" >> $out/nix-support/depends - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch deleted file mode 100644 index c4de48068f1..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch +++ /dev/null @@ -1,78 +0,0 @@ -From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 -From: Benjamin Peterson -Date: Fri, 3 May 2019 08:11:00 -0700 -Subject: [PATCH] Rename gettid() functions. - -glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. ---- - src/core/lib/gpr/log_linux.cc | 6 ++---- - src/core/lib/gpr/log_posix.cc | 4 ++-- - src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc -index 81026e5689b..8b597b4cf2f 100644 ---- a/third_party/grpc/src/core/lib/gpr/log_linux.cc -+++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc -@@ -40,7 +40,7 @@ - #include - #include - --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - struct tm tm; - static __thread long tid = 0; -- if (tid == 0) tid = gettid(); -+ if (tid == 0) tid = sys_gettid(); - - timer = static_cast(now.tv_sec); - final_slash = strrchr(args->file, '/'); -diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc -index b6edc14ab6b..2f7c6ce3760 100644 ---- a/third_party/grpc/src/core/lib/gpr/log_posix.cc -+++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc -@@ -31,7 +31,7 @@ - #include - #include - --static intptr_t gettid(void) { return (intptr_t)pthread_self(); } -+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { - char* prefix; - gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", - gpr_log_severity_string(args->severity), time_buffer, -- (int)(now.tv_nsec), gettid(), display_file, args->line); -+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); - - fprintf(stderr, "%-70s %s\n", prefix, args->message); - gpr_free(prefix); -diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc -index c2d80c08ddb..4a83cb6c215 100644 ---- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc -+++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc -@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, - } - - #ifndef NDEBUG --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - #endif - - /* pollset->mu lock must be held by the caller before calling this. -@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, - #define WORKER_PTR (&worker) - #endif - #ifndef NDEBUG -- WORKER_PTR->originator = gettid(); -+ WORKER_PTR->originator = sys_gettid(); - #endif - if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { - gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json deleted file mode 100644 index f93794249ec..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json +++ /dev/null @@ -1,506 +0,0 @@ -{ - "0.16.2.zip": { - "name": "0.16.2.zip", - "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", - "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" - ] - }, - "0.27.1.tar.gz": { - "name": "0.27.1.tar.gz", - "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" - ] - }, - "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { - "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" - ] - }, - "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": { - "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", - "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" - ] - }, - "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { - "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" - ] - }, - "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { - "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { - "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", - "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", - "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" - ] - }, - "android_tools_pkg-0.8.tar.gz": { - "name": "android_tools_pkg-0.8.tar.gz", - "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", - "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz" - ] - }, - "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": { - "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", - "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" - ] - }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", - "strip_prefix": "j2objc-2.5", - "urls": [ - "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", - "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" - ] - }, - "bazel_skylib": { - "name": "bazel_skylib", - "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", - "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" - ] - }, - "bazel_toolchains": { - "name": "bazel_toolchains", - "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", - "strip_prefix": "bazel-toolchains-0.27.1", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" - ] - }, - "build_bazel_rules_nodejs": { - "name": "build_bazel_rules_nodejs", - "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", - "strip_prefix": "rules_nodejs-0.16.2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", - "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" - ] - }, - "com_google_googletest": { - "name": "com_google_googletest", - "sha256": "0fb00ff413f6b9b80ccee44a374ca7a18af7315aea72a43c62f2acd1ca74e9b5", - "strip_prefix": "googletest-f13bbe2992d188e834339abe6f715b2b2f840a77", - "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz", - "https://github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz" - ] - }, - "coverage_output_generator-v1.0.zip": { - "name": "coverage_output_generator-v1.0.zip", - "sha256": "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip" - ] - }, - "desugar_jdk_libs": { - "name": "desugar_jdk_libs", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { - "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": { - "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", - "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" - ] - }, - "io_bazel_rules_sass": { - "name": "io_bazel_rules_sass", - "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", - "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", - "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" - ] - }, - "io_bazel_skydoc": { - "name": "io_bazel_skydoc", - "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", - "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" - ] - }, - "java_tools_javac11_darwin-v4.0.zip": { - "name": "java_tools_javac11_darwin-v4.0.zip", - "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip" - ] - }, - "java_tools_javac11_linux-v4.0.zip": { - "name": "java_tools_javac11_linux-v4.0.zip", - "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip" - ] - }, - "java_tools_javac11_windows-v4.0.zip": { - "name": "java_tools_javac11_windows-v4.0.zip", - "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip" - ] - }, - "java_tools_langtools_javac10": { - "name": "java_tools_langtools_javac10", - "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" - ] - }, - "java_tools_langtools_javac11": { - "name": "java_tools_langtools_javac11", - "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" - ] - }, - "java_tools_langtools_javac12": { - "name": "java_tools_langtools_javac12", - "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" - ] - }, - "java_tools_langtools_javac9": { - "name": "java_tools_langtools_javac9", - "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" - ] - }, - "jdk10-server-release-1804.tar.xz": { - "name": "jdk10-server-release-1804.tar.xz", - "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be", - "urls": [ - "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz" - ] - }, - "jdk9-server-release-1708.tar.xz": { - "name": "jdk9-server-release-1708.tar.xz", - "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", - "urls": [ - "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" - ] - }, - "openjdk10_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk10_linux_archive", - "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f", - "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz" - ] - }, - "openjdk11_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk11_linux_archive", - "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48", - "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz" - ] - }, - "openjdk12_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk12_linux_archive", - "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", - "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" - ] - }, - "openjdk9_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk9_linux_archive", - "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8", - "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz" - ] - }, - "openjdk_linux": { - "downloaded_file_path": "zulu-linux.tar.gz", - "name": "openjdk_linux", - "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz" - ] - }, - "openjdk_linux_aarch64": { - "downloaded_file_path": "zulu-linux-aarch64.tar.gz", - "name": "openjdk_linux_aarch64", - "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" - ] - }, - "openjdk_linux_aarch64_minimal": { - "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", - "name": "openjdk_linux_aarch64_minimal", - "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" - ] - }, - "openjdk_linux_aarch64_vanilla": { - "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", - "name": "openjdk_linux_aarch64_vanilla", - "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" - ] - }, - "openjdk_linux_minimal": { - "downloaded_file_path": "zulu-linux-minimal.tar.gz", - "name": "openjdk_linux_minimal", - "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz" - ] - }, - "openjdk_linux_vanilla": { - "downloaded_file_path": "zulu-linux-vanilla.tar.gz", - "name": "openjdk_linux_vanilla", - "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" - ] - }, - "openjdk_macos": { - "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", - "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz" - ] - }, - "openjdk_macos_minimal": { - "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", - "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz" - ] - }, - "openjdk_macos_vanilla": { - "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", - "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" - ] - }, - "openjdk_win": { - "downloaded_file_path": "zulu-win.zip", - "name": "openjdk_win", - "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip" - ] - }, - "openjdk_win_minimal": { - "downloaded_file_path": "zulu-win-minimal.zip", - "name": "openjdk_win_minimal", - "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip" - ] - }, - "openjdk_win_vanilla": { - "downloaded_file_path": "zulu-win-vanilla.zip", - "name": "openjdk_win_vanilla", - "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" - ] - }, - "platforms": { - "name": "platforms", - "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", - "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" - ] - }, - "rules_cc": { - "name": "rules_cc", - "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", - "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" - ] - }, - "rules_java": { - "name": "rules_java", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "rules_pkg": { - "name": "rules_pkg", - "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" - ] - }, - "rules_pkg-0.2.0.tar.gz": { - "name": "rules_pkg-0.2.0.tar.gz", - "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" - ] - }, - "rules_proto": { - "name": "rules_proto", - "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", - "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" - ] - }, - "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { - "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", - "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz" - ] - }, - "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": { - "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz", - "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz" - ] - }, - "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": { - "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip", - "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip" - ] - }, - "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": { - "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz", - "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz" - ] - }, - "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": { - "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz", - "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz" - ] - }, - "zulu11.2.3-jdk11.0.1-win_x64.zip": { - "name": "zulu11.2.3-jdk11.0.1-win_x64.zip", - "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip" - ] - }, - "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": { - "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz", - "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" - ] - }, - "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": { - "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip", - "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" - ] - }, - "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": { - "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip", - "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" - ] - }, - "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": { - "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz", - "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" - ] - }, - "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { - "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", - "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz" - ] - }, - "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": { - "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz", - "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz" - ] - }, - "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": { - "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip", - "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip" - ] - } -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix deleted file mode 100644 index f9bcab19fe0..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ /dev/null @@ -1,561 +0,0 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs -# this package (through the fixpoint glass) -, bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils -, which, gawk, gnused, gnutar, gnugrep, gzip, findutils -# updater -, python27, python3, writeScript -# Apple dependencies -, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation -# Allow to independently override the jdks used to build and run respectively -, buildJdk, runJdk -, buildJdkName -, runtimeShell -# Downstream packages for tests -, bazel-watcher -# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). -# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). -, enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook -, file -, substituteAll -, writeTextFile -}: - -let - version = "1.2.1"; - - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1qfk14mgx1m454b4w4ldggljzqkqwpdwrlynq7rc8aq11yfs8p95"; - }; - - # Update with `eval $(nix-build -A bazel.updater)`, - # then add new dependencies from the dict in ./src-deps.json as required. - srcDeps = lib.attrsets.attrValues srcDepsSet; - srcDepsSet = - let - srcs = lib.importJSON ./src-deps.json; - toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; - sha256 = d.sha256; - }); - in builtins.listToAttrs (map toFetchurl [ - srcs.desugar_jdk_libs - srcs.io_bazel_skydoc - srcs.bazel_skylib - srcs.io_bazel_rules_sass - srcs.platforms - (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v6.1.zip" - else srcs."java_tools_javac11_linux-v6.1.zip") - srcs."coverage_output_generator-v2.0.zip" - srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.12.tar.gz" - srcs."0.28.3.tar.gz" - srcs.rules_pkg - srcs.rules_cc - srcs.rules_java - srcs.rules_proto - ]); - - distDir = runCommand "bazel-deps" {} '' - mkdir -p $out - for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done - ''; - - defaultShellPath = lib.makeBinPath - # Keep this list conservative. For more exotic tools, prefer to use - # @rules_nixpkgs to pull in tools from the nix repository. Example: - # - # WORKSPACE: - # - # nixpkgs_git_repository( - # name = "nixpkgs", - # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", - # ) - # - # # This defines an external Bazel workspace. - # nixpkgs_package( - # name = "bison", - # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, - # ) - # - # some/BUILD.bazel: - # - # genrule( - # ... - # cmd = "$(location @bison//:bin/bison) -other -args", - # tools = [ - # ... - # "@bison//:bin/bison", - # ], - # ) - # - [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; - - # Java toolchain used for the build and tests - javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - # This repository is fetched by bazel at runtime - # however it contains prebuilt java binaries, with wrong interpreter - # and libraries path. - # We prefetch it, patch it, and override it in a global bazelrc. - system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - - remote_java_tools = stdenv.mkDerivation { - name = "remote_java_tools_${system}"; - - src = srcDepsSet."java_tools_javac11_${system}-v6.1.zip"; - - nativeBuildInputs = [ unzip ] - ++ lib.optional stdenv.isLinux autoPatchelfHook; - buildInputs = [ gcc-unwrapped ]; - - sourceRoot = "."; - - buildPhase = '' - mkdir $out; - ''; - - installPhase = '' - cp -Ra * $out/ - touch $out/WORKSPACE - ''; - }; - - bazelRC = writeTextFile { - name = "bazel-rc"; - text = '' - build --override_repository=${remote_java_tools.name}=${remote_java_tools} - build --distdir=${distDir} - startup --server_javabase=${runJdk} - - # load default location for the system wide configuration - try-import /etc/bazel.bazelrc - ''; - }; - - stdenv' = if stdenv.isDarwin then llvmPackages_8.libcxxStdenv else stdenv; - -in -stdenv'.mkDerivation rec { - pname = "bazel"; - inherit version; - - meta = with lib; { - homepage = "https://github.com/bazelbuild/bazel/"; - description = "Build tool that builds code quickly and reliably"; - license = licenses.asl20; - maintainers = lib.teams.bazel.members; - inherit platforms; - }; - - inherit src; - sourceRoot = "."; - - patches = [ - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' - # This is breaking the build of any C target. This patch removes the last - # argument if it's found to be an empty string. - ../trim-last-argument-to-gcc-if-empty.patch - ./glibc.patch - - # --experimental_strict_action_env (which may one day become the default - # see bazelbuild/bazel#2574) hardcodes the default - # action environment to a non hermetic value (e.g. "/usr/local/bin"). - # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. - # So we are replacing this bazel paths by defaultShellPath, - # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; - strictActionEnvPatch = defaultShellPath; - }) - - # bazel reads its system bazelrc in /etc - # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; - bazelSystemBazelRCPath = bazelRC; - }) - ] ++ lib.optional enableNixHacks ../nix-hacks.patch; - - - # Additional tests that check bazel’s functionality. Execute - # - # nix-build . -A bazel.tests - # - # in the nixpkgs checkout root to exercise them locally. - passthru.tests = - let - runLocal = name: attrs: script: - let - attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 ] ++ (attrs.buildInputs or []); - in - runCommandCC name ({ - inherit buildInputs; - preferLocalBuild = true; - meta.platforms = platforms; - } // attrs') script; - - # bazel wants to extract itself into $install_dir/install every time it runs, - # so let’s do that only once. - extracted = bazelPkg: - let install_dir = - # `install_base` field printed by `bazel info`, minus the hash. - # yes, this path is kinda magic. Sorry. - "$HOME/.cache/bazel/_bazel_nixbld"; - in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' - export HOME=$(mktemp -d) - touch WORKSPACE # yeah, everything sucks - install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" - # assert it’s actually below install_dir - [[ "$install_base" =~ ${install_dir} ]] \ - || (echo "oh no! $install_base but we are \ - trying to copy ${install_dir} to $out instead!"; exit 1) - cp -R ${install_dir} $out - ''; - - bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: - let - be = extracted bazelPkg; - in runLocal name { inherit buildInputs; } ( - # skip extraction caching on Darwin, because nobody knows how Darwin works - (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - # set up home with pre-unpacked bazel - export HOME=$(mktemp -d) - mkdir -p ${be.install_dir} - cp -R ${be}/install ${be.install_dir} - - # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 - # Bazel checks whether the mtime of the install dir files - # is >9 years in the future, otherwise it extracts itself again. - # see PosixFileMTime::IsUntampered in src/main/cpp/util - # What the hell bazel. - ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} - '') - + - '' - # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 - # about why to create a subdir for the workspace. - cp -r ${workspaceDir} wd && chmod u+w wd && cd wd - - ${bazelScript} - - touch $out - ''); - - bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; - - bazel-examples = fetchFromGitHub { - owner = "bazelbuild"; - repo = "examples"; - rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; - sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; - }; - - in (if !stdenv.hostPlatform.isDarwin then { - # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; - } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - # downstream packages using buildBazelPackage - # fixed-output hashes of the fetch phase need to be spot-checked manually - downstream = recurseIntoAttrs ({ - inherit bazel-watcher; - }); - }; - - # update the list of workspace dependencies - passthru.updater = writeScript "update-bazel-deps.sh" '' - #!${runtimeShell} - cat ${runCommand "bazel-deps.json" {} '' - ${unzip}/bin/unzip ${src} WORKSPACE - ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out - ''} > ${builtins.toString ./src-deps.json} - ''; - - # Necessary for the tests to pass on Darwin with sandbox enabled. - # Bazel starts a local server and needs to bind a local address. - __darwinAllowLocalNetworking = true; - - # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. - customBash = writeCBin "bash" '' - #include - #include - #include - #include - - extern char **environ; - - int main(int argc, char *argv[]) { - char *path = getenv("PATH"); - char *pathToAppend = "${defaultShellPath}"; - char *newPath; - if (path != NULL) { - int length = strlen(path) + 1 + strlen(pathToAppend) + 1; - newPath = malloc(length * sizeof(char)); - snprintf(newPath, length, "%s:%s", path, pathToAppend); - } else { - newPath = pathToAppend; - } - setenv("PATH", newPath, 1); - execve("${bash}/bin/bash", argv, environ); - return 0; - } - ''; - - postPatch = let - - darwinPatches = '' - bazelLinkFlags () { - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done - } - - # Disable Bazel's Xcode toolchain detection which would configure compilers - # and linkers from Xcode instead of from PATH - export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 - - # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails - export GCOV=${coreutils}/bin/false - - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - - # libcxx includes aren't added by libcxx hook - # https://github.com/NixOS/nixpkgs/pull/41589 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${llvmPackages_8.libcxx}/include/c++/v1" - - # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9;${stdenv'.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD - - # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead - sed -i -e "/#include /i #include " src/main/cpp/blaze_util_darwin.cc - - # clang installed from Xcode has a compatibility wrapper that forwards - # invocations of gcc to clang, but vanilla clang doesn't - sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - - sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) - for wrapper in "''${wrappers[@]}"; do - sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper - done - ''; - - genericPatches = '' - # Substitute j2objc and objc wrapper's python shebang to plain python path. - # These scripts explicitly depend on Python 2.7, hence we use python27. - # See also `postFixup` where python27 is added to $out/nix-support - substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" - - # md5sum is part of coreutils - sed -i 's|/sbin/md5|md5sum|g' \ - src/BUILD - - # substituteInPlace is rather slow, so prefilter the files with grep - grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do - # If you add more replacements here, you must change the grep above! - # Only files containing /bin are taken into account. - # We default to python3 where possible. See also `postFixup` where - # python3 is added to $out/nix-support - substituteInPlace "$path" \ - --replace /bin/bash ${customBash}/bin/bash \ - --replace "/usr/bin/env bash" ${customBash}/bin/bash \ - --replace "/usr/bin/env python" ${python3}/bin/python \ - --replace /usr/bin/env ${coreutils}/bin/env \ - --replace /bin/true ${coreutils}/bin/true - done - - # bazel test runner include references to /bin/bash - substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${customBash}/bin/bash - - for i in $(find tools/cpp/ -type f) - do - substituteInPlace $i \ - --replace /bin/bash ${customBash}/bin/bash - done - - # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. - substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${customBash}/bin/bash - - # add nix environment vars to .bazelrc - cat >> .bazelrc <> runfiles.bash.tmp - cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp - mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - - patchShebangs . - ''; - in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches - + genericPatches; - - buildInputs = [ - buildJdk - python3 - ]; - - # when a command can’t be found in a bazel build, you might also - # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - zip - python3 - unzip - makeWrapper - which - customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools CoreFoundation CoreServices Foundation ]; - - # Bazel makes extensive use of symlinks in the WORKSPACE. - # This causes problems with infinite symlinks if the build output is in the same location as the - # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a - # subdirectory. - # Failing to do this causes "infinite symlink expansion detected" - preBuildPhases = ["preBuildPhase"]; - preBuildPhase = '' - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - ''; - - buildPhase = '' - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" - ./bazel_src/compile.sh - ./bazel_src/scripts/generate_bash_completion.sh \ - --bazel=./bazel_src/output/bazel \ - --output=./bazel_src/output/bazel-complete.bash \ - --prepend=./bazel_src/scripts/bazel-complete-header.bash \ - --prepend=./bazel_src/scripts/bazel-complete-template.bash - ''; - - installPhase = '' - mkdir -p $out/bin - - # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-real - cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - mv ./bazel_src/output/bazel $out/bin/bazel-real - - # shell completion files - mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel - cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ - ''; - - doInstallCheck = true; - installCheckPhase = '' - export TEST_TMPDIR=$(pwd) - - hello_test () { - $out/bin/bazel test --distdir=${distDir} \ - --test_output=errors \ - --java_toolchain='${javaToolchain}' \ - examples/cpp:hello-success_test \ - examples/java-native/src/test/java/com/example/myproject:hello - } - - cd ./bazel_src - - # test whether $WORKSPACE_ROOT/tools/bazel works - - mkdir -p tools - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exit 1 - EOF - chmod +x tools/bazel - - # first call should fail if tools/bazel is used - ! hello_test - - cat > tools/bazel <<"EOF" - #!${runtimeShell} -e - exec "$BAZEL_REAL" "$@" - EOF - - # second call succeeds because it defers to $out/bin/bazel-real - hello_test - ''; - - # Save paths to hardcoded dependencies so Nix can detect them. - postFixup = '' - mkdir -p $out/nix-support - echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends - # The templates get tar’d up into a .jar, - # so nix can’t detect python is needed in the runtime closure - # Some of the scripts explicitly depend on Python 2.7. Otherwise, we - # default to using python3. Therefore, both python27 and python3 are - # runtime dependencies. - echo "${python27}" >> $out/nix-support/depends - echo "${python3}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.isDarwin '' - echo "${cctools}" >> $out/nix-support/depends - ''; - - dontStrip = true; - dontPatchELF = true; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch deleted file mode 100644 index c4de48068f1..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch +++ /dev/null @@ -1,78 +0,0 @@ -From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 -From: Benjamin Peterson -Date: Fri, 3 May 2019 08:11:00 -0700 -Subject: [PATCH] Rename gettid() functions. - -glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. ---- - src/core/lib/gpr/log_linux.cc | 6 ++---- - src/core/lib/gpr/log_posix.cc | 4 ++-- - src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- - 3 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc -index 81026e5689b..8b597b4cf2f 100644 ---- a/third_party/grpc/src/core/lib/gpr/log_linux.cc -+++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc -@@ -40,7 +40,7 @@ - #include - #include - --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { - gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); - struct tm tm; - static __thread long tid = 0; -- if (tid == 0) tid = gettid(); -+ if (tid == 0) tid = sys_gettid(); - - timer = static_cast(now.tv_sec); - final_slash = strrchr(args->file, '/'); -diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc -index b6edc14ab6b..2f7c6ce3760 100644 ---- a/third_party/grpc/src/core/lib/gpr/log_posix.cc -+++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc -@@ -31,7 +31,7 @@ - #include - #include - --static intptr_t gettid(void) { return (intptr_t)pthread_self(); } -+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } - - void gpr_log(const char* file, int line, gpr_log_severity severity, - const char* format, ...) { -@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { - char* prefix; - gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", - gpr_log_severity_string(args->severity), time_buffer, -- (int)(now.tv_nsec), gettid(), display_file, args->line); -+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); - - fprintf(stderr, "%-70s %s\n", prefix, args->message); - gpr_free(prefix); -diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc -index c2d80c08ddb..4a83cb6c215 100644 ---- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc -+++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc -@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, - } - - #ifndef NDEBUG --static long gettid(void) { return syscall(__NR_gettid); } -+static long sys_gettid(void) { return syscall(__NR_gettid); } - #endif - - /* pollset->mu lock must be held by the caller before calling this. -@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, - #define WORKER_PTR (&worker) - #endif - #ifndef NDEBUG -- WORKER_PTR->originator = gettid(); -+ WORKER_PTR->originator = sys_gettid(); - #endif - if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { - gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json deleted file mode 100644 index 7cf939daa72..00000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json +++ /dev/null @@ -1,506 +0,0 @@ -{ - "0.16.2.zip": { - "name": "0.16.2.zip", - "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", - "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" - ] - }, - "0.28.3.tar.gz": { - "name": "0.28.3.tar.gz", - "sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz" - ] - }, - "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { - "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" - ] - }, - "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { - "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" - ] - }, - "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { - "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { - "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", - "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", - "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" - ] - }, - "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": { - "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" - ] - }, - "android_tools_pkg-0.12.tar.gz": { - "name": "android_tools_pkg-0.12.tar.gz", - "sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31", - "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz" - ] - }, - "bazel_j2objc": { - "name": "bazel_j2objc", - "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", - "strip_prefix": "j2objc-2.5", - "urls": [ - "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", - "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" - ] - }, - "bazel_skylib": { - "name": "bazel_skylib", - "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", - "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" - ] - }, - "bazel_toolchains": { - "name": "bazel_toolchains", - "sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff", - "strip_prefix": "bazel-toolchains-0.28.3", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz" - ] - }, - "build_bazel_rules_nodejs": { - "name": "build_bazel_rules_nodejs", - "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", - "strip_prefix": "rules_nodejs-0.16.2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", - "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" - ] - }, - "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": { - "name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" - ] - }, - "com_google_googletest": { - "name": "com_google_googletest", - "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", - "strip_prefix": "googletest-release-1.10.0", - "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", - "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" - ] - }, - "coverage_output_generator-v2.0.zip": { - "name": "coverage_output_generator-v2.0.zip", - "sha256": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip" - ] - }, - "desugar_jdk_libs": { - "name": "desugar_jdk_libs", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { - "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", - "urls": [ - "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", - "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" - ] - }, - "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": { - "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", - "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" - ] - }, - "io_bazel_rules_sass": { - "name": "io_bazel_rules_sass", - "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", - "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", - "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" - ] - }, - "io_bazel_skydoc": { - "name": "io_bazel_skydoc", - "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", - "strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" - ] - }, - "java_tools_javac11_darwin-v6.1.zip": { - "name": "java_tools_javac11_darwin-v6.1.zip", - "sha256": "f0c488dac18f18ab1a0d18bbd65288c7a128e90a24d9c16f65bd8243f79483a0", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_darwin-v6.1.zip" - ] - }, - "java_tools_javac11_linux-v6.1.zip": { - "name": "java_tools_javac11_linux-v6.1.zip", - "sha256": "12f7940ed0bc4c2e82238951cdf19b4179c7dcc361d16fe40fe4266538fb4ac6", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_linux-v6.1.zip" - ] - }, - "java_tools_javac11_windows-v6.1.zip": { - "name": "java_tools_javac11_windows-v6.1.zip", - "sha256": "e2deb2efff684de78787e0bdc7620f9672d13f04a12856d8e7f677369a8e286b", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_windows-v6.1.zip" - ] - }, - "java_tools_langtools_javac10": { - "name": "java_tools_langtools_javac10", - "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" - ] - }, - "java_tools_langtools_javac11": { - "name": "java_tools_langtools_javac11", - "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" - ] - }, - "java_tools_langtools_javac12": { - "name": "java_tools_langtools_javac12", - "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" - ] - }, - "java_tools_langtools_javac9": { - "name": "java_tools_langtools_javac9", - "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", - "urls": [ - "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" - ] - }, - "jdk10-server-release-1804.tar.xz": { - "name": "jdk10-server-release-1804.tar.xz", - "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be", - "urls": [ - "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz" - ] - }, - "jdk9-server-release-1708.tar.xz": { - "name": "jdk9-server-release-1708.tar.xz", - "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", - "urls": [ - "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" - ] - }, - "openjdk10_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk10_linux_archive", - "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f", - "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz" - ] - }, - "openjdk11_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk11_linux_archive", - "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48", - "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz" - ] - }, - "openjdk12_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk12_linux_archive", - "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", - "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" - ] - }, - "openjdk9_linux_archive": { - "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", - "name": "openjdk9_linux_archive", - "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8", - "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz" - ] - }, - "openjdk_linux": { - "downloaded_file_path": "zulu-linux.tar.gz", - "name": "openjdk_linux", - "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz" - ] - }, - "openjdk_linux_aarch64": { - "downloaded_file_path": "zulu-linux-aarch64.tar.gz", - "name": "openjdk_linux_aarch64", - "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" - ] - }, - "openjdk_linux_aarch64_minimal": { - "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", - "name": "openjdk_linux_aarch64_minimal", - "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" - ] - }, - "openjdk_linux_aarch64_vanilla": { - "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", - "name": "openjdk_linux_aarch64_vanilla", - "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" - ] - }, - "openjdk_linux_minimal": { - "downloaded_file_path": "zulu-linux-minimal.tar.gz", - "name": "openjdk_linux_minimal", - "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz" - ] - }, - "openjdk_linux_vanilla": { - "downloaded_file_path": "zulu-linux-vanilla.tar.gz", - "name": "openjdk_linux_vanilla", - "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" - ] - }, - "openjdk_macos": { - "downloaded_file_path": "zulu-macos.tar.gz", - "name": "openjdk_macos", - "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz" - ] - }, - "openjdk_macos_minimal": { - "downloaded_file_path": "zulu-macos-minimal.tar.gz", - "name": "openjdk_macos_minimal", - "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz" - ] - }, - "openjdk_macos_vanilla": { - "downloaded_file_path": "zulu-macos-vanilla.tar.gz", - "name": "openjdk_macos_vanilla", - "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" - ] - }, - "openjdk_win": { - "downloaded_file_path": "zulu-win.zip", - "name": "openjdk_win", - "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip" - ] - }, - "openjdk_win_minimal": { - "downloaded_file_path": "zulu-win-minimal.zip", - "name": "openjdk_win_minimal", - "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip" - ] - }, - "openjdk_win_vanilla": { - "downloaded_file_path": "zulu-win-vanilla.zip", - "name": "openjdk_win_vanilla", - "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" - ] - }, - "platforms": { - "name": "platforms", - "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", - "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" - ] - }, - "rules_cc": { - "name": "rules_cc", - "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", - "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" - ] - }, - "rules_java": { - "name": "rules_java", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, - "rules_pkg": { - "name": "rules_pkg", - "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" - ] - }, - "rules_pkg-0.2.0.tar.gz": { - "name": "rules_pkg-0.2.0.tar.gz", - "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", - "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" - ] - }, - "rules_proto": { - "name": "rules_proto", - "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", - "strip_prefix": "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", - "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz" - ] - }, - "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { - "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", - "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz" - ] - }, - "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": { - "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz", - "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz" - ] - }, - "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": { - "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip", - "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip" - ] - }, - "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": { - "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz", - "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz" - ] - }, - "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": { - "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz", - "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz" - ] - }, - "zulu11.2.3-jdk11.0.1-win_x64.zip": { - "name": "zulu11.2.3-jdk11.0.1-win_x64.zip", - "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip" - ] - }, - "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": { - "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz", - "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" - ] - }, - "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": { - "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip", - "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" - ] - }, - "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": { - "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip", - "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" - ] - }, - "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": { - "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz", - "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" - ] - }, - "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { - "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", - "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz" - ] - }, - "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": { - "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz", - "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz" - ] - }, - "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": { - "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip", - "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed", - "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip" - ] - } -} diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index 79f5a447888..959beea1fbc 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -1,26 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "compile-daemon-unstable"; - version = "2017-03-08"; - rev = "d447e567232bcb84cedd3b2be012c7127f31f469"; - - goPackagePath = "github.com/githubnemo/CompileDaemon"; +buildGoModule rec { + pname = "compile-daemon"; + version = "1.4.0"; src = fetchFromGitHub { owner = "githubnemo"; repo = "CompileDaemon"; - inherit rev; - sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc"; + rev = "v${version}"; + sha256 = "sha256-gpyXy7FO7ZVXJrkzcKHFez4S/dGiijXfZ9eSJtNlm58="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-UDPOeg8jQbDB+Fr4x6ehK7UyQa8ySZy6yNxS1xotkgA="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Very simple compile daemon for Go"; + homepage = "https://github.com/githubnemo/CompileDaemon"; license = licenses.bsd2; maintainers = with maintainers; [ ]; mainProgram = "CompileDaemon"; - inherit (src.meta) homepage; }; } diff --git a/pkgs/development/tools/compile-daemon/deps.nix b/pkgs/development/tools/compile-daemon/deps.nix deleted file mode 100644 index 53771ddad9f..00000000000 --- a/pkgs/development/tools/compile-daemon/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23"; - sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18"; - sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "57fdcb988a5c543893cc61bce354a6e24ab70022"; - sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "99f16d856c9836c42d24e7ab64ea72916925fa97"; - sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "629574ca2a5df945712d3079857300b5e4da0236"; - sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; - }; - } -] diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index fa4f9ea4384..2bd5789c3e3 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-p3EzJLq+LH8G8P7x6+47XWn8ckFeW2O7xhQGoRQDOOQ="; + sha256 = "sha256-fPg3376QtbjrUJWZxjRqEFL2cWy1xb7vUX1Lfp5WFmY="; }; - vendorSha256 = "sha256-WFR0DtOz4dteRWWaqjTIiyTpBTnH6qKivH9t+gRWsvg="; + vendorSha256 = "sha256-/RfIjCI2RMktUSVEoyJqMwdmlW6lGvXanX7RBxiaTyE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 3c48506a6bf..5b6ec28f812 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -26,6 +26,7 @@ let in stdenv.mkDerivation rec { pname = "laminar"; version = "1.2"; + outputs = [ "out" "doc" ]; src = fetchFromGitHub { owner = "ohwgiles"; repo = "laminar"; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 20646fa696d..22102b9a3bb 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.26.0"; + version = "0.27.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-s8M7xQTADPVRGM3Cu2jmNrdMWBRKNLWsRlXnnB+FHH4="; + sha256 = "sha256-F/uO4hkVL0PczR59TxCTSOOKnQQQoxvAD8b1p1YdcjY="; }; - cargoSha256 = "sha256-UaD85fCWWYyDNF/HiWDRVpQD0snhiQtEWfIq7GSoZts="; + cargoSha256 = "sha256-B9nVsm/ml2hm+Yr6io4tf4JQsPRCtG7dBJQvF2WwWm0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index 110cdbfabc9..af6b72c65fd 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -1,23 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "go-junit-report-unstable"; - version = "2018-06-14"; - rev = "385fac0ced9acaae6dc5b39144194008ded00697"; - - goPackagePath = "github.com/jstemmer/go-junit-report"; +buildGoModule rec { + pname = "go-junit-report"; + version = "1.0.0"; src = fetchFromGitHub { - inherit rev; owner = "jstemmer"; repo = "go-junit-report"; - sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; + rev = "v${version}"; + sha256 = "sha256-/ER99EmYrERBjcJeYeV3GBq6lDjACM0loICg41hUuPQ="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; - homepage = "https://${goPackagePath}"; + description = "Convert go test output to junit xml"; + homepage = "https://github.com/jstemmer/go-junit-report"; + license = licenses.mit; maintainers = with maintainers; [ cryptix ]; - license = licenses.mit; }; } diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index 255ecf798d8..221c5a0d12d 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -1,4 +1,8 @@ -{ fetchFromGitHub, lib, stdenv, cmake }: +{ fetchFromGitHub, lib, stdenv, cmake, buildPackages, asciidoc, libxslt }: + +let + isCrossCompiling = stdenv.hostPlatform != stdenv.buildPlatform; +in stdenv.mkDerivation rec { pname = "scas"; @@ -12,10 +16,18 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; - + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables" + ''; strictDeps = true; - nativeBuildInputs = [ cmake ]; + depsBuildBuild = lib.optionals isCrossCompiling [ buildPackages.knightos-scas ]; + nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; + postInstall = '' + cd .. + make DESTDIR=$out install_man + ''; meta = with lib; { homepage = "https://knightos.org/"; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index adee94dafa9..fa867c26316 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; platforms = platforms.linux; + # https://lists.fedorahosted.org/pipermail/elfutils-devel/2014-November/004223.html + broken = stdenv.hostPlatform.isStatic; # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, # but since this package isn't split that way, all three are listed. license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 9e6d846e80a..995a6bb9cdb 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gtk2, pkg-config }: +{lib, stdenv, fetchurl, fetchpatch, gtk2, pkg-config }: stdenv.mkDerivation rec { pname = "gtkdialog"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; + patches = [ + # Pull Gentoo patch for -fno-common toolchain fix. + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch?id=98692e4c4ad494b88c4902ca1ab3e6541190bbe8"; + sha256 = "1mh01krzpfy7lbbqx3xm71xsiqqgg67w4snv794wspfqkk2hicvz"; + }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ]; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index f7d1667dfa2..05c65869717 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, gettext }: +{ lib, stdenv, fetchurl, perlPackages, gettext, libintl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ gettext perlPackages.perl perlPackages.LocaleGettext ]; - buildInputs = [ perlPackages.LocaleGettext ]; + buildInputs = [ perlPackages.LocaleGettext libintl ]; + + configureFlags = [ + "--enable-nls" + ]; doCheck = false; # target `check' is missing diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index e587a2ef4e7..515c7dc4c37 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -13,9 +13,6 @@ in remove-references-to \ -t ${haskellPackages.pandoc-types} \ $out/bin/pandoc - remove-references-to \ - -t ${haskellPackages.HTTP} \ - $out/bin/pandoc ''; }) static).overrideAttrs (drv: { # These libraries are still referenced, because they generate @@ -25,5 +22,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ]; + disallowedReferences = [ haskellPackages.pandoc-types ]; }) diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix deleted file mode 100644 index 5093553824d..00000000000 --- a/pkgs/development/tools/phantomjs2/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg -, libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase -, darwin, writeScriptBin, cups, makeWrapper -}: - -let - fakeClang = writeScriptBin "clang" '' - #!${stdenv.shell} - if [[ "$@" == *.c ]]; then - exec "${stdenv.cc}/bin/clang" "$@" - else - exec "${stdenv.cc}/bin/clang++" "$@" - fi - ''; - -in stdenv.mkDerivation rec { - pname = "phantomjs"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "ariya"; - repo = "phantomjs"; - rev = version; - sha256 = "1zsbpk1sgh9a16f1a5nx3qvk77ibjn812wqkxqck8n6fia85m5iq"; - }; - - nativeBuildInputs = [ qmake makeWrapper ]; - buildInputs = [ - bison flex fontconfig freetype gperf icu openssl - libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - AGL ApplicationServices AppKit Cocoa OpenGL - darwin.libobjc fakeClang cups - ]); - - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch"; - sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5"; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch"; - sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb"; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch"; - sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6"; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch"; - sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8"; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch"; - sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; - }) - (fetchpatch { - url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch"; - sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03"; - }) - ./system-qtbase.patch - ]; - - postPatch = '' - patchShebangs . - substituteInPlace src/phantomjs.pro \ - --replace "QT_MINOR_VERSION, 5" "QT_MINOR_VERSION, 9" - ''; - - # Avoids error in webpage.cpp:80:89: - # invalid suffix on literal; C++11 requires a space between litend identifier - NIX_CFLAGS_COMPILE = "-Wno-reserved-user-defined-literal"; - - __impureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib"; - - dontWrapQtApps = true; - - installPhase = '' - mkdir -p $out/share/doc/phantomjs - cp -a bin $out - cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change \ - ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \ - /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \ - -change \ - ${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \ - /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \ - $out/bin/phantomjs - '' + '' - wrapProgram $out/bin/phantomjs \ - --set QT_QPA_PLATFORM offscreen \ - --prefix PATH : ${lib.makeBinPath [ qtbase ]} - ''; - - meta = with lib; { - description = "Headless WebKit with JavaScript API"; - longDescription = '' - PhantomJS2 is a headless WebKit with JavaScript API. - It has fast and native support for various web standards: - DOM handling, CSS selector, JSON, Canvas, and SVG. - - PhantomJS is an optimal solution for: - - Headless Website Testing - - Screen Capture - - Page Automation - - Network Monitoring - ''; - - homepage = "https://phantomjs.org/"; - license = licenses.bsd3; - - maintainers = [ maintainers.aflatter ]; - platforms = platforms.darwin ++ platforms.linux; - }; -} diff --git a/pkgs/development/tools/phantomjs2/system-qtbase.patch b/pkgs/development/tools/phantomjs2/system-qtbase.patch deleted file mode 100644 index 743372b0f0b..00000000000 --- a/pkgs/development/tools/phantomjs2/system-qtbase.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/build.py -+++ b/build.py -@@ -80,9 +80,9 @@ - def qmakePath(): - exe = "qmake" - if platform.system() == "Windows": - exe += ".exe" -- return os.path.abspath("src/qt/qtbase/bin/" + exe) -+ return os.path.abspath("@qtbase@" + exe) - - # returns paths for 3rd party libraries (Windows only) - def findThirdPartyDeps(): - include_dirs = [] diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 2ac48148c78..30c6dee23bf 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -19,15 +19,15 @@ }: let - buildNum = "2022-01-18-884"; + buildNum = "2022-04-20-920"; in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.12"; + version = "1.13"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - sha256 = "88ot16N8XtRlDCP+zIaOqG5BuR0OyG/0u1NEXsun/nY="; + hash = "sha256-/Z7mSZVAvaTAY9RU7suK/gA0RJIeeLdN6LWiseVq9Js="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 28511223be0..808fa580db3 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,7 +1,14 @@ -{ stdenv, lib, fetchFromGitHub -, rustPlatform, pkg-config, openssl -# darwin dependencies -, Security, CoreFoundation, libiconv +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl + # darwin dependencies +, Security +, CoreFoundation +, libiconv +, curl }: rustPlatform.buildRustPackage rec { @@ -16,15 +23,11 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "sha256-i7xDEzZAN2ubW1Q6MhY+xsb9XiUajNDHLdtDuO5r6jA="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - nativeBuildInputs = [ pkg-config ]; - - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # CFURLSetResourcePropertyForKey is defined in the headers but there's no - # corresponding implementation in the sources from opensource.apple.com. - preConfigure = lib.optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" - ''; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; + nativeBuildInputs = [ pkg-config ] + # curl-sys wants to run curl-config on darwin + ++ lib.optionals stdenv.isDarwin [ curl.dev ]; # skip tests with networking or other failures checkFlags = [ diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 2959342af5a..8275004c703 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, nodejs, phantomjs2, pkgs }: +{ stdenv, lib, fetchFromGitHub, nodejs, pkgs }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-zhHuW4pBqXQEBlSxuyvHKh+ftyIdcqpYgIZZHArUtns="; }; - buildInputs = [ nodejs phantomjs2 ] ++ (with nodePackages; [ + buildInputs = [ nodejs ] ++ (with nodePackages; [ marked browserify uglify-js diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index def25474147..638334f44a5 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -1,4 +1,4 @@ -{ stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }: +{ stdenv, apulse, libpulseaudio, pkg-config, intltool }: stdenv.mkDerivation { pname = "libpressureaudio"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = libpulseaudio.src; - nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index b095d61d987..c084b45d151 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xow"; - version = "0.5"; + version = "unstable-2022-04-24"; src = fetchFromGitHub { owner = "medusalix"; repo = "xow"; - rev = "v${version}"; - sha256 = "071r2kx44k1sc49cad3i607xg618mf34ki1ykr5lnfx9y6qyz075"; + rev = "d335d6024f8380f52767a7de67727d9b2f867871"; + sha256 = "0q5nr21p4dlx2a99hiivwz6qj9anrqqsdhiz6xi375yqkxis4251"; }; firmware = fetchurl { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILD=RELEASE" - "VERSION=${version}" + "VERSION=${version}-${src.rev}" "BINDIR=${placeholder "out"}/bin" "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" "MODLDIR=${placeholder "out"}/lib/modules-load.d" diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 327cf286234..28344c3fc5a 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2, fetchpatch, callPackage, bash, buildPackages +, libiconv, ijs, lcms2, callPackage, bash, buildPackages, openjpeg , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups , x11Support ? cupsSupport, xlibsWrapper # with CUPS, X11 only adds very little }: @@ -30,19 +30,14 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}"; - version = "9.55.0"; + version = "9.56.1"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/ghostscript-${version}.tar.xz"; - sha512 = "27g72152mlwlalg232jxdhaf3ykgmqwi2pccbkwfygql1h9iz40plfbwbs1n0fkvm4zwzg5r9cr8g7w2dxih4jldiidv7rflxdy1is2"; + sha512 = "22ysgdprh960rxmxyk2fy2my47cdrhfhbrwar1955hvad54iw79l916drp92wh3qzbxw6z40i70wk00vz8bn2ryig7qgpc1q01m2npy"; }; patches = [ - (fetchpatch { - name = "fix-non-vendored-lcms2-typo.patch"; - url = "https://github.com/ArtifexSoftware/ghostpdl/commit/830afae5454dea3bff903869d82022306890a96c.patch"; - sha256 = "1w9yspsgxyabvrw9ld6pv6pb7708c44ihjqvag7qqh9v1lhm48j0"; - }) ./urw-font-files.patch ./doc-no-ref.diff ]; @@ -61,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib expat openssl libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec - libiconv ijs lcms2 bash + libiconv ijs lcms2 bash openjpeg ] ++ lib.optional x11Support xlibsWrapper ++ lib.optional cupsSupport cups @@ -72,8 +67,7 @@ stdenv.mkDerivation rec { export CCAUX=$CC_FOR_BUILD ${lib.optionalString cupsSupport ''export CUPSCONFIG="${cups.dev}/bin/cups-config"''} - # requires in-tree (heavily patched) openjpeg - rm -rf jpeg libpng zlib jasper expat tiff lcms2mt jbig2dec freetype cups/libs ijs + rm -rf jpeg libpng zlib jasper expat tiff lcms2mt jbig2dec freetype cups/libs ijs openjpeg sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index d6e5e8a7bcb..fc874e3d3a8 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -362,6 +362,13 @@ in { ubootQemuRiscv64Smode = buildUBoot { defconfig = "qemu-riscv64_smode_defconfig"; + extraPatches = [ + # https://patchwork.ozlabs.org/project/uboot/patch/20220128134713.2322800-1-alexandre.ghiti@canonical.com/ + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/283391/mbox/"; + sha256 = "sha256-V0jDpx6O4bFzuaOQejdrRnLiWb5LBTx47T0TZqNtMXk="; + }) + ]; extraMeta.platforms = ["riscv64-linux"]; filesToInstall = ["u-boot.bin"]; }; diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index c729ee6010c..32a7f20befd 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,14 +1,22 @@ -{lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, unzip +}: stdenv.mkDerivation rec { pname = "goku"; - version = "0.3.6"; + version = "0.5.1"; src = fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; - sha256 = "1pss1k2slbqzpfynik50pdk4jsaiag4abhmr6kadmaaj18mfz7ai"; + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; + sha256 = "7c9304a5b4265575ca154bc0ebc04fcf812d14981775966092946cf82f65c782"; }; + nativeBuildInputs = [ + unzip + ]; + sourceRoot = "."; installPhase = '' diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 1f6fb31d93d..1d93174ec65 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , alsa-lib , dbus , ell @@ -49,6 +50,17 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; + patches = [ + # https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5 + # which fixes https://github.com/bluez/bluez/issues/329 + # and is already merged upstream and not yet in a release. + (fetchpatch { + name = "StateDirectory_and_ConfigurationDirectory.patch"; + url = "https://github.com/bluez/bluez/commit/0905a06410d4a5189f0be81e25eb3c3e8a2199c5.patch"; + sha256 = "sha256-MI6yPTiDLHsSTjLvNqtWnuy2xUMYpSat1WhMbeoedSM="; + }) + ]; + postPatch = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 3caf41cfca5..bbb3a1daab6 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { # Upstream fix https://github.com/netblue30/firejail/pull/5131 # Upstream hopefully fixed in later versions > 0.9.68 ./whitelist-nix-profile.patch + + # Fix OpenGL support for various applications including Firefox + # Issue: https://github.com/NixOS/nixpkgs/issues/55191 + # Upstream fix: https://github.com/netblue30/firejail/pull/5132 + # Hopefully fixed upstream in version > 0.9.68 + ./fix-opengl-support.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/fix-opengl-support.patch b/pkgs/os-specific/linux/firejail/fix-opengl-support.patch new file mode 100644 index 00000000000..9fd18aad3fd --- /dev/null +++ b/pkgs/os-specific/linux/firejail/fix-opengl-support.patch @@ -0,0 +1,7 @@ +--- a/etc/inc/whitelist-run-common.inc.org 2022-05-07 11:27:32.264849186 +0200 ++++ b/etc/inc/whitelist-run-common.inc 2022-05-07 11:27:55.577778211 +0200 +@@ -13,3 +13,4 @@ + whitelist /run/systemd/resolve/resolv.conf + whitelist /run/systemd/resolve/stub-resolv.conf + whitelist /run/udev/data ++whitelist /run/opengl-driver # NixOS diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index 118a17c4c8f..d20fb662ff5 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -79,6 +79,11 @@ stdenv.mkDerivation rec { buildInputs = [ libg15 libg15render ]; + # Workaround build failure on -fno-common toolchains like upstream gcc-10: + # ld: g15_plugins.o:/build/g15daemon-1.9.5.3/g15daemon/./g15daemon.h:218: + # multiple definition of `lcdlist_mutex'; utility_funcs.o:g15daemon.h:218: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + enableParallelBuilding = true; meta = { diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 4c89d8c8219..4d08a38dbe8 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ check pam ]; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit"; nativeBuildInputs = [ autoreconfHook pkg-config flex ]; passthru.tests = { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e130abbf27f..9e914132ef2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -666,6 +666,18 @@ stdenv.mkDerivation { rm -rf $out/share/doc ''; + # Avoid *.EFI binary stripping. At least on aarch64-linux strip + # removes too much from PE32+ files: + # https://github.com/NixOS/nixpkgs/issues/169693 + # The hack is to move EFI file out of lib/ before doStrip + # run and return it after doStrip run. + preFixup = lib.optionalString withEfi '' + mv $out/lib/systemd/boot/efi $out/dont-strip-me + ''; + postFixup = lib.optionalString withEfi '' + mv $out/dont-strip-me $out/lib/systemd/boot/efi + ''; + passthru = { # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is @@ -687,6 +699,8 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 + broken = stdenv.hostPlatform.isStatic; priority = 10; maintainers = with maintainers; [ flokli kloenk mic92 ]; }; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 3efb3914b85..efd75ce9b3f 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng , ncursesSupport ? true , ncurses, pam -, systemdSupport ? stdenv.isLinux +, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , systemd , nlsSupport ? true }: diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index a9cc266f6c5..b630ed4749f 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = kernel.kernelOlder "4.19"; description = "Experimental implementation of a kvmclock-derived clocksource for Linux guests under OpenBSD's hypervisor"; homepage = "https://github.com/voutilad/vmm_clock"; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index c6d66427ab2..d3647264bec 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,15 +1,47 @@ -{ lib, stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: - -let +{ lib, stdenv +, fetchpatch +, fetchurl +, boost +, cmake +, libuuid +, python3 +, ruby +}: + +stdenv.mkDerivation rec { pname = "qpid-cpp"; - name = "${pname}-${version}"; version = "1.39.0"; src = fetchurl { - url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz"; - sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r"; + url = "mirror://apache/qpid/cpp/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-eYDQ6iHVV1WUFFdyHGnbqGIjE9CrhHzh0jP7amjoDSE="; }; + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ boost libuuid ruby ]; + + patches = [ + (fetchpatch { + name = "python3-managementgen"; + url = "https://github.com/apache/qpid-cpp/commit/0e558866e90ef3d5becbd2f6d5630a6a6dc43a5d.patch"; + hash = "sha256-pV6xx8Nrys/ZxIO0Z/fARH0ELqcSdTXLPsVXYUd3f70="; + }) + ]; + + # the subdir managementgen wants to install python stuff in ${python} and + # the installation tries to create some folders in /var + postPatch = '' + sed -i '/managementgen/d' CMakeLists.txt + sed -i '/ENV/d' src/CMakeLists.txt + sed -i '/management/d' CMakeLists.txt + ''; + + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-error=deprecated-copy" + ]); + meta = with lib; { homepage = "https://qpid.apache.org"; description = "An AMQP message broker and a C++ messaging API"; @@ -17,41 +49,4 @@ let platforms = platforms.linux; maintainers = with maintainers; [ cpages ]; }; - - qpid-cpp = stdenv.mkDerivation { - inherit src meta pname version; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libuuid ruby python2 ]; - - # the subdir managementgen wants to install python stuff in ${python} and - # the installation tries to create some folders in /var - postPatch = '' - sed -i '/managementgen/d' CMakeLists.txt - sed -i '/ENV/d' src/CMakeLists.txt - sed -i '/management/d' CMakeLists.txt - ''; - - NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=deprecated-declarations" - "-Wno-error=int-in-bool-context" - "-Wno-error=maybe-uninitialized" - "-Wno-error=unused-function" - "-Wno-error=ignored-qualifiers" - "-Wno-error=catch-value" - ] ++ lib.optionals stdenv.cc.isGNU [ - "-Wno-error=deprecated-copy" - ]); - }; - - python-frontend = buildPythonPackage { - inherit pname version meta src; - - sourceRoot = "${name}/management/python"; - - propagatedBuildInputs = [ qpid-python ]; - }; -in buildEnv { - name = "${name}-env"; - paths = [ qpid-cpp python-frontend ]; } diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 12ba281d811..dd5967a2407 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y="; }) ]; + postPatch = '' + substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' "" + ''; + meta = with lib; { description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity"; homepage = "https://www.inet.no/dante/"; diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index 97b74d2c613..ffd16c3b1fd 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0qqp05258s2ybzbxfklhya8zw9ha9crkxzwls2kfdhndlrdpgznl" +"1c8f7y580sq9495l2cxb2jkhgqs2wf0j3x073l1xnr9lv6crfvhn" diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index 8320adbf025..4f0805462ac 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.1.0" +"2.1.4" diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index eb73ce1c35b..9b27099f98c 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -18,19 +18,19 @@ }; } { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; + name = "_babel_code_frame___code_frame_7.16.0.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + name = "_babel_code_frame___code_frame_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz"; + sha1 = "0dfc80309beec8411e65e706461c408b0bb9b431"; }; } { - name = "_babel_compat_data___compat_data_7.13.12.tgz"; + name = "_babel_compat_data___compat_data_7.16.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz"; - sha1 = "a8a5ccac19c200f9dd49624cac6e19d7be1236a1"; + name = "_babel_compat_data___compat_data_7.16.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz"; + sha1 = "081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"; }; } { @@ -42,395 +42,259 @@ }; } { - name = "_babel_core___core_7.11.6.tgz"; + name = "_babel_core___core_7.16.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.11.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz"; - sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651"; + name = "_babel_core___core_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz"; + sha1 = "c4ff44046f5fe310525cc9eb4ef5147f0c5374d4"; }; } { - name = "_babel_core___core_7.13.13.tgz"; + name = "_babel_eslint_parser___eslint_parser_7.16.3.tgz"; path = fetchurl { - name = "_babel_core___core_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.13.13.tgz"; - sha1 = "bc44c4a2be2288ec4ddf56b66fc718019c76ac29"; + name = "_babel_eslint_parser___eslint_parser_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.3.tgz"; + sha1 = "2a6b1702f3f5aea48e00cea5a5bcc241c437e459"; }; } { - name = "_babel_generator___generator_7.11.6.tgz"; + name = "_babel_generator___generator_7.16.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.11.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; - sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; + name = "_babel_generator___generator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz"; + sha1 = "d40f3d1d5075e62d3500bccb67f3daa8a95265b2"; }; } { - name = "_babel_generator___generator_7.13.9.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.13.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz"; - sha1 = "3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; + sha1 = "9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"; + sha1 = "f1a686b92da794020c26582eb852e9accd0d7882"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.3.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha1 = "0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; + sha1 = "5b480cd13f68363df6ec4dc8ac8e2da11363cbf0"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha1 = "6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"; + sha1 = "090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.13.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz"; - sha1 = "2b2972a0926474853f41e4adbc69338f520600e5"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; + sha1 = "06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.0.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz"; - sha1 = "30d30a005bca2c953f5653fc25091a492177f4f6"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz"; + sha1 = "c5b10cf4b324ff840140bb07e05b8564af2ae971"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; - sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; + sha1 = "753017337a15f46f9c09f674cff10cee9b9d7778"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.17.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; - sha1 = "a2ac87e9e319269ac655b8d4415e94d38d663cb7"; + name = "_babel_helper_function_name___helper_function_name_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; + sha1 = "b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481"; }; } { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz"; - sha1 = "3c2f91b7971b9fc11fe779c945c014065dea340e"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; + sha1 = "0088c7486b29a9cb5d948b1a1de46db66e089cfa"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; - sha1 = "17b5c59ff473d9f956f40ef570cf3a76ca12657f"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; + sha1 = "4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"; + sha1 = "29287040efd197c77636ef75188e81da8bccd5a4"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; + sha1 = "90538e60b672ecf1b448f5f4f5433d37e79a3ec3"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"; + sha1 = "1c82a8dd4cb34577502ebd2909699b194c3e9bb5"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; + sha1 = "cecdb145d70c54096b1564f8e9f10cd7d193b338"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha1 = "5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.4.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz"; + sha1 = "5d7902f61349ff6b963e07f06a389ce139fbfe6e"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"; + sha1 = "73055e8d3cf9bcba8ddb55cad93fedc860f68f17"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; + name = "_babel_helper_simple_access___helper_simple_access_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; + sha1 = "21d6a27620e383e37534cf6c10bba019a6f90517"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; + sha1 = "0ee3388070147c3ae051e487eca3ebb0e2e8bb09"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; + sha1 = "29672f43663e936df370aaeb22beddb3baec7438"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.13.12.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz"; - sha1 = "600e58350490828d82282631a1422268e982ba96"; + 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_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha1 = "50dc96413d594f995a77905905b05893cd779673"; + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"; + sha1 = "b3cf318afce774dfe75b86767cd6d68f3482e57c"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + name = "_babel_helpers___helpers_7.16.3.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha1 = "2f75a831269d4f677de49986dff59927533cf375"; + name = "_babel_helpers___helpers_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.3.tgz"; + sha1 = "27fc64f40b996e7074dc73128c3e5c3e7f55c43c"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + name = "_babel_highlight___highlight_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; + name = "_babel_highlight___highlight_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz"; + sha1 = "6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a"; }; } { - name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; + name = "_babel_parser___parser_7.16.4.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; - sha1 = "32dfbb79899073c415557053a19bd055aae50ae0"; + name = "_babel_parser___parser_7.16.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz"; + sha1 = "d5f92f57cf2c74ffe9b37981c0e72fee7311372e"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.2.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha1 = "376a760d9f7b4b2077a9dd05aa9c3927cadb2209"; + name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz"; + sha1 = "2977fca9b212db153c195674e57cfab807733183"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.0.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz"; + sha1 = "358972eaab006f5eb0826183b0c93cbcaf13e1e2"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; - sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; - }; - } - { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; - path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; - }; - } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; - }; - } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; - }; - } - { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; - path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; - }; - } - { - name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha1 = "bdb5c66fda8526ec235ab894ad53a1235c79fcc4"; - }; - } - { - name = "_babel_helpers___helpers_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helpers___helpers_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz"; - sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044"; - }; - } - { - name = "_babel_helpers___helpers_7.13.10.tgz"; - path = fetchurl { - name = "_babel_helpers___helpers_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz"; - sha1 = "fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"; - }; - } - { - name = "_babel_highlight___highlight_7.10.4.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; - }; - } - { - name = "_babel_highlight___highlight_7.13.10.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz"; - sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; - }; - } - { - name = "_babel_parser___parser_7.11.5.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; - sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; - }; - } - { - name = "_babel_parser___parser_7.13.13.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_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha1 = "a3484d84d0b549f3fc916b99ee4783f26fabad2a"; - }; - } - { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; - sha1 = "87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.16.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz"; + sha1 = "e606eb6015fec6fa5978c940f315eae4e300b081"; }; } { @@ -442,11 +306,19 @@ }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"; + sha1 = "c029618267ddebc7280fa286e0f8ca2a278a2d1a"; + }; + } + { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz"; + sha1 = "5296942c564d8144c83eea347d0aa8a0b89170e7"; }; } { @@ -458,35 +330,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; - sha1 = "876a1f6966e1dec332e8c9451afda3bebcdf2e1d"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"; + sha1 = "783eca61d50526202f9b296095453977e88659f1"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; - sha1 = "393be47a4acd03fa2af6e3cde9b06e33de1b446d"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"; + sha1 = "9c01dee40b9d6b847b656aaf4a3976a71740f222"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; - sha1 = "bf1fb362547075afda3634ed31571c5901afef7b"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"; + sha1 = "cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; - sha1 = "93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"; + sha1 = "a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd"; }; } { @@ -498,11 +370,11 @@ }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; - sha1 = "3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"; + sha1 = "44e1cce08fe2427482cf446a91bb451528ed0596"; }; } { @@ -514,27 +386,27 @@ }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; - sha1 = "bd9da3188e787b5120b4f9d465a8261ce67ed1db"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"; + sha1 = "5d418e4fbbf8b9b7d03125d3a52730433a373734"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; - sha1 = "5d210a4d727d6ce3b18f9de82cc99a3964eed60a"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"; + sha1 = "5fb32f6d924d6e6712810362a60e12a2609872e6"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; - sha1 = "3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"; + sha1 = "5910085811ab4c28b00d6ebffa4ab0274d1e5f16"; }; } { @@ -546,35 +418,35 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; - sha1 = "ba9feb601d422e0adea6760c2bd6bbb7bfec4866"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"; + sha1 = "56dbc3970825683608e9efb55ea82c2a2d6c8dc0"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"; + sha1 = "b4dafb9c717e4301c5776b30d080d6383c89aff6"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha1 = "bebde51339be829c17aaaaced18641deb62b39ba"; + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz"; + sha1 = "69e935b2c5c79d2488112d886f0c4e2790fee76f"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; - sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"; + sha1 = "890482dfc5ea378e42e19a71e709728cabf18612"; }; } { @@ -602,11 +474,19 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz"; - sha1 = "fac829bf3c7ef4a1bc916257b403e58c6bdaf648"; + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; + sha1 = "195df89b146b4b78b3bf897fd7a257c84659d406"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.16.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.0.tgz"; + sha1 = "eb8d811cdd1060f6ac3c00956bf3f6335505a32f"; }; } { @@ -626,11 +506,11 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.13.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; - sha1 = "5df9962503c0a9c918381c929d51d4d6949e7e86"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.0.tgz"; + sha1 = "07427021d093ed77019408221beaf0272bbcfaec"; }; } { @@ -650,11 +530,11 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; - sha1 = "044fb81ebad6698fe62c478875575bcbb9b70f15"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz"; + sha1 = "f9624394317365a9a88c82358d3f8471154698f1"; }; } { @@ -706,115 +586,107 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; - }; - } - { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; - sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d"; + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; + sha1 = "0dc6671ec0ea22b6e94a1114f857970cd39de1ad"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; - sha1 = "9dff111ca64154cef0f4dc52cf843d9f12ce4474"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha1 = "c1cfdadc35a646240001f06138247b741c34d94c"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha1 = "10a59bebad52d637a027afa692e8d5ceff5e3dae"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz"; + sha1 = "2feeb13d9334cc582ea9111d3506f773174179bb"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha1 = "8e112bf6771b82bf1e974e5e26806c5c99aa516f"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"; + sha1 = "951706f8b449c834ed07bd474c0924c944b95a8e"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha1 = "a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"; + sha1 = "df12637f9630ddfa0ef9d7a11bc414d629d38604"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.13.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; - sha1 = "f36e55076d06f41dfd78557ea039c1b581642e61"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"; + sha1 = "c618763233ad02847805abcac4c345ce9de7145d"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; - sha1 = "0265155075c42918bf4d3a4053134176ad9b533b"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"; + sha1 = "bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha1 = "845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"; + sha1 = "54cf5ff0b2242c6573d753cd4bfc7077a8b282f5"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; - sha1 = "c5dce270014d4e1ebb1d806116694c12b7028963"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"; + sha1 = "e0c385507d21e1b0b076d66bed6d5231b85110b7"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha1 = "3f1601cc29905bfcb67f53910f197aeafebb25ad"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; + sha1 = "ad3d7e74584ad5ea4eadb1e6642146c590dee33c"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; - sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"; + sha1 = "50bab00c1084b6162d0a58a818031cf57798e06f"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha1 = "6f06b87a8b803fd928e54b81c258f0a0033904de"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"; + sha1 = "8bc2e21813e3e89e5e5bf3b60aa5fc458575a176"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha1 = "4d52390b9a273e651e4aba6aee49ef40e80cd0a1"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"; + sha1 = "a180cd2881e3533cef9d3901e48dad0fbeff4be4"; }; } { @@ -826,115 +698,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha1 = "c799f881a8091ac26b54867a845c3e97d2696062"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"; + sha1 = "f7abaced155260e2461359bbc7c7248aca5e6bd2"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha1 = "bb024452f9aaed861d374c8e7a24252ce3a50051"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"; + sha1 = "02e3699c284c6262236599f751065c5d5f1f400e"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha1 = "2ca45bafe4a820197cf315794a4d26560fe4bdb9"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"; + sha1 = "79711e670ffceb31bd298229d50f3621f7980cac"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha1 = "5ffa66cd59b9e191314c9f1f803b938e8c081e40"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"; + sha1 = "5251b4cce01eaf8314403d21aedb269d79f5e64b"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; - sha1 = "19f511d60e3d8753cc5a6d4e775d3a5184866cc3"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"; + sha1 = "09abd41e18dcf4fd479c598c1cef7bd39eb1337e"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; - sha1 = "7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"; + sha1 = "add58e638c8ddc4875bd9a9ecb5c594613f6c922"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha1 = "6d066ee2bff3c7b3d60bf28dec169ad993831ae3"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"; + sha1 = "a92cf240afeb605f4ca16670453024425e421ea4"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; - sha1 = "8a3d96a97d199705b9fd021580082af81c06e70b"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"; + sha1 = "195f26c2ad6d6a391b70880effce18ce625e06a7"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha1 = "2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"; + sha1 = "d3db61cc5d5b97986559967cd5ea83e5c32096ca"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha1 = "e22d8c3af24b150dd528cbd6e685e799bf1c351c"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"; + sha1 = "af823ab576f752215a49937779a41ca65825ab35"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha1 = "b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"; + sha1 = "fb20d5806dc6491a06296ac14ea8e8d6fedda72b"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; - sha1 = "8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz"; + sha1 = "fa9e4c874ee5223f891ee6fa8d737f4766d31d15"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha1 = "4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"; + sha1 = "a95c552189a96a00059f6776dc4e00e3690c78d1"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.13.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.13.tgz"; - sha1 = "0208b1d942bf939cd4f7aa5b255d42602aa4a920"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.0.tgz"; + sha1 = "1483b894b8e6ef0709d260532fbd4db9fc27a0e6"; }; } { @@ -946,67 +818,67 @@ }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; - sha1 = "c28effd771b276f4647411c9733dbb2d2da954bd"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.0.tgz"; + sha1 = "9a0ad8aa8e8790883a7bd2736f66229a58125676"; }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; - sha1 = "f510c0fa7cd7234153539f9a362ced41a5ca1447"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.0.tgz"; + sha1 = "1cb52874678d23ab11d0d16488d54730807303ef"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.13.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz"; - sha1 = "422d99d122d592acab9c35ea22a6cfd9bf189f60"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.16.0.tgz"; + sha1 = "09202158abbc716a08330f392bfb98d6b9acfa0c"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.13.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; - sha1 = "051d76126bee5c9a6aa3ba37be2f6c1698856bcb"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.16.0.tgz"; + sha1 = "d40c959d7803aae38224594585748693e84c0a22"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; - sha1 = "1df5dfaf0f4b784b43e96da6f28d630e775f68b3"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.0.tgz"; + sha1 = "55b797d4960c3de04e07ad1c0476e2bc6a4889f1"; }; } { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; - sha1 = "05d46f0ab4d1339ac59adf20a1462c91b37a1a42"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.0.tgz"; + sha1 = "23db6ddf558d8abde41b8ad9d59f48ad5532ccab"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.13.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; - sha1 = "b628bcc9c85260ac1aeb05b45bde25210194a2f5"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"; + sha1 = "eaee422c84b0232d03aea7db99c97deeaf6125a4"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha1 = "7d9988d4f06e0fe697ea1d9803188aa18b472695"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"; + sha1 = "fff4b9dcb19e12619394bda172d14f2d04c0379c"; }; } { @@ -1018,67 +890,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha1 = "db755732b70c539d504c6390d9ce90fe64aff7ad"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"; + sha1 = "090372e3141f7cc324ed70b3daf5379df2fa384d"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha1 = "84887710e273c1815ace7ae459f6f42a5d31d5fd"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"; + sha1 = "d21ca099bbd53ab307a8621e019a7bd0f40cdcfb"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha1 = "760ffd936face73f860ae646fb86ee82f3d06d1f"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"; + sha1 = "c35ea31a02d86be485f6aa510184b677a91738fd"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha1 = "a36049127977ad94438dee7443598d1cefdf409d"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"; + sha1 = "a8eced3a8e7b8e2d40ec4ec4548a45912630d302"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha1 = "785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"; + sha1 = "8b19a244c6f8c9d668dca6a6f754ad6ead1128f2"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.13.0.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz"; - sha1 = "4a498e1f3600342d2a9e61f60131018f55774853"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz"; + sha1 = "cc0670b2822b0338355bc1b3d2246a42b8166409"; }; } { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha1 = "840ced3b816d3b5127dd1d12dcedc5dead1a5e74"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"; + sha1 = "1a354064b4c45663a32334f46fa0cf6100b5b1f3"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha1 = "b52521685804e155b1202e83fc188d34bb70f5ac"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"; + sha1 = "293b80950177c8c85aede87cef280259fb995402"; }; } { @@ -1090,19 +962,19 @@ }; } { - name = "_babel_preset_env___preset_env_7.13.12.tgz"; + name = "_babel_preset_env___preset_env_7.16.4.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz"; - sha1 = "6dff470478290582ac282fb77780eadf32480237"; + name = "_babel_preset_env___preset_env_7.16.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.4.tgz"; + sha1 = "4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3"; }; } { - name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.5.tgz"; path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; - sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; + name = "_babel_preset_modules___preset_modules_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; + sha1 = "ef939d6e7f268827e1841638dc6ff95515e115d9"; }; } { @@ -1114,11 +986,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.13.13.tgz"; + name = "_babel_preset_react___preset_react_7.16.0.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; - sha1 = "fa6895a96c50763fe693f9148568458d5a839761"; + name = "_babel_preset_react___preset_react_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.0.tgz"; + sha1 = "f71d3e8dff5218478011df037fad52660ee6d82a"; }; } { @@ -1130,11 +1002,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.13.10.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.16.3.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.10.tgz"; - sha1 = "14c3f4c85de22ba88e8e86685d13e8861a82fe86"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.3.tgz"; + sha1 = "1e25de4fa994c57c18e5fdda6cc810dac70f5590"; }; } { @@ -1146,67 +1018,35 @@ }; } { - name = "_babel_runtime___runtime_7.11.2.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.11.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; - sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; - }; - } - { - name = "_babel_runtime___runtime_7.13.10.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz"; - sha1 = "47d42a57b6095f4468da440388fdbad8bebf0d7d"; - }; - } - { - name = "_babel_template___template_7.10.4.tgz"; - path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; - }; - } - { - name = "_babel_template___template_7.12.13.tgz"; + name = "_babel_runtime___runtime_7.16.3.tgz"; path = fetchurl { - name = "_babel_template___template_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; - sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + name = "_babel_runtime___runtime_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz"; + sha1 = "b86f0db02a04187a3c17caa77de69840165d42d5"; }; } { - name = "_babel_traverse___traverse_7.11.5.tgz"; + name = "_babel_template___template_7.16.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; - sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; + name = "_babel_template___template_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz"; + sha1 = "d16a35ebf4cd74e202083356fab21dd89363ddd6"; }; } { - name = "_babel_traverse___traverse_7.13.13.tgz"; + name = "_babel_traverse___traverse_7.16.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz"; - sha1 = "39aa9c21aab69f74d948a486dd28a2dbdbf5114d"; + name = "_babel_traverse___traverse_7.16.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz"; + sha1 = "f63e8a938cc1b780f66d9ed3c54f532ca2d14787"; }; } { - name = "_babel_types___types_7.11.5.tgz"; + name = "_babel_types___types_7.16.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; - sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; - }; - } - { - name = "_babel_types___types_7.13.13.tgz"; - path = fetchurl { - name = "_babel_types___types_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.13.tgz"; - sha1 = "dcd8b815b38f537a3697ce84c8e3cc62197df96f"; + name = "_babel_types___types_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; + sha1 = "db3b313804f96aadd0b776c4823e127ad67289ba"; }; } { @@ -1250,11 +1090,19 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; + }; + } + { + name = "_gar_promisify___promisify_1.1.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; + name = "_gar_promisify___promisify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz"; + sha1 = "30aa825f11d438671d585bd44e7fd564535fc210"; }; } { @@ -1282,11 +1130,11 @@ }; } { - name = "_hapi_hoek___hoek_9.1.0.tgz"; + name = "_hapi_hoek___hoek_9.2.1.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz"; - sha1 = "6c9eafc78c1529248f8f4d92b0799a712b6052c6"; + name = "_hapi_hoek___hoek_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz"; + sha1 = "9551142a1980503752536b5050fd99f4a7f13b17"; }; } { @@ -1306,11 +1154,27 @@ }; } { - name = "_hapi_topo___topo_5.0.0.tgz"; + name = "_hapi_topo___topo_5.1.0.tgz"; path = fetchurl { - name = "_hapi_topo___topo_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz"; - sha1 = "c19af8577fa393a06e9c77b60995af959be721e7"; + name = "_hapi_topo___topo_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz"; + sha1 = "dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"; + }; + } + { + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + 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"; + }; + } + { + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + path = fetchurl { + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha1 = "b520529ec21d8e5945a1851dfd1c32e94e39ff45"; }; } { @@ -1418,11 +1282,11 @@ }; } { - name = "_material_ui_core___core_4.11.4.tgz"; + name = "_material_ui_core___core_4.12.3.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.11.4.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.4.tgz"; - sha1 = "4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4"; + name = "_material_ui_core___core_4.12.3.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz"; + sha1 = "80d665caf0f1f034e52355c5450c0e38b099d3ca"; }; } { @@ -1442,11 +1306,11 @@ }; } { - name = "_material_ui_system___system_4.11.3.tgz"; + name = "_material_ui_system___system_4.12.1.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.11.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.11.3.tgz"; - sha1 = "466bc14c9986798fd325665927c963eb47cc4143"; + name = "_material_ui_system___system_4.12.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz"; + sha1 = "2dd96c243f8c0a331b2bb6d46efd7771a399707c"; }; } { @@ -1466,27 +1330,35 @@ }; } { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + 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"; }; } { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + 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"; }; } { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + 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"; + }; + } + { + name = "_npmcli_fs___fs_1.0.0.tgz"; + path = fetchurl { + name = "_npmcli_fs___fs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz"; + sha1 = "589612cfad3a6ea0feafcb901d29c63fd52db09f"; }; } { @@ -1530,11 +1402,11 @@ }; } { - name = "_sideway_address___address_4.1.2.tgz"; + name = "_sideway_address___address_4.1.3.tgz"; path = fetchurl { - name = "_sideway_address___address_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.2.tgz"; - sha1 = "811b84333a335739d3969cfc434736268170cad1"; + name = "_sideway_address___address_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz"; + sha1 = "d93cce5d45c5daec92ad76db492cc2ee3c64ab27"; }; } { @@ -1554,11 +1426,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.2.tgz"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz"; - sha1 = "858f5c4b48d80778fde4b9d541f27edc0d56488b"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha1 = "3802ddd21a50a949b6721ddd72da36e67e7f1b2d"; }; } { @@ -1690,51 +1562,43 @@ }; } { - name = "_types_anymatch___anymatch_1.3.1.tgz"; - path = fetchurl { - name = "_types_anymatch___anymatch_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha1 = "336badc1beecb9dacc38bea2cf32adf627a8421a"; - }; - } - { - name = "_types_babel__core___babel__core_7.1.14.tgz"; + name = "_tootallnate_once___once_1.1.2.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.14.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; - sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; + name = "_tootallnate_once___once_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; + sha1 = "ccb91445360179a04e7fe6aff78c00ffc1eeaf82"; }; } { - name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + name = "_types_babel__core___babel__core_7.1.16.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; + name = "_types_babel__core___babel__core_7.1.16.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz"; + sha1 = "bc12c74b7d65e82d29876b5d0baf5c625ac58702"; }; } { - name = "_types_babel__template___babel__template_7.0.2.tgz"; + name = "_types_babel__generator___babel__generator_7.6.3.tgz"; path = fetchurl { - name = "_types_babel__template___babel__template_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307"; + name = "_types_babel__generator___babel__generator_7.6.3.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz"; + sha1 = "f456b4b2ce79137f768aa130d2423d2f0ccfaba5"; }; } { - name = "_types_babel__traverse___babel__traverse_7.0.14.tgz"; + name = "_types_babel__template___babel__template_7.4.1.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.14.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.14.tgz"; - sha1 = "e99da8c075d4fb098c774ba65dabf7dc9954bd13"; + name = "_types_babel__template___babel__template_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz"; + sha1 = "3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"; }; } { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; - sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; + name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; + sha1 = "ffcd470bbb3f8bf30481678fb5502278ca833a43"; }; } { @@ -1745,14 +1609,6 @@ sha1 = "bf14b728449ebd355c17054262a083639a995710"; }; } - { - name = "_types_color_name___color_name_1.1.1.tgz"; - path = fetchurl { - name = "_types_color_name___color_name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; - sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; - }; - } { name = "_types_detect_browser___detect_browser_4.0.0.tgz"; path = fetchurl { @@ -1762,19 +1618,19 @@ }; } { - name = "_types_eslint___eslint_7.2.7.tgz"; + name = "_types_eslint___eslint_7.29.0.tgz"; path = fetchurl { - name = "_types_eslint___eslint_7.2.7.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.7.tgz"; - sha1 = "f7ef1cf0dceab0ae6f9a976a0a9af14ab1baca26"; + name = "_types_eslint___eslint_7.29.0.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz"; + sha1 = "e56ddc8e542815272720bb0b4ccc2aff9c3e1c78"; }; } { - name = "_types_estree___estree_0.0.45.tgz"; + name = "_types_estree___estree_0.0.50.tgz"; path = fetchurl { - name = "_types_estree___estree_0.0.45.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz"; - sha1 = "e9387572998e5ecdac221950dab3e8c3b16af884"; + name = "_types_estree___estree_0.0.50.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz"; + sha1 = "1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"; }; } { @@ -1794,11 +1650,11 @@ }; } { - name = "_types_glob___glob_7.1.3.tgz"; + name = "_types_glob___glob_7.2.0.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; - sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; + name = "_types_glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; + sha1 = "bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"; }; } { @@ -1810,27 +1666,27 @@ }; } { - name = "_types_hast___hast_2.3.1.tgz"; + name = "_types_hast___hast_2.3.4.tgz"; path = fetchurl { - name = "_types_hast___hast_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.1.tgz"; - sha1 = "b16872f2a6144c7025f296fb9636a667ebb79cd9"; + name = "_types_hast___hast_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz"; + sha1 = "8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"; }; } { - name = "_types_history___history_4.7.7.tgz"; + name = "_types_history___history_4.7.9.tgz"; path = fetchurl { - name = "_types_history___history_4.7.7.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.7.tgz"; - sha1 = "613957d900fab9ff84c8dfb24fa3eef0c2a40896"; + name = "_types_history___history_4.7.9.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.9.tgz"; + sha1 = "1cfb6d60ef3822c589f18e70f8b12f9a28ce8724"; }; } { - name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + name = "_types_html_minifier_terser___html_minifier_terser_5.1.2.tgz"; path = fetchurl { - name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha1 = "3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"; + name = "_types_html_minifier_terser___html_minifier_terser_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; + sha1 = "693b316ad323ea97eed6b38ed1a3cc02b1672b57"; }; } { @@ -1850,19 +1706,19 @@ }; } { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; + sha1 = "9153fe98bba2bd565a63add9436d6f0d7f8468ff"; }; } { - name = "_types_jest___jest_26.0.23.tgz"; + name = "_types_jest___jest_26.0.24.tgz"; path = fetchurl { - name = "_types_jest___jest_26.0.23.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz"; - sha1 = "a1b7eab3c503b80451d019efb588ec63522ee4e7"; + name = "_types_jest___jest_26.0.24.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz"; + sha1 = "943d11976b16739185913a1936e0de0c4a7d595a"; }; } { @@ -1874,19 +1730,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.7.tgz"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; - }; - } - { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + 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"; }; } { @@ -1898,51 +1746,51 @@ }; } { - name = "_types_mdast___mdast_3.0.3.tgz"; + name = "_types_mdast___mdast_3.0.10.tgz"; path = fetchurl { - name = "_types_mdast___mdast_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz"; - sha1 = "2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"; + name = "_types_mdast___mdast_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz"; + sha1 = "4724244a82a4598884cbbe9bcfd73dff927ee8af"; }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_minimatch___minimatch_3.0.5.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_minimatch___minimatch_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; }; } { - name = "_types_node___node_14.10.1.tgz"; + name = "_types_node___node_16.11.11.tgz"; path = fetchurl { - name = "_types_node___node_14.10.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.10.1.tgz"; - sha1 = "cc323bad8e8a533d4822f45ce4e5326f36e42177"; + name = "_types_node___node_16.11.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz"; + sha1 = "6ea7342dfb379ea1210835bada87b3c512120234"; }; } { - name = "_types_node___node_15.12.2.tgz"; + name = "_types_node___node_15.14.9.tgz"; path = fetchurl { - name = "_types_node___node_15.12.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz"; - sha1 = "1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"; + name = "_types_node___node_15.14.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz"; + sha1 = "bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa"; }; } { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; path = fetchurl { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha1 = "d3357479a0fdfdd5907fe67e17e0a85c906e1301"; }; } { - name = "_types_notifyjs___notifyjs_3.0.2.tgz"; + name = "_types_notifyjs___notifyjs_3.0.3.tgz"; path = fetchurl { - name = "_types_notifyjs___notifyjs_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.2.tgz"; - sha1 = "97451aa8225e7bbf4f73bf0cb6f9fd2e12889719"; + name = "_types_notifyjs___notifyjs_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.3.tgz"; + sha1 = "b0de6a646f4dd71ae45d2c2bbac886a8a6ac86ba"; }; } { @@ -1954,43 +1802,43 @@ }; } { - name = "_types_prettier___prettier_2.2.3.tgz"; + name = "_types_prettier___prettier_2.4.2.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz"; - sha1 = "ef65165aea2924c9359205bf748865b8881753c0"; + name = "_types_prettier___prettier_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz"; + sha1 = "4c62fae93eb479660c3bd93f9d24d561597a8281"; }; } { - name = "_types_prop_types___prop_types_15.7.3.tgz"; + name = "_types_prop_types___prop_types_15.7.4.tgz"; path = fetchurl { - name = "_types_prop_types___prop_types_15.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; - sha1 = "2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"; + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha1 = "fcf7205c25dff795ee79af1e30da2c9790808f11"; }; } { - name = "_types_puppeteer___puppeteer_5.4.3.tgz"; + name = "_types_puppeteer___puppeteer_5.4.4.tgz"; path = fetchurl { - name = "_types_puppeteer___puppeteer_5.4.3.tgz"; - url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-5.4.3.tgz"; - sha1 = "cdca84aa7751d77448d8a477dbfa0af1f11485f2"; + name = "_types_puppeteer___puppeteer_5.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-5.4.4.tgz"; + sha1 = "e92abeccc4f46207c3e1b38934a1246be080ccd0"; }; } { - name = "_types_q___q_1.5.4.tgz"; + name = "_types_q___q_1.5.5.tgz"; path = fetchurl { - name = "_types_q___q_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; - sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; + name = "_types_q___q_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz"; + sha1 = "75a2a8e7d8ab4b230414505d92335d1dcb53a6df"; }; } { - name = "_types_react_dom___react_dom_16.9.13.tgz"; + name = "_types_react_dom___react_dom_16.9.14.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.13.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.13.tgz"; - sha1 = "5898f0ee68fe200685e6b61d3d7d8828692814d0"; + name = "_types_react_dom___react_dom_16.9.14.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.14.tgz"; + sha1 = "674b8f116645fe5266b40b525777fc6bb8eb3bcd"; }; } { @@ -2002,51 +1850,51 @@ }; } { - name = "_types_react_router_dom___react_router_dom_5.1.7.tgz"; + name = "_types_react_router_dom___react_router_dom_5.3.2.tgz"; path = fetchurl { - name = "_types_react_router_dom___react_router_dom_5.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.7.tgz"; - sha1 = "a126d9ea76079ffbbdb0d9225073eb5797ab7271"; + name = "_types_react_router_dom___react_router_dom_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.3.2.tgz"; + sha1 = "ebd8e145cf056db5c66eb1dac63c72f52e8542ee"; }; } { - name = "_types_react_router___react_router_5.1.8.tgz"; + name = "_types_react_router___react_router_5.1.17.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.1.8.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.8.tgz"; - sha1 = "4614e5ba7559657438e17766bb95ef6ed6acc3fa"; + name = "_types_react_router___react_router_5.1.17.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.17.tgz"; + sha1 = "087091006213b11042f39570e5cd414863693968"; }; } { - name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz"; - sha1 = "e1a3cb278df7f47f17b5082b1b3da17170bd44b1"; + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz"; + sha1 = "acd4cceaa2be6b757db61ed7b432e103242d163e"; }; } { - name = "_types_react___react_17.0.11.tgz"; + name = "_types_react___react_17.0.37.tgz"; path = fetchurl { - name = "_types_react___react_17.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.11.tgz"; - sha1 = "67fcd0ddbf5a0b083a0f94e926c7d63f3b836451"; + name = "_types_react___react_17.0.37.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.37.tgz"; + sha1 = "6884d0aa402605935c397ae689deed115caad959"; }; } { - name = "_types_react___react_16.14.8.tgz"; + name = "_types_react___react_16.14.21.tgz"; path = fetchurl { - name = "_types_react___react_16.14.8.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.8.tgz"; - sha1 = "4aee3ab004cb98451917c9b7ada3c7d7e52db3fe"; + name = "_types_react___react_16.14.21.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.21.tgz"; + sha1 = "35199b21a278355ec7a3c40003bd6a334bd4ae4a"; }; } { - name = "_types_remove_markdown___remove_markdown_0.3.0.tgz"; + name = "_types_remove_markdown___remove_markdown_0.3.1.tgz"; path = fetchurl { - name = "_types_remove_markdown___remove_markdown_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/remove-markdown/-/remove-markdown-0.3.0.tgz"; - sha1 = "8014f12e4c45637c4cd190ae66afde189bec41d1"; + name = "_types_remove_markdown___remove_markdown_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@types/remove-markdown/-/remove-markdown-0.3.1.tgz"; + sha1 = "82bc3664c313f50f7c77f1bb59935f567689dc63"; }; } { @@ -2058,19 +1906,19 @@ }; } { - name = "_types_rimraf___rimraf_3.0.0.tgz"; + name = "_types_rimraf___rimraf_3.0.2.tgz"; path = fetchurl { - name = "_types_rimraf___rimraf_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.0.tgz"; - sha1 = "b9d03f090ece263671898d57bb7bb007023ac19f"; + name = "_types_rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "a63d175b331748e5220ad48c901d7bbf1f44eef8"; }; } { - name = "_types_scheduler___scheduler_0.16.1.tgz"; + name = "_types_scheduler___scheduler_0.16.2.tgz"; path = fetchurl { - name = "_types_scheduler___scheduler_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz"; - sha1 = "18845205e86ff0038517aab7a18a62a6b9f71275"; + name = "_types_scheduler___scheduler_0.16.2.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz"; + sha1 = "1a62f89525723dde24ba1b01b092bf5df8ad4d39"; }; } { @@ -2082,115 +1930,99 @@ }; } { - name = "_types_stack_utils___stack_utils_2.0.0.tgz"; - path = fetchurl { - name = "_types_stack_utils___stack_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; - sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; - }; - } - { - name = "_types_tapable___tapable_1.0.7.tgz"; - path = fetchurl { - name = "_types_tapable___tapable_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz"; - sha1 = "545158342f949e8fd3bfd813224971ecddc3fac4"; - }; - } - { - name = "_types_tern___tern_0.23.3.tgz"; + name = "_types_stack_utils___stack_utils_2.0.1.tgz"; path = fetchurl { - name = "_types_tern___tern_0.23.3.tgz"; - url = "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz"; - sha1 = "4b54538f04a88c9ff79de1f6f94f575a7f339460"; + name = "_types_stack_utils___stack_utils_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz"; + sha1 = "20f18294f797f2209b5f65c8e3b5c8e8261d127c"; }; } { - name = "_types_uglify_js___uglify_js_3.13.0.tgz"; + name = "_types_tapable___tapable_1.0.8.tgz"; path = fetchurl { - name = "_types_uglify_js___uglify_js_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz"; - sha1 = "1cad8df1fb0b143c5aba08de5712ea9d1ff71124"; + name = "_types_tapable___tapable_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz"; + sha1 = "b94a4391c85666c7b73299fd3ad79d4faa435310"; }; } { - name = "_types_unist___unist_2.0.3.tgz"; + name = "_types_tern___tern_0.23.4.tgz"; path = fetchurl { - name = "_types_unist___unist_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz"; - sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; + name = "_types_tern___tern_0.23.4.tgz"; + url = "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz"; + sha1 = "03926eb13dbeaf3ae0d390caf706b2643a0127fb"; }; } { - name = "_types_webpack_sources___webpack_sources_2.1.0.tgz"; + name = "_types_uglify_js___uglify_js_3.13.1.tgz"; path = fetchurl { - name = "_types_webpack_sources___webpack_sources_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; - sha1 = "8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"; + name = "_types_uglify_js___uglify_js_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz"; + sha1 = "5e889e9e81e94245c75b6450600e1c5ea2878aea"; }; } { - name = "_types_webpack___webpack_4.41.27.tgz"; + name = "_types_unist___unist_2.0.6.tgz"; path = fetchurl { - name = "_types_webpack___webpack_4.41.27.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz"; - sha1 = "f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"; + name = "_types_unist___unist_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz"; + sha1 = "250a7b16c3b91f672a24552ec64678eeb1d3a08d"; }; } { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + name = "_types_webpack_sources___webpack_sources_3.2.0.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + name = "_types_webpack_sources___webpack_sources_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha1 = "16d759ba096c289034b26553d2df1bf45248d38b"; }; } { - name = "_types_yargs___yargs_15.0.5.tgz"; + name = "_types_webpack___webpack_4.41.32.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; - sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; + name = "_types_webpack___webpack_4.41.32.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz"; + sha1 = "a7bab03b72904070162b2f169415492209e94212"; }; } { - name = "_types_yauzl___yauzl_2.9.1.tgz"; + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; path = fetchurl { - name = "_types_yauzl___yauzl_2.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; - sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; + name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.1.0.tgz"; + name = "_types_yargs___yargs_15.0.14.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.1.0.tgz"; - sha1 = "7d309f60815ff35e9627ad85e41928d7b7fd443f"; + name = "_types_yargs___yargs_15.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz"; + sha1 = "26d821ddb89e70492160b66d10a0eb6df8f6fb06"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.19.0.tgz"; + name = "_types_yauzl___yauzl_2.9.2.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz"; - sha1 = "56f8da9ee118fe9763af34d6a526967234f6a7f0"; + name = "_types_yauzl___yauzl_2.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; + sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.1.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.1.0.tgz"; - sha1 = "263d7225645c09a411c8735eeffd417f50f49026"; + 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.19.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz"; - sha1 = "9ca379919906dc72cb0fcd817d6cb5aa2d2054c6"; + 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"; }; } { @@ -2202,35 +2034,19 @@ }; } { - name = "_typescript_eslint_parser___parser_4.1.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.1.0.tgz"; - sha1 = "9b0409411725f14cd7faa81a664e5051225961db"; - }; - } - { - name = "_typescript_eslint_parser___parser_4.19.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.19.0.tgz"; - sha1 = "4ae77513b39f164f1751f21f348d2e6cb2d11128"; - }; - } - { - name = "_typescript_eslint_scope_manager___scope_manager_4.1.0.tgz"; + name = "_typescript_eslint_parser___parser_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.1.0.tgz"; - sha1 = "9e389745ee9cfe12252ed1e9958808abd6b3a683"; + name = "_typescript_eslint_parser___parser_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz"; + sha1 = "dfe797570d9694e560528d18eecad86c8c744899"; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.19.0.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz"; - sha1 = "5e0b49eca4df7684205d957c9856f4e720717a4f"; + 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"; }; } { @@ -2242,19 +2058,11 @@ }; } { - name = "_typescript_eslint_types___types_4.1.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.1.0.tgz"; - sha1 = "edbd3fec346f34e13ce7aa176b03b497a32c496a"; - }; - } - { - name = "_typescript_eslint_types___types_4.19.0.tgz"; + name = "_typescript_eslint_types___types_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.19.0.tgz"; - sha1 = "5181d5d2afd02e5b8f149ebb37ffc8bd7b07a568"; + name = "_typescript_eslint_types___types_4.33.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz"; + sha1 = "a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"; }; } { @@ -2266,19 +2074,11 @@ }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.1.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.1.0.tgz"; - sha1 = "394046ead25164494218c0e3d6b960695ea967f6"; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.19.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz"; - sha1 = "8a709ffa400284ab72df33376df085e2e2f61147"; + 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"; }; } { @@ -2290,19 +2090,11 @@ }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.1.0.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.33.0.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.1.0.tgz"; - sha1 = "b2d528c9484e7eda1aa4f86ccf0432fb16e4d545"; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.19.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.19.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz"; - sha1 = "cbea35109cbd9b26e597644556be4546465d8f7f"; + 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"; }; } { @@ -2490,11 +2282,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; }; } { @@ -2522,19 +2314,11 @@ }; } { - name = "acorn___acorn_7.4.0.tgz"; + name = "acorn___acorn_8.6.0.tgz"; path = fetchurl { - name = "acorn___acorn_7.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz"; - sha1 = "e1ad486e6c54501634c6c397c5c121daa383607c"; - }; - } - { - name = "acorn___acorn_8.1.0.tgz"; - path = fetchurl { - name = "acorn___acorn_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz"; - sha1 = "52311fd7037ae119cbb134309e901aa46295b3fe"; + name = "acorn___acorn_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz"; + sha1 = "e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"; }; } { @@ -2593,14 +2377,6 @@ sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } - { - name = "ajv___ajv_6.12.4.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.4.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz"; - sha1 = "0614facc4522127fa713445c6bfd3ebd376e2234"; - }; - } { name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { @@ -2610,11 +2386,11 @@ }; } { - name = "ajv___ajv_7.2.4.tgz"; + name = "ajv___ajv_8.8.2.tgz"; path = fetchurl { - name = "ajv___ajv_7.2.4.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-7.2.4.tgz"; - sha1 = "8e239d4d56cf884bccca8cca362f508446dc160f"; + name = "ajv___ajv_8.8.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz"; + sha1 = "01b4fef2007a28bf75f0b7fc009f62679de4abbb"; }; } { @@ -2641,14 +2417,6 @@ sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; }; } - { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; - }; - } { name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { @@ -2682,11 +2450,11 @@ }; } { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; }; } { @@ -2698,11 +2466,11 @@ }; } { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; }; } { @@ -2714,11 +2482,11 @@ }; } { - name = "anymatch___anymatch_3.1.1.tgz"; + name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; }; } { @@ -2794,19 +2562,11 @@ }; } { - name = "array_includes___array_includes_3.1.1.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; - }; - } - { - name = "array_includes___array_includes_3.1.3.tgz"; + name = "array_includes___array_includes_3.1.4.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; - sha1 = "c7f619b382ad2afaf5326cddfdc0afc61af7690a"; + name = "array_includes___array_includes_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz"; + sha1 = "f5b493162c760f3539631f005ba2bb46acb45ba9"; }; } { @@ -2842,35 +2602,27 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; - path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; - sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.2.tgz"; path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + name = "array.prototype.find___array.prototype.find_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.2.tgz"; + sha1 = "6abbd0c2573925d8094f7d23112306af8c16d534"; }; } { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + name = "array.prototype.flat___array.prototype.flat_1.2.5.tgz"; path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; - sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + name = "array.prototype.flat___array.prototype.flat_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz"; + sha1 = "07e0975d84bbc7c48cd1879d609e682598d33e13"; }; } { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; - sha1 = "94cfd47cc1556ec0747d97f7c7738c58122004c9"; + 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"; }; } { @@ -2897,22 +2649,6 @@ sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; }; } - { - name = "asn1___asn1_0.2.4.tgz"; - path = fetchurl { - name = "asn1___asn1_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - } { name = "assert___assert_1.5.0.tgz"; path = fetchurl { @@ -2994,43 +2730,27 @@ }; } { - name = "autoprefixer___autoprefixer_9.8.6.tgz"; - path = fetchurl { - name = "autoprefixer___autoprefixer_9.8.6.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; - sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; - }; - } - { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; + name = "autoprefixer___autoprefixer_9.8.8.tgz"; path = fetchurl { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + name = "autoprefixer___autoprefixer_9.8.8.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz"; + sha1 = "fd4bd4595385fa6f06599de749a4d5f7a474957a"; }; } { - name = "aws4___aws4_1.10.1.tgz"; + name = "axe_core___axe_core_4.3.5.tgz"; path = fetchurl { - name = "aws4___aws4_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; - sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; + name = "axe_core___axe_core_4.3.5.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz"; + sha1 = "78d6911ba317a8262bfee292aeafcc1e04b49cc5"; }; } { - name = "axe_core___axe_core_4.1.3.tgz"; + name = "axios___axios_0.21.4.tgz"; path = fetchurl { - name = "axe_core___axe_core_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz"; - sha1 = "64a4c85509e0991f5168340edc4bedd1ceea6966"; - }; - } - { - name = "axios___axios_0.21.1.tgz"; - path = fetchurl { - name = "axios___axios_0.21.1.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; - sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; }; } { @@ -3082,11 +2802,11 @@ }; } { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.1.1.tgz"; path = fetchurl { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; - sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"; + sha1 = "fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"; }; } { @@ -3114,27 +2834,27 @@ }; } { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.0.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz"; - sha1 = "a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz"; + sha1 = "407082d0d355ba565af24126fb6cb8e9115251fd"; }; } { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.4.0.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz"; - sha1 = "80449d9d6f2274912e05d9e182b54816904befd0"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz"; + sha1 = "0b571f4cf3d67f911512f5c04842a7b8e8263087"; }; } { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.3.0.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz"; - sha1 = "0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz"; + sha1 = "9ebbcd7186e1a33e21c5e20cae4e7983949533be"; }; } { @@ -3210,19 +2930,19 @@ }; } { - name = "balanced_match___balanced_match_1.0.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { - name = "base64_js___base64_js_1.3.1.tgz"; + name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; }; } { @@ -3241,14 +2961,6 @@ sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; } - { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - path = fetchurl { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - } { name = "bfj___bfj_7.0.2.tgz"; path = fetchurl { @@ -3274,11 +2986,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; }; } { @@ -3290,11 +3002,11 @@ }; } { - name = "bl___bl_4.0.3.tgz"; + name = "bl___bl_4.1.0.tgz"; path = fetchurl { - name = "bl___bl_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; - sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; }; } { @@ -3306,19 +3018,19 @@ }; } { - name = "bn.js___bn.js_4.11.9.tgz"; + name = "bn.js___bn.js_4.12.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.9.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; - sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; }; } { - name = "bn.js___bn.js_5.1.3.tgz"; + name = "bn.js___bn.js_5.2.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; - sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; + name = "bn.js___bn.js_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz"; + sha1 = "358860674396c6997771a9d051fcc1b57d4ae002"; }; } { @@ -3410,11 +3122,11 @@ }; } { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; path = fetchurl { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha1 = "b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"; }; } { @@ -3442,11 +3154,11 @@ }; } { - name = "browserslist___browserslist_4.16.3.tgz"; + name = "browserslist___browserslist_4.18.1.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.16.3.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz"; - sha1 = "340aa46940d7db878748567c5dea24a48ddf3717"; + name = "browserslist___browserslist_4.18.1.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz"; + sha1 = "60d3920f25b6860eb917c6c7b185576f4d8b017f"; }; } { @@ -3466,11 +3178,11 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; }; } { @@ -3498,11 +3210,11 @@ }; } { - name = "buffer___buffer_5.6.0.tgz"; + name = "buffer___buffer_5.7.1.tgz"; path = fetchurl { - name = "buffer___buffer_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz"; - sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; }; } { @@ -3546,11 +3258,11 @@ }; } { - name = "cacache___cacache_15.0.6.tgz"; + name = "cacache___cacache_15.3.0.tgz"; path = fetchurl { - name = "cacache___cacache_15.0.6.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz"; - sha1 = "65a8c580fda15b59150fb76bf3f3a8e45d583099"; + name = "cacache___cacache_15.3.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz"; + sha1 = "dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"; }; } { @@ -3602,11 +3314,11 @@ }; } { - name = "camel_case___camel_case_4.1.1.tgz"; + name = "camel_case___camel_case_4.1.2.tgz"; path = fetchurl { - name = "camel_case___camel_case_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; - sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; + name = "camel_case___camel_case_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; + sha1 = "9728072a954f805228225a6deea6b38461e1bd5a"; }; } { @@ -3618,11 +3330,11 @@ }; } { - name = "camelcase___camelcase_6.2.0.tgz"; + name = "camelcase___camelcase_6.2.1.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; - sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + name = "camelcase___camelcase_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz"; + sha1 = "250fd350cfd555d0d2160b1d51510eaf8326e86e"; }; } { @@ -3634,11 +3346,11 @@ }; } { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001237.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001284.tgz"; path = fetchurl { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001237.tgz"; - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz"; - sha1 = "4b7783661515b8e7151fc6376cfd97f0e427b9e5"; + name = "caniuse_lite___caniuse_lite_1.0.30001284.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001284.tgz"; + sha1 = "d3653929ded898cd0c1f09a56fd8ca6952df4fca"; }; } { @@ -3657,14 +3369,6 @@ sha1 = "23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"; }; } - { - name = "caseless___caseless_0.12.0.tgz"; - path = fetchurl { - name = "caseless___caseless_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - } { name = "ccount___ccount_1.1.0.tgz"; path = fetchurl { @@ -3682,11 +3386,11 @@ }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; }; } { @@ -3738,11 +3442,11 @@ }; } { - name = "chokidar___chokidar_3.4.2.tgz"; + name = "chokidar___chokidar_3.5.2.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz"; - sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d"; + name = "chokidar___chokidar_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; + sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; }; } { @@ -3762,11 +3466,11 @@ }; } { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; }; } { @@ -3802,11 +3506,11 @@ }; } { - name = "clean_css___clean_css_4.2.3.tgz"; + name = "clean_css___clean_css_4.2.4.tgz"; path = fetchurl { - name = "clean_css___clean_css_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; - sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + name = "clean_css___clean_css_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz"; + sha1 = "733bf46eba4e607c6891ea57c24a989356831178"; }; } { @@ -3866,11 +3570,11 @@ }; } { - name = "codemirror___codemirror_5.61.1.tgz"; + name = "codemirror___codemirror_5.64.0.tgz"; path = fetchurl { - name = "codemirror___codemirror_5.61.1.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.61.1.tgz"; - sha1 = "ccfc8a43b8fcfb8b12e8e75b5ffde48d541406e0"; + name = "codemirror___codemirror_5.64.0.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.64.0.tgz"; + sha1 = "182eec65b62178e3cd1de8f9d88ab819cfe5f625"; }; } { @@ -3922,35 +3626,19 @@ }; } { - name = "color_string___color_string_1.5.3.tgz"; + name = "color_string___color_string_1.9.0.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + name = "color_string___color_string_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz"; + sha1 = "63b6ebd1bec11999d1df3a79a7569451ac2be8aa"; }; } { - name = "color___color_3.1.2.tgz"; + name = "color___color_3.2.1.tgz"; path = fetchurl { - name = "color___color_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz"; - sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; - }; - } - { - name = "colorette___colorette_1.2.1.tgz"; - path = fetchurl { - name = "colorette___colorette_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; - sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; - }; - } - { - name = "colorette___colorette_1.2.2.tgz"; - path = fetchurl { - name = "colorette___colorette_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; - sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + name = "color___color_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz"; + sha1 = "3544dc198caf4490c3ecc9a790b54fe9ff45e164"; }; } { @@ -3986,11 +3674,11 @@ }; } { - name = "common_tags___common_tags_1.8.0.tgz"; + name = "common_tags___common_tags_1.8.2.tgz"; path = fetchurl { - name = "common_tags___common_tags_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz"; - sha1 = "8e3153e542d4a39e9b10554434afaaf98956a937"; + name = "common_tags___common_tags_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz"; + sha1 = "94ebb3c076d26032745fd54face7f688ef5ac9c6"; }; } { @@ -4081,14 +3769,6 @@ sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; } - { - name = "contains_path___contains_path_0.1.0.tgz"; - path = fetchurl { - name = "contains_path___contains_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - } { name = "content_disposition___content_disposition_0.5.3.tgz"; path = fetchurl { @@ -4121,6 +3801,14 @@ sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190"; }; } + { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; + }; + } { name = "cookie_signature___cookie_signature_1.0.6.tgz"; path = fetchurl { @@ -4154,27 +3842,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.6.5.tgz"; - path = fetchurl { - name = "core_js_compat___core_js_compat_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"; - }; - } - { - name = "core_js_compat___core_js_compat_3.9.1.tgz"; + name = "core_js_compat___core_js_compat_3.19.2.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz"; - sha1 = "4e572acfe90aff69d76d8c37759d21a5c59bb455"; + name = "core_js_compat___core_js_compat_3.19.2.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.2.tgz"; + sha1 = "18066a3404a302433cb0aa8be82dd3d75c76e5c4"; }; } { - name = "core_js_pure___core_js_pure_3.6.5.tgz"; + name = "core_js_pure___core_js_pure_3.19.2.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; - sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + name = "core_js_pure___core_js_pure_3.19.2.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.2.tgz"; + sha1 = "26b5bfb503178cff6e3e115bc2ba6c6419383680"; }; } { @@ -4186,27 +3866,27 @@ }; } { - name = "core_js___core_js_2.6.11.tgz"; + name = "core_js___core_js_2.6.12.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.11.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; }; } { - name = "core_js___core_js_3.9.1.tgz"; + name = "core_js___core_js_3.19.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz"; - sha1 = "cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"; + name = "core_js___core_js_3.19.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.19.2.tgz"; + sha1 = "ae216d7f4f7e924d9a2e3ff1e4b1940220f9157b"; }; } { - name = "core_util_is___core_util_is_1.0.2.tgz"; + name = "core_util_is___core_util_is_1.0.3.tgz"; path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + 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"; }; } { @@ -4226,11 +3906,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; - sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; + name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha1 = "714d756522cace867867ccb4474c5d01bbae5d6d"; }; } { @@ -4345,14 +4025,6 @@ sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; }; } - { - name = "css_select___css_select_1.2.0.tgz"; - path = fetchurl { - name = "css_select___css_select_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; - }; - } { name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { @@ -4361,6 +4033,14 @@ sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } + { + name = "css_select___css_select_4.1.3.tgz"; + path = fetchurl { + name = "css_select___css_select_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz"; + sha1 = "a70440f70317f2669118ad74ff105e65849c7067"; + }; + } { name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { @@ -4370,11 +4050,11 @@ }; } { - name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + name = "css_tree___css_tree_1.1.3.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; + name = "css_tree___css_tree_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; + sha1 = "eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"; }; } { @@ -4386,19 +4066,19 @@ }; } { - name = "css_what___css_what_2.1.3.tgz"; + name = "css_what___css_what_3.4.2.tgz"; path = fetchurl { - name = "css_what___css_what_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz"; - sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; + name = "css_what___css_what_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; + sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; }; } { - name = "css_what___css_what_3.3.0.tgz"; + name = "css_what___css_what_5.1.0.tgz"; path = fetchurl { - name = "css_what___css_what_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz"; - sha1 = "10fec696a9ece2e591ac772d759aacabac38cd39"; + name = "css_what___css_what_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz"; + sha1 = "3f7b707aadf633baf62c2ceb8579b545bb40f7fe"; }; } { @@ -4434,11 +4114,11 @@ }; } { - name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha1 = "51ec662ccfca0f88b396dcd9679cdb931be17f76"; + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; + sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; }; } { @@ -4474,19 +4154,19 @@ }; } { - name = "cssnano___cssnano_4.1.10.tgz"; + name = "cssnano___cssnano_4.1.11.tgz"; path = fetchurl { - name = "cssnano___cssnano_4.1.10.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz"; - sha1 = "0ac41f0b13d13d465487e111b778d42da631b8b2"; + name = "cssnano___cssnano_4.1.11.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; + sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; }; } { - name = "csso___csso_4.0.3.tgz"; + name = "csso___csso_4.2.0.tgz"; path = fetchurl { - name = "csso___csso_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; - sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; + name = "csso___csso_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; + sha1 = "ea3a561346e8dc9f546d6febedd50187cf389529"; }; } { @@ -4514,19 +4194,19 @@ }; } { - name = "csstype___csstype_2.6.16.tgz"; + name = "csstype___csstype_2.6.19.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.16.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz"; - sha1 = "544d69f547013b85a40d15bff75db38f34fe9c39"; + name = "csstype___csstype_2.6.19.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.19.tgz"; + sha1 = "feeb5aae89020bb389e1f63669a5ed490e391caa"; }; } { - name = "csstype___csstype_3.0.8.tgz"; + name = "csstype___csstype_3.0.10.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; - sha1 = "d2266a792729fb227cd216fb572f43728e1ad340"; + name = "csstype___csstype_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz"; + sha1 = "2ad3a7bed70f35b965707c092e5f30b327c290e5"; }; } { @@ -4546,19 +4226,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; - path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; - sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; - }; - } - { - name = "dashdash___dashdash_1.14.1.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; path = fetchurl { - name = "dashdash___dashdash_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz"; + sha1 = "64368003512a1a6992593741a09a9d31a836f55d"; }; } { @@ -4578,11 +4250,11 @@ }; } { - name = "debug___debug_4.1.1.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha1 = "04266e0b70a98d4462e6e288e38259213332b664"; }; } { @@ -4593,14 +4265,6 @@ sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; }; } - { - name = "debug___debug_3.2.6.tgz"; - path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; - }; - } { name = "debug___debug_3.2.7.tgz"; path = fetchurl { @@ -4618,11 +4282,11 @@ }; } { - name = "decimal.js___decimal.js_10.2.1.tgz"; + name = "decimal.js___decimal.js_10.3.1.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.2.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; - sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + name = "decimal.js___decimal.js_10.3.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; + sha1 = "d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"; }; } { @@ -4650,11 +4314,11 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; }; } { @@ -4746,19 +4410,11 @@ }; } { - name = "detect_browser___detect_browser_5.1.1.tgz"; - path = fetchurl { - name = "detect_browser___detect_browser_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.1.tgz"; - sha1 = "a800db91d3fd60d0861669f5984f1be9ffbe009c"; - }; - } - { - name = "detect_browser___detect_browser_5.2.0.tgz"; + name = "detect_browser___detect_browser_5.2.1.tgz"; path = fetchurl { - name = "detect_browser___detect_browser_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz"; - sha1 = "c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"; + name = "detect_browser___detect_browser_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.1.tgz"; + sha1 = "b884f8d84e8f33bb874ffed10b4beea26133fcd1"; }; } { @@ -4770,11 +4426,11 @@ }; } { - name = "detect_node___detect_node_2.0.4.tgz"; + name = "detect_node___detect_node_2.1.0.tgz"; path = fetchurl { - name = "detect_node___detect_node_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + name = "detect_node___detect_node_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; + sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; }; } { @@ -4786,11 +4442,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.883894.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.883894.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; - sha1 = "d403f2c75cd6d71c916aee8dde9258da988a4da9"; + name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; + sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; }; } { @@ -4826,11 +4482,11 @@ }; } { - name = "dns_packet___dns_packet_1.3.1.tgz"; + name = "dns_packet___dns_packet_1.3.4.tgz"; path = fetchurl { - name = "dns_packet___dns_packet_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz"; - sha1 = "12aa426981075be500b910eedcd0b47dd7deda5a"; + name = "dns_packet___dns_packet_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz"; + sha1 = "e3455065824a2507ba886c55a89963bb107dec6f"; }; } { @@ -4841,14 +4497,6 @@ sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; } - { - name = "doctrine___doctrine_1.5.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; - }; - } { name = "doctrine___doctrine_2.1.0.tgz"; path = fetchurl { @@ -4874,11 +4522,11 @@ }; } { - name = "dom_helpers___dom_helpers_5.2.0.tgz"; + name = "dom_helpers___dom_helpers_5.2.1.tgz"; path = fetchurl { - name = "dom_helpers___dom_helpers_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz"; - sha1 = "57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"; + name = "dom_helpers___dom_helpers_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz"; + sha1 = "d9400536b2bf8225ad98fe052e029451ac40e902"; }; } { @@ -4889,6 +4537,14 @@ sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } + { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha1 = "6206437d32ceefaec7161803230c7a20bc1b4d91"; + }; + } { name = "domain_browser___domain_browser_1.2.0.tgz"; path = fetchurl { @@ -4906,11 +4562,11 @@ }; } { - name = "domelementtype___domelementtype_2.0.1.tgz"; + name = "domelementtype___domelementtype_2.2.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; - sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha1 = "9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"; }; } { @@ -4922,19 +4578,11 @@ }; } { - name = "domhandler___domhandler_2.4.2.tgz"; - path = fetchurl { - name = "domhandler___domhandler_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz"; - sha1 = "8805097e933d65e85546f726d60f5eb88b44f803"; - }; - } - { - name = "domutils___domutils_1.5.1.tgz"; + name = "domhandler___domhandler_4.3.0.tgz"; path = fetchurl { - name = "domutils___domutils_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + name = "domhandler___domhandler_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz"; + sha1 = "16c658c626cf966967e306f966b431f77d4a5626"; }; } { @@ -4946,11 +4594,19 @@ }; } { - name = "dot_case___dot_case_3.0.3.tgz"; + name = "domutils___domutils_2.8.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz"; + sha1 = "4437def5db6e2d1f5d6ee859bd95ca7d02048135"; + }; + } + { + name = "dot_case___dot_case_3.0.4.tgz"; path = fetchurl { - name = "dot_case___dot_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; - sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; }; } { @@ -4993,14 +4649,6 @@ sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; }; } - { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - path = fetchurl { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; - }; - } { name = "ee_first___ee_first_1.1.1.tgz"; path = fetchurl { @@ -5018,27 +4666,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.566.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.11.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.566.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.566.tgz"; - sha1 = "e373876bb63e5c9bbcbe1b48cbb2db000f79bf88"; + name = "electron_to_chromium___electron_to_chromium_1.4.11.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.11.tgz"; + sha1 = "303c9deebbe90c68bf5c2c81a88a3bf4522c8810"; }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.701.tgz"; + name = "elliptic___elliptic_6.5.4.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.701.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.701.tgz"; - sha1 = "5e796ed7ce88cd77bc7bf831cf311ef6b067c389"; - }; - } - { - name = "elliptic___elliptic_6.5.3.tgz"; - path = fetchurl { - name = "elliptic___elliptic_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; - sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; }; } { @@ -5130,19 +4770,11 @@ }; } { - name = "entities___entities_1.1.2.tgz"; - path = fetchurl { - name = "entities___entities_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz"; - sha1 = "bdfa735299664dfafd34529ed4f8522a275fea56"; - }; - } - { - name = "entities___entities_2.0.3.tgz"; + name = "entities___entities_2.2.0.tgz"; path = fetchurl { - name = "entities___entities_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; - sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha1 = "098dc90ebb83d8dffa089d55256b351d34c4da55"; }; } { @@ -5154,19 +4786,19 @@ }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz"; - sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz"; + sha1 = "afbb0485e8033aa50c744efb5f5711e64fbf1ad0"; }; } { - name = "errno___errno_0.1.7.tgz"; + name = "errno___errno_0.1.8.tgz"; path = fetchurl { - name = "errno___errno_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + name = "errno___errno_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; + sha1 = "8bb3e9c7d463be4976ff888f76b4809ebc2e811f"; }; } { @@ -5186,27 +4818,11 @@ }; } { - name = "es_abstract___es_abstract_1.17.6.tgz"; + name = "es_abstract___es_abstract_1.19.1.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.6.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; - sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; - }; - } - { - name = "es_abstract___es_abstract_1.18.0_next.0.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.18.0_next.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; - sha1 = "b302834927e624d8e5837ed48224291f2c66e6fc"; - }; - } - { - name = "es_abstract___es_abstract_1.18.0.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz"; - sha1 = "ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"; + name = "es_abstract___es_abstract_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz"; + sha1 = "d4885796876916959de78edaa0df456627115ec3"; }; } { @@ -5241,14 +4857,6 @@ sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } - { - name = "escalade___escalade_3.0.2.tgz"; - path = fetchurl { - name = "escalade___escalade_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz"; - sha1 = "6a580d70edb87880f22b4c91d0d56078df6962c4"; - }; - } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -5306,11 +4914,11 @@ }; } { - name = "eslint_config_prettier___eslint_config_prettier_6.11.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz"; - sha1 = "f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"; + name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; + sha1 = "7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"; }; } { @@ -5322,99 +4930,75 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; - }; - } - { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_5.4.0.tgz"; - path = fetchurl { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.4.0.tgz"; - sha1 = "a559526e56403cb97b470b524957fc526e2485fe"; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; - sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; + sha1 = "4048b958395da89668252001dbd9eca6b83bacbd"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.7.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; - sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; + name = "eslint_module_utils___eslint_module_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz"; + sha1 = "b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"; }; } { - name = "eslint_plugin_jest___eslint_plugin_jest_24.0.0.tgz"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_5.10.0.tgz"; path = fetchurl { - name = "eslint_plugin_jest___eslint_plugin_jest_24.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.0.0.tgz"; - sha1 = "6b1c460c529104c7d16d889e76fe708b281c4d14"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz"; + sha1 = "7764cc63940f215bf3f0bd2d9a1293b2b9b2b4bb"; }; } { - name = "eslint_plugin_jest___eslint_plugin_jest_24.3.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.25.3.tgz"; path = fetchurl { - name = "eslint_plugin_jest___eslint_plugin_jest_24.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.2.tgz"; - sha1 = "30a8b2dea6278d0da1d6fb9d6cd530aaf58050a1"; + name = "eslint_plugin_import___eslint_plugin_import_2.25.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz"; + sha1 = "a554b5f66e08fb4f6dc99221866e57cfff824766"; }; } { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + name = "eslint_plugin_jest___eslint_plugin_jest_24.7.0.tgz"; path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; - sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; + name = "eslint_plugin_jest___eslint_plugin_jest_24.7.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.7.0.tgz"; + sha1 = "206ac0833841e59e375170b15f8d0955219c4889"; }; } { - name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.2.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.5.1.tgz"; path = fetchurl { - name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz"; - sha1 = "0c6d25a6b94cb3e0110a23d129760af5860edb6e"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.5.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz"; + sha1 = "cdbf2df901040ca140b6ec14715c988889c2a6d8"; }; } { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.3.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"; + name = "eslint_plugin_prefer_arrow___eslint_plugin_prefer_arrow_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz"; + sha1 = "e7fbb3fa4cd84ff1015b9c51ad86550e55041041"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.20.6.tgz"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.20.6.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.6.tgz"; - sha1 = "4d7845311a93c463493ccfa0a19c9c5d0fd69f60"; + 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"; + sha1 = "318dbf312e06fab1c835a4abef00121751ac1172"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.23.1.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.27.1.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.23.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz"; - sha1 = "f1a2e844c0d1967c822388204a8bc4dee8415b11"; + name = "eslint_plugin_react___eslint_plugin_react_7.27.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz"; + sha1 = "469202442506616f77a854d91babaae1ec174b45"; }; } { @@ -5441,14 +5025,6 @@ sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; }; } - { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; - }; - } { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { @@ -5458,11 +5034,11 @@ }; } { - name = "eslint_template_visitor___eslint_template_visitor_2.2.1.tgz"; + name = "eslint_template_visitor___eslint_template_visitor_2.3.2.tgz"; path = fetchurl { - name = "eslint_template_visitor___eslint_template_visitor_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-2.2.1.tgz"; - sha1 = "2dccb1ab28fa7429e56ba6dd0144def2d89bc2d6"; + name = "eslint_template_visitor___eslint_template_visitor_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-2.3.2.tgz"; + sha1 = "b52f96ff311e773a345d79053ccc78275bbc463d"; }; } { @@ -5473,6 +5049,14 @@ sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } + { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + 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"; + }; + } { name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { @@ -5482,27 +5066,27 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + 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"; }; } { - name = "eslint_webpack_plugin___eslint_webpack_plugin_2.5.3.tgz"; + name = "eslint_webpack_plugin___eslint_webpack_plugin_2.6.0.tgz"; path = fetchurl { - name = "eslint_webpack_plugin___eslint_webpack_plugin_2.5.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.3.tgz"; - sha1 = "a125585a1d8bb9c939f2a920a9bc9be4a21cdb58"; + name = "eslint_webpack_plugin___eslint_webpack_plugin_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.6.0.tgz"; + sha1 = "3bd4ada4e539cb1f6687d2f619073dbb509361cd"; }; } { - name = "eslint___eslint_7.23.0.tgz"; + name = "eslint___eslint_7.32.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.23.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz"; - sha1 = "8d029d252f6e8cf45894b4bee08f5493f8e94325"; + name = "eslint___eslint_7.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; + sha1 = "c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"; }; } { @@ -5521,14 +5105,6 @@ sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; }; } - { - name = "esquery___esquery_1.3.1.tgz"; - path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; - }; - } { name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { @@ -5554,11 +5130,11 @@ }; } { - 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"; + sha1 = "2eea5290702f26ab8fe5370370ff86c965d21123"; }; } { @@ -5602,19 +5178,19 @@ }; } { - name = "events___events_3.2.0.tgz"; + name = "events___events_3.3.0.tgz"; path = fetchurl { - name = "events___events_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; - sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; }; } { - name = "eventsource___eventsource_1.0.7.tgz"; + name = "eventsource___eventsource_1.1.0.tgz"; path = fetchurl { - name = "eventsource___eventsource_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; - sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + name = "eventsource___eventsource_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz"; + sha1 = "00e8ca7c92109e94b0ddf32dac677d841028cfaf"; }; } { @@ -5626,11 +5202,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.4.tgz"; + name = "exec_sh___exec_sh_0.3.6.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + name = "exec_sh___exec_sh_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz"; + sha1 = "ff264f9e325519a60cb5e273692943483cca63bc"; }; } { @@ -5682,11 +5258,11 @@ }; } { - name = "ext___ext_1.4.0.tgz"; + name = "ext___ext_1.6.0.tgz"; path = fetchurl { - name = "ext___ext_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; - sha1 = "89ae7a07158f79d35517882904324077e4379244"; + name = "ext___ext_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz"; + sha1 = "3871d50641e874cc172e2b53f919842d19db4c52"; }; } { @@ -5729,22 +5305,6 @@ sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; }; } - { - name = "extsprintf___extsprintf_1.3.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - } - { - name = "extsprintf___extsprintf_1.4.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; - }; - } { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; path = fetchurl { @@ -5754,11 +5314,11 @@ }; } { - name = "fast_glob___fast_glob_3.2.4.tgz"; + name = "fast_glob___fast_glob_3.2.7.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz"; - sha1 = "d20aefbf99579383e7f3cc66529158c9b98554d3"; + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; }; } { @@ -5778,19 +5338,19 @@ }; } { - name = "fastq___fastq_1.8.0.tgz"; + name = "fastq___fastq_1.13.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz"; - sha1 = "550e1f9f59bbc65fe185cb6a9b4d95357107f481"; + name = "fastq___fastq_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; + sha1 = "616760f88a7526bdfc596b7cab8c18938c36b98c"; }; } { - name = "faye_websocket___faye_websocket_0.11.3.tgz"; + name = "faye_websocket___faye_websocket_0.11.4.tgz"; path = fetchurl { - name = "faye_websocket___faye_websocket_0.11.3.tgz"; - url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e"; + name = "faye_websocket___faye_websocket_0.11.4.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz"; + sha1 = "7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"; }; } { @@ -5802,11 +5362,11 @@ }; } { - name = "fbjs___fbjs_0.8.17.tgz"; + name = "fbjs___fbjs_0.8.18.tgz"; path = fetchurl { - name = "fbjs___fbjs_0.8.17.tgz"; - url = "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz"; - sha1 = "c4d598ead6949112653d6588b01a5cdcd9f90fdd"; + name = "fbjs___fbjs_0.8.18.tgz"; + url = "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz"; + sha1 = "9835e0addb9aca2eff53295cd79ca1cfc7c9662a"; }; } { @@ -5890,11 +5450,11 @@ }; } { - name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha1 = "b30c5b6eff0730731aea9bbd9dbecbd80256d64b"; }; } { @@ -5930,11 +5490,11 @@ }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.4.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + name = "flatted___flatted_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz"; + sha1 = "28d9969ea90661b5134259f312ab6aa7929ac5e2"; }; } { @@ -5954,11 +5514,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; + name = "follow_redirects___follow_redirects_1.14.5.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; + name = "follow_redirects___follow_redirects_1.14.5.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; + sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; }; } { @@ -5969,14 +5529,6 @@ sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; }; } - { - name = "forever_agent___forever_agent_0.6.1.tgz"; - path = fetchurl { - name = "forever_agent___forever_agent_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - } { name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_4.1.6.tgz"; path = fetchurl { @@ -5986,19 +5538,19 @@ }; } { - name = "form_data___form_data_2.3.3.tgz"; + name = "form_data___form_data_3.0.1.tgz"; path = fetchurl { - name = "form_data___form_data_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + name = "form_data___form_data_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; + sha1 = "ebd53791b78356a99af9a300d4282c4d5eb9755f"; }; } { - name = "forwarded___forwarded_0.1.2.tgz"; + name = "forwarded___forwarded_0.2.0.tgz"; path = fetchurl { - name = "forwarded___forwarded_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; }; } { @@ -6097,14 +5649,6 @@ sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; }; } - { - name = "fsevents___fsevents_2.1.3.tgz"; - path = fetchurl { - name = "fsevents___fsevents_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; - sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; - }; - } { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -6114,11 +5658,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.5.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; - sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; + name = "function.prototype.name___function.prototype.name_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha1 = "cce0505fe1ffb80503e6f9e46cc64e46a12a9621"; }; } { @@ -6130,19 +5674,11 @@ }; } { - name = "functions_have_names___functions_have_names_1.2.1.tgz"; + name = "functions_have_names___functions_have_names_1.2.2.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; - sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; - }; - } - { - name = "gensync___gensync_1.0.0_beta.1.tgz"; - path = fetchurl { - name = "gensync___gensync_1.0.0_beta.1.tgz"; - url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; + name = "functions_have_names___functions_have_names_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz"; + sha1 = "98d93991c39da9361f8e50b337c4f6e41f120e21"; }; } { @@ -6185,6 +5721,14 @@ sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; }; } + { + name = "get_port___get_port_6.0.0.tgz"; + path = fetchurl { + name = "get_port___get_port_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-port/-/get-port-6.0.0.tgz"; + sha1 = "eeac06c17b9d22c2949d4ce5abcc80753afe9be1"; + }; + } { name = "get_port___get_port_5.1.1.tgz"; path = fetchurl { @@ -6218,19 +5762,19 @@ }; } { - name = "get_value___get_value_2.0.6.tgz"; + name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; path = fetchurl { - name = "get_value___get_value_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + 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"; }; } { - name = "getpass___getpass_0.1.7.tgz"; + name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { - name = "getpass___getpass_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; } { @@ -6242,19 +5786,19 @@ }; } { - name = "glob_parent___glob_parent_5.1.1.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { - name = "glob___glob_7.1.6.tgz"; + name = "glob___glob_7.2.0.tgz"; path = fetchurl { - name = "glob___glob_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; }; } { @@ -6282,19 +5826,11 @@ }; } { - 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"; - }; - } - { - name = "globals___globals_13.7.0.tgz"; + name = "globals___globals_13.12.0.tgz"; path = fetchurl { - name = "globals___globals_13.7.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz"; - sha1 = "aed3bcefd80ad3ec0f0be2cf0c895110c0591795"; + name = "globals___globals_13.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz"; + sha1 = "4d733760304230a0082ed96e21e5c565f898089e"; }; } { @@ -6306,27 +5842,27 @@ }; } { - name = "globby___globby_6.1.0.tgz"; + name = "globby___globby_11.0.4.tgz"; path = fetchurl { - name = "globby___globby_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; }; } { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; + name = "globby___globby_6.1.0.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + name = "globby___globby_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; }; } { @@ -6354,27 +5890,11 @@ }; } { - name = "har_schema___har_schema_2.0.0.tgz"; + name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; path = fetchurl { - name = "har_schema___har_schema_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - } - { - name = "har_validator___har_validator_5.1.5.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; - sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; - }; - } - { - name = "harmony_reflect___harmony_reflect_1.6.1.tgz"; - path = fetchurl { - name = "harmony_reflect___harmony_reflect_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz"; - sha1 = "c108d4f2bb451efef7a37861fdbdae72c9bdefa9"; + name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz"; + sha1 = "31ecbd32e648a34d030d86adb67d4d47547fe710"; }; } { @@ -6401,14 +5921,6 @@ sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; }; } - { - name = "has_symbols___has_symbols_1.0.1.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; - }; - } { name = "has_symbols___has_symbols_1.0.2.tgz"; path = fetchurl { @@ -6417,6 +5929,14 @@ sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; }; } + { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + 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"; + }; + } { name = "has_value___has_value_0.3.1.tgz"; path = fetchurl { @@ -6522,11 +6042,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; }; } { @@ -6553,14 +6073,6 @@ sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; }; } - { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - path = fetchurl { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; - }; - } { name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; path = fetchurl { @@ -6577,14 +6089,6 @@ sha1 = "cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"; }; } - { - name = "html_entities___html_entities_1.3.1.tgz"; - path = fetchurl { - name = "html_entities___html_entities_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; - sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; - }; - } { name = "html_escaper___html_escaper_2.0.2.tgz"; path = fetchurl { @@ -6610,11 +6114,11 @@ }; } { - name = "htmlparser2___htmlparser2_3.10.1.tgz"; + name = "htmlparser2___htmlparser2_6.1.0.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_3.10.1.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha1 = "bd679dc3f59897b6a34bb10749c855bb53a9392f"; + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha1 = "c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"; }; } { @@ -6650,11 +6154,19 @@ }; } { - name = "http_parser_js___http_parser_js_0.5.2.tgz"; + name = "http_parser_js___http_parser_js_0.5.5.tgz"; path = fetchurl { - name = "http_parser_js___http_parser_js_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz"; - sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77"; + name = "http_parser_js___http_parser_js_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz"; + sha1 = "d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha1 = "8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"; }; } { @@ -6673,14 +6185,6 @@ sha1 = "401541f0534884bbf95260334e72f88ee3976549"; }; } - { - name = "http_signature___http_signature_1.2.0.tgz"; - path = fetchurl { - name = "http_signature___http_signature_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - } { name = "https_browserify___https_browserify_1.0.0.tgz"; path = fetchurl { @@ -6722,11 +6226,11 @@ }; } { - name = "iconv_lite___iconv_lite_0.6.2.tgz"; + name = "iconv_lite___iconv_lite_0.6.3.tgz"; path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; }; } { @@ -6746,11 +6250,11 @@ }; } { - name = "ieee754___ieee754_1.1.13.tgz"; + name = "ieee754___ieee754_1.2.1.tgz"; path = fetchurl { - name = "ieee754___ieee754_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; }; } { @@ -6770,11 +6274,11 @@ }; } { - name = "ignore___ignore_5.1.8.tgz"; + name = "ignore___ignore_5.1.9.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.1.9.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz"; + sha1 = "9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"; }; } { @@ -6801,14 +6305,6 @@ sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; } - { - name = "import_fresh___import_fresh_3.2.1.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; - }; - } { name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { @@ -6834,19 +6330,19 @@ }; } { - name = "import_local___import_local_3.0.2.tgz"; + name = "import_local___import_local_3.0.3.tgz"; path = fetchurl { - name = "import_local___import_local_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; - sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + name = "import_local___import_local_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz"; + sha1 = "4d51c2c495ca9393da259ec66b62e022920211e0"; }; } { - name = "import_modules___import_modules_2.0.0.tgz"; + name = "import_modules___import_modules_2.1.0.tgz"; path = fetchurl { - name = "import_modules___import_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-modules/-/import-modules-2.0.0.tgz"; - sha1 = "9c1e13b4e7a15682f70a6e3fa29534e4540cfc5d"; + name = "import_modules___import_modules_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-modules/-/import-modules-2.1.0.tgz"; + sha1 = "abe7df297cb6c1f19b57246eb8b8bd9664b6d8c2"; }; } { @@ -6857,14 +6353,6 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } - { - name = "indefinite_observable___indefinite_observable_2.0.1.tgz"; - path = fetchurl { - name = "indefinite_observable___indefinite_observable_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-2.0.1.tgz"; - sha1 = "574af29bfbc17eb5947793797bddc94c9d859400"; - }; - } { name = "indent_string___indent_string_4.0.0.tgz"; path = fetchurl { @@ -6922,11 +6410,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { @@ -6945,14 +6433,6 @@ sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; }; } - { - name = "internal_slot___internal_slot_1.0.2.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; - }; - } { name = "internal_slot___internal_slot_1.0.3.tgz"; path = fetchurl { @@ -7034,11 +6514,11 @@ }; } { - name = "is_arguments___is_arguments_1.0.4.tgz"; + name = "is_arguments___is_arguments_1.1.1.tgz"; path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + name = "is_arguments___is_arguments_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz"; + sha1 = "15b3f88fda01f2a97fec84ca761a560f123efa9b"; }; } { @@ -7058,11 +6538,11 @@ }; } { - name = "is_bigint___is_bigint_1.0.1.tgz"; + name = "is_bigint___is_bigint_1.0.4.tgz"; path = fetchurl { - name = "is_bigint___is_bigint_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz"; - sha1 = "6923051dfcbc764278540b9ce0e6b3213aa5ebc2"; + name = "is_bigint___is_bigint_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; + sha1 = "08147a1875bc2b32005d41ccd8291dffc6691df3"; }; } { @@ -7082,11 +6562,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha1 = "e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"; + 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"; }; } { @@ -7106,19 +6586,11 @@ }; } { - name = "is_callable___is_callable_1.2.1.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.1.tgz"; - sha1 = "4d1e21a4f437509d25ce55f8184350771421c96d"; - }; - } - { - name = "is_callable___is_callable_1.2.3.tgz"; + name = "is_callable___is_callable_1.2.4.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; - sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; + name = "is_callable___is_callable_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; + sha1 = "47301d58dd0259407865547853df6d61fe471945"; }; } { @@ -7138,11 +6610,11 @@ }; } { - name = "is_core_module___is_core_module_2.2.0.tgz"; + name = "is_core_module___is_core_module_2.8.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; - sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + name = "is_core_module___is_core_module_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; + sha1 = "0321336c3d0925e497fd97f5d95cb114a5ccd548"; }; } { @@ -7162,11 +6634,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.2.tgz"; + name = "is_date_object___is_date_object_1.0.5.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + 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"; }; } { @@ -7202,11 +6674,11 @@ }; } { - name = "is_docker___is_docker_2.1.1.tgz"; + name = "is_docker___is_docker_2.2.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; }; } { @@ -7266,11 +6738,11 @@ }; } { - name = "is_glob___is_glob_4.0.1.tgz"; + name = "is_glob___is_glob_4.0.3.tgz"; path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + name = "is_glob___is_glob_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; + sha1 = "64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"; }; } { @@ -7297,14 +6769,6 @@ sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; }; } - { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; - path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; - sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; - }; - } { name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; path = fetchurl { @@ -7314,11 +6778,11 @@ }; } { - name = "is_number_object___is_number_object_1.0.4.tgz"; + name = "is_number_object___is_number_object_1.0.6.tgz"; path = fetchurl { - name = "is_number_object___is_number_object_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz"; - sha1 = "36ac95e741cf18b283fc1ddf5e83da798e3ec197"; + 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"; }; } { @@ -7402,27 +6866,19 @@ }; } { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; - }; - } - { - name = "is_regex___is_regex_1.1.1.tgz"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; - sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; }; } { - name = "is_regex___is_regex_1.1.2.tgz"; + name = "is_regex___is_regex_1.1.4.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz"; - sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251"; + name = "is_regex___is_regex_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; + sha1 = "eef5663cd59fa4c0ae339505323df6854bb15958"; }; } { @@ -7450,43 +6906,43 @@ }; } { - name = "is_stream___is_stream_1.1.0.tgz"; + name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + 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"; }; } { - name = "is_stream___is_stream_2.0.0.tgz"; + name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { - name = "is_stream___is_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; - sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; } { - name = "is_string___is_string_1.0.5.tgz"; + name = "is_stream___is_stream_2.0.1.tgz"; path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; }; } { - name = "is_svg___is_svg_3.0.0.tgz"; + name = "is_string___is_string_1.0.7.tgz"; path = fetchurl { - name = "is_svg___is_svg_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz"; - sha1 = "9321dbd29c212e5ca99c4fa9794c714bcafa2f75"; + name = "is_string___is_string_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; + sha1 = "0dd12bf2006f255bb58f695110eff7491eebc0fd"; }; } { - name = "is_symbol___is_symbol_1.0.3.tgz"; + name = "is_symbol___is_symbol_1.0.4.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; }; } { @@ -7497,6 +6953,14 @@ sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; } + { + name = "is_weakref___is_weakref_1.0.1.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_windows___is_windows_1.0.2.tgz"; path = fetchurl { @@ -7570,19 +7034,11 @@ }; } { - name = "isstream___isstream_0.1.2.tgz"; - path = fetchurl { - name = "isstream___isstream_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - } - { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.2.0.tgz"; path = fetchurl { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec"; + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; + sha1 = "189e7909d0a39fa5a3dfad5b03f71947770191d3"; }; } { @@ -7593,6 +7049,14 @@ sha1 = "873c6fff897450118222774696a3f28902d77c1d"; }; } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz"; + sha1 = "7b49198b657b27a730b8e9cb601f1e1bff24c59a"; + }; + } { name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; path = fetchurl { @@ -7602,19 +7066,19 @@ }; } { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.1.tgz"; path = fetchurl { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; - sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; + sha1 = "895f3a709fcfba34c6de5a42939022f3e4358551"; }; } { - name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + name = "istanbul_reports___istanbul_reports_3.1.1.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; + name = "istanbul_reports___istanbul_reports_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.1.tgz"; + sha1 = "7085857f17d2441053c6ce5c3b8fdf6882289397"; }; } { @@ -7865,6 +7329,14 @@ sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; }; } + { + name = "jest_worker___jest_worker_27.4.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_27.4.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.2.tgz"; + sha1 = "0fb123d50955af1a450267787f340a1bf7e12bc4"; + }; + } { name = "jest___jest_26.6.0.tgz"; path = fetchurl { @@ -7874,19 +7346,19 @@ }; } { - name = "joi___joi_17.4.0.tgz"; + name = "joi___joi_17.5.0.tgz"; path = fetchurl { - name = "joi___joi_17.4.0.tgz"; - url = "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz"; - sha1 = "b5c2277c8519e016316e49ababd41a1908d9ef20"; + name = "joi___joi_17.5.0.tgz"; + url = "https://registry.yarnpkg.com/joi/-/joi-17.5.0.tgz"; + sha1 = "7e66d0004b5045d971cf416a55fb61d33ac6e011"; }; } { - name = "js_base64___js_base64_3.6.1.tgz"; + name = "js_base64___js_base64_3.7.2.tgz"; path = fetchurl { - name = "js_base64___js_base64_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-3.6.1.tgz"; - sha1 = "555aae398b74694b4037af1f8a5a6209d170efbe"; + name = "js_base64___js_base64_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.2.tgz"; + sha1 = "816d11d81a8aff241603d19ce5761e13e41d7745"; }; } { @@ -7898,27 +7370,19 @@ }; } { - name = "js_yaml___js_yaml_3.14.0.tgz"; + name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; - sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } { - name = "jsbn___jsbn_0.1.1.tgz"; + name = "jsdom___jsdom_16.7.0.tgz"; path = fetchurl { - name = "jsbn___jsbn_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - } - { - name = "jsdom___jsdom_16.5.1.tgz"; - path = fetchurl { - name = "jsdom___jsdom_16.5.1.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz"; - sha1 = "4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"; + name = "jsdom___jsdom_16.7.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz"; + sha1 = "918ae71965424b197c819f8183a754e18977b710"; }; } { @@ -7969,14 +7433,6 @@ sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; }; } - { - name = "json_schema___json_schema_0.2.3.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - } { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; path = fetchurl { @@ -7985,14 +7441,6 @@ sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; } - { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - } { name = "json3___json3_3.3.3.tgz"; path = fetchurl { @@ -8010,11 +7458,11 @@ }; } { - name = "json5___json5_2.1.3.tgz"; + name = "json5___json5_2.2.0.tgz"; path = fetchurl { - name = "json5___json5_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; }; } { @@ -8034,91 +7482,75 @@ }; } { - name = "jsprim___jsprim_1.4.1.tgz"; - path = fetchurl { - name = "jsprim___jsprim_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - } - { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.6.0.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.6.0.tgz"; - sha1 = "93d2cd704bf0c4af70cc40fb52d74b8a2554b170"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz"; + sha1 = "8d7f915c8115afaff8cbde08faf610ec9892fba6"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.6.0.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.6.0.tgz"; - sha1 = "af47972486819b375f0f3a9e0213403a84b5ef3b"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz"; + sha1 = "c66f12e02e0815d911b85c02c2a979ee7b4ce69a"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.6.0.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.6.0.tgz"; - sha1 = "3e8011f760f399cbadcca7f10a485b729c50e3ed"; + name = "jss_plugin_global___jss_plugin_global_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.8.2.tgz"; + sha1 = "1a35632a693cf50113bcc5ffe6b51969df79c4ec"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.6.0.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.6.0.tgz"; - sha1 = "5f83c5c337d3b38004834e8426957715a0251641"; + name = "jss_plugin_nested___jss_plugin_nested_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.8.2.tgz"; + sha1 = "79f3c7f75ea6a36ae72fe52e777035bb24d230c7"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.6.0.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.6.0.tgz"; - sha1 = "297879f35f9fe21196448579fee37bcde28ce6bc"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.2.tgz"; + sha1 = "e25a7471868652c394562b6dc5433dcaea7dff6f"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.6.0.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.6.0.tgz"; - sha1 = "3c1a557236a139d0151e70a82c810ccce1c1c5ea"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.2.tgz"; + sha1 = "55354b55f1b2968a15976729968f767f02d64049"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.6.0.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.8.2.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.6.0.tgz"; - sha1 = "e1fcd499352846890c38085b11dbd7aa1c4f2c78"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.2.tgz"; + sha1 = "ebb4a482642f34091e454901e21176441dd5f475"; }; } { - name = "jss___jss_10.6.0.tgz"; + name = "jss___jss_10.8.2.tgz"; path = fetchurl { - name = "jss___jss_10.6.0.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.6.0.tgz"; - sha1 = "d92ff9d0f214f65ca1718591b68e107be4774149"; + name = "jss___jss_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.8.2.tgz"; + sha1 = "4b2a30b094b924629a64928236017a52c7c97505"; }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_3.2.1.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; - sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; - }; - } - { - name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; - path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; - sha1 = "41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"; + 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"; }; } { @@ -8170,11 +7602,11 @@ }; } { - name = "klona___klona_2.0.4.tgz"; + name = "klona___klona_2.0.5.tgz"; path = fetchurl { - name = "klona___klona_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; - sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + name = "klona___klona_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz"; + sha1 = "d166574d90076395d9963aa7a928fabb8d76afbc"; }; } { @@ -8226,19 +7658,11 @@ }; } { - name = "lines_and_columns___lines_and_columns_1.1.6.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 = "load_json_file___load_json_file_2.0.0.tgz"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { - name = "load_json_file___load_json_file_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + 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"; + sha1 = "eca284f75d2965079309dc0ad9255abb2ebc1632"; }; } { @@ -8273,6 +7697,14 @@ sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; }; } + { + name = "loader_utils___loader_utils_2.0.2.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz"; + sha1 = "d6e3b4fb81870721ae4e0868ab11dd638368c129"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -8345,6 +7777,14 @@ sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; }; } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + 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"; + }; + } { name = "lodash.template___lodash.template_4.5.0.tgz"; path = fetchurl { @@ -8361,6 +7801,14 @@ sha1 = "e481310f049d3cf6d47e912ad09313b154f0fb33"; }; } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + 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"; + }; + } { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { @@ -8377,14 +7825,6 @@ sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; }; } - { - name = "lodash___lodash_4.17.20.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; - }; - } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -8394,11 +7834,11 @@ }; } { - name = "loglevel___loglevel_1.7.0.tgz"; + name = "loglevel___loglevel_1.8.0.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; - sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; + name = "loglevel___loglevel_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.0.tgz"; + sha1 = "e7ec73a57e1e7b419cb6c6ac06bf050b67356114"; }; } { @@ -8418,11 +7858,11 @@ }; } { - name = "lower_case___lower_case_2.0.1.tgz"; + name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { - name = "lower_case___lower_case_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; - sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; + name = "lower_case___lower_case_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; + sha1 = "6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"; }; } { @@ -8466,11 +7906,11 @@ }; } { - name = "makeerror___makeerror_1.0.11.tgz"; + name = "makeerror___makeerror_1.0.12.tgz"; path = fetchurl { - name = "makeerror___makeerror_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; - sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + name = "makeerror___makeerror_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz"; + sha1 = "3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"; }; } { @@ -8594,19 +8034,19 @@ }; } { - name = "mdn_data___mdn_data_2.0.4.tgz"; + name = "mdn_data___mdn_data_2.0.14.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; - sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; + name = "mdn_data___mdn_data_2.0.14.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; + sha1 = "7113fc4281917d63ce29b43446f701e68c25ba50"; }; } { - name = "mdn_data___mdn_data_2.0.6.tgz"; + name = "mdn_data___mdn_data_2.0.4.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; - sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; + name = "mdn_data___mdn_data_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; + sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; }; } { @@ -8746,11 +8186,11 @@ }; } { - name = "micromatch___micromatch_4.0.2.tgz"; + name = "micromatch___micromatch_4.0.4.tgz"; path = fetchurl { - name = "micromatch___micromatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; }; } { @@ -8762,35 +8202,19 @@ }; } { - name = "mime_db___mime_db_1.44.0.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; }; } { - name = "mime_db___mime_db_1.46.0.tgz"; + name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.46.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz"; - sha1 = "6267748a7f799594de3cbc8cde91def349661cee"; - }; - } - { - name = "mime_types___mime_types_2.1.27.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; - }; - } - { - name = "mime_types___mime_types_2.1.29.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.29.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz"; - sha1 = "1d4ab77da64b91f5f72489df29236563754bb1b2"; + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; }; } { @@ -8802,11 +8226,11 @@ }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.6.0.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; + sha1 = "a2a682a95cd4d0cb1d6257e28f83da7e35800367"; }; } { @@ -8818,11 +8242,11 @@ }; } { - name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz"; + name = "mini_create_react_context___mini_create_react_context_0.4.1.tgz"; path = fetchurl { - name = "mini_create_react_context___mini_create_react_context_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz"; - sha1 = "df60501c83151db69e28eac0ef08b4002efab040"; + name = "mini_create_react_context___mini_create_react_context_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz"; + sha1 = "072171561bfdc922da08a60c2197a497cc2d1d5e"; }; } { @@ -8890,11 +8314,11 @@ }; } { - name = "minipass___minipass_3.1.3.tgz"; + name = "minipass___minipass_3.1.5.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; - sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + name = "minipass___minipass_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; + sha1 = "71f6251b0a33a49c01b3cf97ff77eda030dff732"; }; } { @@ -9001,6 +8425,14 @@ sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } { name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; path = fetchurl { @@ -9026,19 +8458,19 @@ }; } { - name = "nan___nan_2.14.1.tgz"; + name = "nan___nan_2.15.0.tgz"; path = fetchurl { - name = "nan___nan_2.14.1.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; - sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee"; }; } { - name = "nanoid___nanoid_3.1.22.tgz"; + name = "nanoid___nanoid_3.1.30.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.22.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; - sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + name = "nanoid___nanoid_3.1.30.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz"; + sha1 = "63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"; }; } { @@ -9098,11 +8530,11 @@ }; } { - name = "no_case___no_case_3.0.3.tgz"; + name = "no_case___no_case_3.0.4.tgz"; path = fetchurl { - name = "no_case___no_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; - sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; + name = "no_case___no_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; + sha1 = "d361fd5c9800f558551a8369fc0dcd4662b6124d"; }; } { @@ -9162,19 +8594,19 @@ }; } { - name = "node_releases___node_releases_1.1.61.tgz"; + name = "node_releases___node_releases_1.1.77.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.61.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; - sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; + name = "node_releases___node_releases_1.1.77.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz"; + sha1 = "50b0cfede855dd374e7585bf228ff34e57c1c32e"; }; } { - name = "node_releases___node_releases_1.1.71.tgz"; + name = "node_releases___node_releases_2.0.1.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.71.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; - sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; + name = "node_releases___node_releases_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz"; + sha1 = "3d1d395f204f1f2f29a54358b9fb678765ad2fc5"; }; } { @@ -9257,6 +8689,14 @@ sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; }; } + { + name = "nth_check___nth_check_2.0.1.tgz"; + path = fetchurl { + name = "nth_check___nth_check_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz"; + sha1 = "2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"; + }; + } { name = "num2fraction___num2fraction_1.2.2.tgz"; path = fetchurl { @@ -9273,14 +8713,6 @@ sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; }; } - { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - path = fetchurl { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; - }; - } { name = "object_assign___object_assign_4.0.1.tgz"; path = fetchurl { @@ -9306,27 +8738,19 @@ }; } { - name = "object_inspect___object_inspect_1.8.0.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; - }; - } - { - name = "object_inspect___object_inspect_1.9.0.tgz"; + name = "object_inspect___object_inspect_1.11.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; - sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; + 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_is___object_is_1.1.2.tgz"; + name = "object_is___object_is_1.1.5.tgz"; path = fetchurl { - name = "object_is___object_is_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; - sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; + name = "object_is___object_is_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; + sha1 = "b9deeaa5fc7f1846a0faecdceec138e5778f53ac"; }; } { @@ -9345,14 +8769,6 @@ sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; } - { - name = "object.assign___object.assign_4.1.1.tgz"; - 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 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; - }; - } { name = "object.assign___object.assign_4.1.2.tgz"; path = fetchurl { @@ -9362,43 +8778,35 @@ }; } { - name = "object.entries___object.entries_1.1.2.tgz"; - path = fetchurl { - name = "object.entries___object.entries_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; - sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; - }; - } - { - name = "object.entries___object.entries_1.1.3.tgz"; + name = "object.entries___object.entries_1.1.5.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; - sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; + name = "object.entries___object.entries_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz"; + sha1 = "e1acdd17c4de2cd96d5a08487cfb9db84d881861"; }; } { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; + name = "object.fromentries___object.fromentries_2.0.5.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; + name = "object.fromentries___object.fromentries_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz"; + sha1 = "7b37b205109c21e741e605727fe8b0ad5fa08251"; }; } { - name = "object.fromentries___object.fromentries_2.0.4.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.3.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; - sha1 = "26e1ba5c4571c5c6f0890cef4473066456a120b8"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; + sha1 = "b223cf38e17fefb97a63c10c91df72ccb386df9e"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + name = "object.hasown___object.hasown_1.1.0.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; + name = "object.hasown___object.hasown_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz"; + sha1 = "7232ed266f34d197d15cac5880232f7a4790afe5"; }; } { @@ -9410,19 +8818,11 @@ }; } { - name = "object.values___object.values_1.1.1.tgz"; + name = "object.values___object.values_1.1.5.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; - }; - } - { - name = "object.values___object.values_1.1.3.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; - sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; + name = "object.values___object.values_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz"; + sha1 = "959f63e3ce9ef108720333082131e4a459b716ac"; }; } { @@ -9466,11 +8866,11 @@ }; } { - name = "open___open_7.2.1.tgz"; + name = "open___open_7.4.2.tgz"; path = fetchurl { - name = "open___open_7.2.1.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.2.1.tgz"; - sha1 = "07b0ade11a43f2a8ce718480bdf3d7563a095195"; + name = "open___open_7.4.2.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz"; + sha1 = "b8147e26dcf3e426316c730089fd71edd29c2321"; }; } { @@ -9642,11 +9042,11 @@ }; } { - name = "param_case___param_case_3.0.3.tgz"; + name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { - name = "param_case___param_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; - sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; + name = "param_case___param_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; + sha1 = "7d17fe4aa12bde34d4a77d91acfb6219caad01c5"; }; } { @@ -9673,14 +9073,6 @@ sha1 = "53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"; }; } - { - name = "parse_json___parse_json_2.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - } { name = "parse_json___parse_json_4.0.0.tgz"; path = fetchurl { @@ -9690,11 +9082,11 @@ }; } { - name = "parse_json___parse_json_5.1.0.tgz"; + name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; - sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; }; } { @@ -9714,11 +9106,11 @@ }; } { - name = "pascal_case___pascal_case_3.1.1.tgz"; + name = "pascal_case___pascal_case_3.1.2.tgz"; path = fetchurl { - name = "pascal_case___pascal_case_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; - sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + name = "pascal_case___pascal_case_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; + sha1 = "b48e0ef2b98e205e7c1dae747d0b1508237660eb"; }; } { @@ -9794,11 +9186,11 @@ }; } { - name = "path_parse___path_parse_1.0.6.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; }; } { @@ -9817,14 +9209,6 @@ sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a"; }; } - { - name = "path_type___path_type_2.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - } { name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { @@ -9834,11 +9218,11 @@ }; } { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; + name = "pbkdf2___pbkdf2_3.1.2.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha1 = "dd822aa0887580e52f1a039dc3eda108efae3075"; }; } { @@ -9858,11 +9242,27 @@ }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "picocolors___picocolors_0.2.1.tgz"; + path = fetchurl { + name = "picocolors___picocolors_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz"; + sha1 = "570670f793646851d1ba135996962abad587859f"; + }; + } + { + name = "picocolors___picocolors_1.0.0.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "picocolors___picocolors_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz"; + sha1 = "cb5bdc74ff3f51892236eaf79d68bc44564ab81c"; + }; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; }; } { @@ -9994,11 +9394,11 @@ }; } { - name = "postcss_calc___postcss_calc_7.0.4.tgz"; + name = "postcss_calc___postcss_calc_7.0.5.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz"; - sha1 = "5e177ddb417341e6d4a193c5d9fd8ada79094f8b"; + name = "postcss_calc___postcss_calc_7.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz"; + sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e"; }; } { @@ -10162,11 +9562,11 @@ }; } { - name = "postcss_font_variant___postcss_font_variant_4.0.0.tgz"; + name = "postcss_font_variant___postcss_font_variant_4.0.1.tgz"; path = fetchurl { - name = "postcss_font_variant___postcss_font_variant_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz"; - sha1 = "71dd3c6c10a0d846c5eda07803439617bbbabacc"; + name = "postcss_font_variant___postcss_font_variant_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz"; + sha1 = "42d4c0ab30894f60f98b17561eb5c0321f502641"; }; } { @@ -10186,11 +9586,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.2.tgz"; + name = "postcss_initial___postcss_initial_3.0.4.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; - sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; + name = "postcss_initial___postcss_initial_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz"; + sha1 = "9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"; }; } { @@ -10202,11 +9602,11 @@ }; } { - name = "postcss_load_config___postcss_load_config_2.1.0.tgz"; + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; path = fetchurl { - name = "postcss_load_config___postcss_load_config_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; - sha1 = "c84d692b7bb7b41ddced94ee62e8ab31b417b003"; + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; + sha1 = "c5ea504f2c4aef33c7359a34de3573772ad7502a"; }; } { @@ -10490,11 +9890,11 @@ }; } { - name = "postcss_selector_not___postcss_selector_not_4.0.0.tgz"; + name = "postcss_selector_not___postcss_selector_not_4.0.1.tgz"; path = fetchurl { - name = "postcss_selector_not___postcss_selector_not_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz"; - sha1 = "c68ff7ba96527499e832724a2674d65603b645c0"; + name = "postcss_selector_not___postcss_selector_not_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz"; + sha1 = "263016eef1cf219e0ade9a913780fc1f48204cbf"; }; } { @@ -10514,19 +9914,19 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; }; } { - name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; path = fetchurl { - name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha1 = "17b997bc711b333bab143aaed3b8d3d6e3d38258"; + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; + sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; }; } { @@ -10546,11 +9946,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; + sha1 = "723c09920836ba6d3e5af019f92bc0971c02e514"; }; } { @@ -10562,35 +9962,27 @@ }; } { - name = "postcss___postcss_7.0.21.tgz"; - path = fetchurl { - name = "postcss___postcss_7.0.21.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; - sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; - }; - } - { - name = "postcss___postcss_7.0.32.tgz"; + name = "postcss___postcss_7.0.36.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.32.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz"; - sha1 = "4310d6ee347053da3433db2be492883d62cec59d"; + name = "postcss___postcss_7.0.36.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz"; + sha1 = "056f8cffa939662a8f5905950c07d5285644dfcb"; }; } { - name = "postcss___postcss_7.0.35.tgz"; + name = "postcss___postcss_7.0.39.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.35.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz"; - sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; + name = "postcss___postcss_7.0.39.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz"; + sha1 = "9624375d965630e2e1f2c02a935c82a59cb48309"; }; } { - name = "postcss___postcss_8.2.8.tgz"; + name = "postcss___postcss_8.4.4.tgz"; path = fetchurl { - name = "postcss___postcss_8.2.8.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.8.tgz"; - sha1 = "0b90f9382efda424c4f0f69a2ead6f6830d08ece"; + name = "postcss___postcss_8.4.4.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.4.tgz"; + sha1 = "d53d4ec6a75fd62557a66bb41978bf47ff0c2869"; }; } { @@ -10618,11 +10010,11 @@ }; } { - name = "prettier___prettier_2.3.1.tgz"; + name = "prettier___prettier_2.5.1.tgz"; path = fetchurl { - name = "prettier___prettier_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz"; - sha1 = "76903c3f8c4449bc9ac597acefa24dc5ad4cbea6"; + name = "prettier___prettier_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz"; + sha1 = "fff75fa9d519c54cf0fce328c1017d94546bc56a"; }; } { @@ -10634,11 +10026,11 @@ }; } { - name = "pretty_error___pretty_error_2.1.1.tgz"; + name = "pretty_error___pretty_error_2.1.2.tgz"; path = fetchurl { - name = "pretty_error___pretty_error_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz"; - sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; + name = "pretty_error___pretty_error_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz"; + sha1 = "be89f82d81b1c86ec8fdfbc385045882727f93b6"; }; } { @@ -10714,11 +10106,11 @@ }; } { - name = "prompts___prompts_2.3.2.tgz"; + name = "prompts___prompts_2.4.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; - sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; + name = "prompts___prompts_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz"; + sha1 = "7b57e73b3a48029ad10ebd44f74b01722a4cb069"; }; } { @@ -10746,11 +10138,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; + name = "proxy_addr___proxy_addr_2.0.7.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; }; } { @@ -10834,11 +10226,11 @@ }; } { - name = "puppeteer___puppeteer_10.0.0.tgz"; + name = "puppeteer___puppeteer_10.4.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.0.0.tgz"; - sha1 = "1b597c956103e2d989ca17f41ba4693b20a3640c"; + name = "puppeteer___puppeteer_10.4.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz"; + sha1 = "a6465ff97fda0576c4ac29601406f67e6fea3dc7"; }; } { @@ -10857,14 +10249,6 @@ sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; }; } - { - name = "qs___qs_6.5.2.tgz"; - path = fetchurl { - name = "qs___qs_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; - }; - } { name = "query_string___query_string_4.3.4.tgz"; path = fetchurl { @@ -10905,6 +10289,14 @@ sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; }; } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + 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"; + }; + } { name = "raf___raf_3.4.1.tgz"; path = fetchurl { @@ -11010,11 +10402,11 @@ }; } { - name = "react_markdown___react_markdown_6.0.2.tgz"; + name = "react_markdown___react_markdown_6.0.3.tgz"; path = fetchurl { - name = "react_markdown___react_markdown_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-6.0.2.tgz"; - sha1 = "d89be45c278b1e5f0196f851fffb11e30c69f027"; + name = "react_markdown___react_markdown_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-6.0.3.tgz"; + sha1 = "625ec767fa321d91801129387e7d31ee0cb99254"; }; } { @@ -11034,19 +10426,19 @@ }; } { - name = "react_router_dom___react_router_dom_5.2.0.tgz"; + name = "react_router_dom___react_router_dom_5.3.0.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz"; - sha1 = "9e65a4d0c45e13289e66c7b17c7e175d0ea15662"; + name = "react_router_dom___react_router_dom_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz"; + sha1 = "da1bfb535a0e89a712a93b97dd76f47ad1f32363"; }; } { - name = "react_router___react_router_5.2.0.tgz"; + name = "react_router___react_router_5.2.1.tgz"; path = fetchurl { - name = "react_router___react_router_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz"; - sha1 = "424e75641ca8747fbf76e5ecca69781aa37ea293"; + name = "react_router___react_router_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz"; + sha1 = "4d2e4e9d5ae9425091845b8dbc6d9d276239774d"; }; } { @@ -11058,11 +10450,11 @@ }; } { - name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz"; - sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1"; + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz"; + sha1 = "e98360087348e260c56d4fe2315e970480c228ae"; }; } { @@ -11074,11 +10466,11 @@ }; } { - name = "react_transition_group___react_transition_group_4.4.1.tgz"; + name = "react_transition_group___react_transition_group_4.4.2.tgz"; path = fetchurl { - name = "react_transition_group___react_transition_group_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; - sha1 = "63868f9325a38ea5ee9535d828327f85773345c9"; + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz"; + sha1 = "8b59a56f09ced7b55cbd53c36768b922890d5470"; }; } { @@ -11089,14 +10481,6 @@ sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"; }; } - { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - } { name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; path = fetchurl { @@ -11105,14 +10489,6 @@ sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; }; } - { - name = "read_pkg___read_pkg_2.0.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - } { name = "read_pkg___read_pkg_5.2.0.tgz"; path = fetchurl { @@ -11146,11 +10522,11 @@ }; } { - name = "readdirp___readdirp_3.4.0.tgz"; + name = "readdirp___readdirp_3.6.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; - sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; + name = "readdirp___readdirp_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; + sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; }; } { @@ -11170,19 +10546,19 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_9.0.0.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; + sha1 = "54d09c7115e1f53dc2314a974b32c1c344efe326"; }; } { - name = "regenerate___regenerate_1.4.1.tgz"; + name = "regenerate___regenerate_1.4.2.tgz"; path = fetchurl { - name = "regenerate___regenerate_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; - sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a"; }; } { @@ -11194,11 +10570,11 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha1 = "8925742a98ffd90814988d7566ad30ca3b263b52"; }; } { @@ -11226,19 +10602,11 @@ }; } { - name = "regexp_tree___regexp_tree_0.1.21.tgz"; + name = "regexp_tree___regexp_tree_0.1.24.tgz"; path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.21.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.21.tgz"; - sha1 = "55e2246b7f7d36f1b461490942fa780299c400d7"; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + name = "regexp_tree___regexp_tree_0.1.24.tgz"; + url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz"; + sha1 = "3d6fa238450a4d66e5bc9c4c14bb720e2196829d"; }; } { @@ -11250,27 +10618,19 @@ }; } { - name = "regexpp___regexpp_3.1.0.tgz"; - path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; - }; - } - { - name = "regexpu_core___regexpu_core_4.7.0.tgz"; + name = "regexpp___regexpp_3.2.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; }; } { - name = "regexpu_core___regexpu_core_4.7.1.tgz"; + name = "regexpu_core___regexpu_core_4.8.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; - sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; + name = "regexpu_core___regexpu_core_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz"; + sha1 = "e5605ba361b67b1718478501327502f4479a98f0"; }; } { @@ -11282,11 +10642,11 @@ }; } { - name = "regjsparser___regjsparser_0.6.4.tgz"; + name = "regjsparser___regjsparser_0.7.0.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.4.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; - sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; + name = "regjsparser___regjsparser_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz"; + sha1 = "a6b667b54c885e18b52554cb4960ef71187e9968"; }; } { @@ -11338,19 +10698,19 @@ }; } { - name = "renderkid___renderkid_2.0.3.tgz"; + name = "renderkid___renderkid_2.0.7.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz"; - sha1 = "380179c2ff5ae1365c522bf2fcfcff01c5b74149"; + name = "renderkid___renderkid_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz"; + sha1 = "464f276a6bdcee606f4a15993f9b29fc74ca8609"; }; } { - name = "repeat_element___repeat_element_1.1.3.tgz"; + name = "repeat_element___repeat_element_1.1.4.tgz"; path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; }; } { @@ -11361,30 +10721,6 @@ sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; } - { - name = "request_promise_core___request_promise_core_1.1.4.tgz"; - path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; - sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; - }; - } - { - name = "request_promise_native___request_promise_native_1.0.9.tgz"; - path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; - sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; - }; - } - { - name = "request___request_2.88.2.tgz"; - path = fetchurl { - name = "request___request_2.88.2.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; - }; - } { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { @@ -11474,11 +10810,11 @@ }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.2.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.4.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz"; - sha1 = "235e2c28e22e3e432ba7a5d4e305c59a58edfc08"; + name = "resolve_url_loader___resolve_url_loader_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.4.tgz"; + sha1 = "3c16caebe0b9faea9c7cc252fa49d2353c412320"; }; } { @@ -11497,14 +10833,6 @@ sha1 = "018fcb2c5b207d2a6424aee361c5a266da8f4130"; }; } - { - name = "resolve___resolve_1.17.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; - }; - } { name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { @@ -11642,11 +10970,11 @@ }; } { - name = "run_parallel___run_parallel_1.1.9.tgz"; + name = "run_parallel___run_parallel_1.2.0.tgz"; path = fetchurl { - name = "run_parallel___run_parallel_1.1.9.tgz"; - url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz"; - sha1 = "c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"; + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; }; } { @@ -11722,11 +11050,11 @@ }; } { - name = "sass_loader___sass_loader_10.1.1.tgz"; + name = "sass_loader___sass_loader_10.2.0.tgz"; path = fetchurl { - name = "sass_loader___sass_loader_10.1.1.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz"; - sha1 = "4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"; + name = "sass_loader___sass_loader_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz"; + sha1 = "3d64c1590f911013b3fa48a0b22a83d5e1494716"; }; } { @@ -11770,11 +11098,11 @@ }; } { - name = "schema_utils___schema_utils_3.0.0.tgz"; + name = "schema_utils___schema_utils_3.1.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; - sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha1 = "bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"; }; } { @@ -11786,11 +11114,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.8.tgz"; + name = "selfsigned___selfsigned_1.10.11.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.8.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; - sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; + name = "selfsigned___selfsigned_1.10.11.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz"; + sha1 = "24929cd906fe0f44b6d01fb23999a739537acbe9"; }; } { @@ -11969,14 +11297,6 @@ sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; }; } - { - name = "side_channel___side_channel_1.0.3.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; - sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; - }; - } { name = "side_channel___side_channel_1.0.4.tgz"; path = fetchurl { @@ -11986,11 +11306,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.3.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; - sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; }; } { @@ -12050,19 +11370,19 @@ }; } { - name = "sockjs_client___sockjs_client_1.5.1.tgz"; + name = "sockjs_client___sockjs_client_1.5.2.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz"; - sha1 = "256908f6d5adfb94dabbdbd02c66362cca0f9ea6"; + name = "sockjs_client___sockjs_client_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz"; + sha1 = "4bc48c2da9ce4769f19dc723396b50f5c12330a3"; }; } { - name = "sockjs___sockjs_0.3.21.tgz"; + name = "sockjs___sockjs_0.3.24.tgz"; path = fetchurl { - name = "sockjs___sockjs_0.3.21.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz"; - sha1 = "b34ffb98e796930b60a0cfa11904d6a339a7d417"; + name = "sockjs___sockjs_0.3.24.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz"; + sha1 = "c9bc8995f33a111bea0395ec30aa3206bdb5ccce"; }; } { @@ -12081,6 +11401,14 @@ sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34"; }; } + { + name = "source_map_js___source_map_js_1.0.1.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz"; + sha1 = "a1741c131e3c77d048252adfa24e23b908670caf"; + }; + } { name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { @@ -12090,19 +11418,19 @@ }; } { - name = "source_map_support___source_map_support_0.5.19.tgz"; + name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.19.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + name = "source_map_support___source_map_support_0.5.21.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; + sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; }; } { - name = "source_map_url___source_map_url_0.4.0.tgz"; + name = "source_map_url___source_map_url_0.4.1.tgz"; path = fetchurl { - name = "source_map_url___source_map_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; }; } { @@ -12170,11 +11498,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + 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"; + sha1 = "50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"; }; } { @@ -12210,19 +11538,11 @@ }; } { - name = "sshpk___sshpk_1.16.1.tgz"; + name = "ssri___ssri_6.0.2.tgz"; path = fetchurl { - name = "sshpk___sshpk_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; - }; - } - { - name = "ssri___ssri_6.0.1.tgz"; - path = fetchurl { - name = "ssri___ssri_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; - sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; }; } { @@ -12242,11 +11562,11 @@ }; } { - name = "stack_utils___stack_utils_2.0.3.tgz"; + name = "stack_utils___stack_utils_2.0.5.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz"; - sha1 = "cd5f030126ff116b78ccb3c027fe302713b61277"; + name = "stack_utils___stack_utils_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz"; + sha1 = "d25265fca995154659dbbfba3b49254778d2fdd5"; }; } { @@ -12273,14 +11593,6 @@ sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; } - { - name = "stealthy_require___stealthy_require_1.1.1.tgz"; - path = fetchurl { - name = "stealthy_require___stealthy_require_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; - }; - } { name = "stream_browserify___stream_browserify_2.0.2.tgz"; path = fetchurl { @@ -12346,43 +11658,19 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; }; } { - name = "string_width___string_width_4.2.2.tgz"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; - sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; - }; - } - { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; - }; - } - { - name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; - sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29"; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + 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"; }; } { @@ -12393,14 +11681,6 @@ sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; }; } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; - }; - } { name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; path = fetchurl { @@ -12457,6 +11737,14 @@ sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; }; } + { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + 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"; + }; + } { name = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { @@ -12554,11 +11842,19 @@ }; } { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + name = "supports_color___supports_color_8.1.1.tgz"; + 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"; + }; + } + { + name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; - sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; + name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; + sha1 = "4f77b42488765891774b70c79babd87f9bd594bb"; }; } { @@ -12577,14 +11873,6 @@ sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; }; } - { - name = "symbol_observable___symbol_observable_1.2.0.tgz"; - path = fetchurl { - name = "symbol_observable___symbol_observable_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; - }; - } { name = "symbol_tree___symbol_tree_3.2.4.tgz"; path = fetchurl { @@ -12594,11 +11882,11 @@ }; } { - name = "table___table_6.0.7.tgz"; + name = "table___table_6.7.5.tgz"; path = fetchurl { - name = "table___table_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; - sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + name = "table___table_6.7.5.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz"; + sha1 = "f04478c351ef3d8c7904f0e8be90a1b62417d238"; }; } { @@ -12618,19 +11906,19 @@ }; } { - name = "tar_stream___tar_stream_2.1.4.tgz"; + name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; - sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { - name = "tar___tar_6.1.0.tgz"; + name = "tar___tar_6.1.11.tgz"; path = fetchurl { - name = "tar___tar_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; - sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; + name = "tar___tar_6.1.11.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; + sha1 = "6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"; }; } { @@ -12682,11 +11970,11 @@ }; } { - name = "terser___terser_5.6.1.tgz"; + name = "terser___terser_5.10.0.tgz"; path = fetchurl { - name = "terser___terser_5.6.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.6.1.tgz"; - sha1 = "a48eeac5300c0a09b36854bf90d9c26fb201973c"; + name = "terser___terser_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz"; + sha1 = "b86390809c0389105eb0a0b62397563096ddafcc"; }; } { @@ -12738,11 +12026,11 @@ }; } { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; + name = "timers_browserify___timers_browserify_2.0.12.tgz"; path = fetchurl { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; - url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f"; + name = "timers_browserify___timers_browserify_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha1 = "44a45c11fbf407f34f97bccd1577c652361b00ee"; }; } { @@ -12754,11 +12042,11 @@ }; } { - name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + name = "tiny_invariant___tiny_invariant_1.2.0.tgz"; path = fetchurl { - name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; - sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; + name = "tiny_invariant___tiny_invariant_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz"; + sha1 = "a1141f86b672a9148c72e978a19a73b9b94a15a9"; }; } { @@ -12770,11 +12058,11 @@ }; } { - name = "tmpl___tmpl_1.0.4.tgz"; + name = "tmpl___tmpl_1.0.5.tgz"; path = fetchurl { - name = "tmpl___tmpl_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + name = "tmpl___tmpl_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz"; + sha1 = "8683e0b902bb9c20c4f726e3c0b69f36518c07cc"; }; } { @@ -12833,14 +12121,6 @@ sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; }; } - { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; - }; - } { name = "tough_cookie___tough_cookie_4.0.0.tgz"; path = fetchurl { @@ -12850,11 +12130,11 @@ }; } { - name = "tr46___tr46_2.0.2.tgz"; + name = "tr46___tr46_2.1.0.tgz"; path = fetchurl { - name = "tr46___tr46_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; - sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + name = "tr46___tr46_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz"; + sha1 = "fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"; }; } { @@ -12890,51 +12170,43 @@ }; } { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.12.0.tgz"; path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + name = "tsconfig_paths___tsconfig_paths_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; + sha1 = "19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"; }; } { - name = "tslib___tslib_1.13.0.tgz"; + name = "tslib___tslib_1.14.1.tgz"; path = fetchurl { - name = "tslib___tslib_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } { - name = "tsutils___tsutils_3.17.1.tgz"; + name = "tslib___tslib_2.3.1.tgz"; path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha1 = "e8a335add5ceae51aa261d32a490158ef042ef01"; }; } { - name = "tty_browserify___tty_browserify_0.0.0.tgz"; - path = fetchurl { - name = "tty_browserify___tty_browserify_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; - }; - } - { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + name = "tsutils___tsutils_3.21.0.tgz"; 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"; + name = "tsutils___tsutils_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; + sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; }; } { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; + name = "tty_browserify___tty_browserify_0.0.0.tgz"; path = fetchurl { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; }; } { @@ -12961,14 +12233,6 @@ sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; }; } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } { name = "type_fest___type_fest_0.20.2.tgz"; path = fetchurl { @@ -13026,11 +12290,11 @@ }; } { - name = "type___type_2.1.0.tgz"; + name = "type___type_2.5.0.tgz"; path = fetchurl { - name = "type___type_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; - sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; + name = "type___type_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz"; + sha1 = "0a2e78c2e77907b252abe5f298c1b01c63f0db3d"; }; } { @@ -13066,11 +12330,11 @@ }; } { - name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; + name = "ua_parser_js___ua_parser_js_0.7.31.tgz"; path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz"; - sha1 = "853cf9ce93f642f67174273cc34565ae6f308777"; + name = "ua_parser_js___ua_parser_js_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz"; + sha1 = "649a656b191dffab4f21d5e053e27ca17cbff5c6"; }; } { @@ -13090,43 +12354,43 @@ }; } { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_2.0.0.tgz"; path = fetchurl { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; + sha1 = "301acdc525631670d39f6146e0e77ff6bbdebddc"; }; } { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_2.0.0.tgz"; path = fetchurl { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; + sha1 = "54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"; }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_2.0.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; + sha1 = "1a01aa57247c14c568b89775a54938788189a714"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.0.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; + sha1 = "0a36cb9a585c4f6abd51ad1deddb285c165297c8"; }; } { - name = "unified___unified_9.2.1.tgz"; + name = "unified___unified_9.2.2.tgz"; path = fetchurl { - name = "unified___unified_9.2.1.tgz"; - url = "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz"; - sha1 = "ae18d5674c114021bfdbdf73865ca60f410215a3"; + name = "unified___unified_9.2.2.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-9.2.2.tgz"; + sha1 = "67649a1abfc3ab85d2969502902775eb03146975"; }; } { @@ -13282,11 +12546,11 @@ }; } { - name = "uri_js___uri_js_4.4.0.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -13306,19 +12570,11 @@ }; } { - name = "url_parse___url_parse_1.4.7.tgz"; + name = "url_parse___url_parse_1.5.3.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.4.7.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; - sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; - }; - } - { - name = "url_parse___url_parse_1.5.1.tgz"; - path = fetchurl { - name = "url_parse___url_parse_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz"; - sha1 = "d5fa9890af8a5e1f274a2c98376510f6425f6e3b"; + name = "url_parse___url_parse_1.5.3.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz"; + sha1 = "71c1303d38fb6639ade183c2992c8cc0686df862"; }; } { @@ -13410,19 +12666,19 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; - sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; + 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"; }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz"; - sha1 = "5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz"; + sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; }; } { @@ -13457,14 +12713,6 @@ sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; }; } - { - name = "verror___verror_1.10.0.tgz"; - path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - } { name = "vfile_message___vfile_message_2.0.4.tgz"; path = fetchurl { @@ -13514,11 +12762,11 @@ }; } { - name = "walker___walker_1.0.7.tgz"; + name = "walker___walker_1.0.8.tgz"; path = fetchurl { - name = "walker___walker_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; - sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + name = "walker___walker_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz"; + sha1 = "bd498db477afe573dc04185f011d3ab8a8d7653f"; }; } { @@ -13562,11 +12810,11 @@ }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; + sha1 = "0639372b143262e2b84ab95d3b91a7597061c2c5"; }; } { @@ -13633,14 +12881,6 @@ sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; }; } - { - name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; - path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3"; - }; - } { name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; path = fetchurl { @@ -13658,11 +12898,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.5.0.tgz"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; - sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; }; } { @@ -13890,19 +13130,19 @@ }; } { - name = "ws___ws_6.2.1.tgz"; + name = "ws___ws_6.2.2.tgz"; path = fetchurl { - name = "ws___ws_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; - sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + name = "ws___ws_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz"; + sha1 = "dd5cdbd57a9979916097652d78f1cc5faea0c32e"; }; } { - name = "ws___ws_7.4.4.tgz"; + name = "ws___ws_7.5.6.tgz"; path = fetchurl { - name = "ws___ws_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz"; - sha1 = "383bc9742cb202292c9077ceab6f6047b17f2d59"; + name = "ws___ws_7.5.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz"; + sha1 = "e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"; }; } { @@ -13930,11 +13170,11 @@ }; } { - name = "y18n___y18n_4.0.0.tgz"; + name = "y18n___y18n_4.0.3.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; - sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; }; } { @@ -13961,14 +13201,6 @@ sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; }; } - { - name = "yaml___yaml_1.10.0.tgz"; - path = fetchurl { - name = "yaml___yaml_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; - sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; - }; - } { name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { diff --git a/pkgs/servers/http/envoy/bump-brotli.patch b/pkgs/servers/http/envoy/bump-brotli.patch new file mode 100644 index 00000000000..5656b8f260c --- /dev/null +++ b/pkgs/servers/http/envoy/bump-brotli.patch @@ -0,0 +1,15 @@ +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index 454c54b0ef..2ac0623cf0 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -510,8 +510,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( + project_url = "https://brotli.org", + # Use the dev branch of brotli to resolve compilation issues. + # TODO(rojkov): Remove when brotli > 1.0.9 is released. +- version = "0cd2e3926e95e7e2930f57ae3f4885508d462a25", +- sha256 = "93810780e60304b51f2c9645fe313a6e4640711063ed0b860cfa60999dd256c5", ++ version = "27dd7265403d8e8fed99a854b9c3e1db7d79525f", ++ sha256 = "e71238b12e30233bdf25997132b29ae49639a69f33fdef3ae18a47abfc0d5e4c", + strip_prefix = "brotli-{version}", + urls = ["https://github.com/google/brotli/archive/{version}.tar.gz"], + use_category = ["dataplane_ext"], diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 5a85c2c1ab6..16de2fb399b 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -12,6 +12,9 @@ , python3 , linuxHeaders , nixosTests + +# v8 (upstream default), wavm, wamr, wasmtime, disabled +, wasmRuntime ? "wamr" }: let @@ -31,7 +34,7 @@ buildBazelPackage rec { src = fetchFromGitHub { owner = "envoyproxy"; repo = "envoy"; - inherit (srcVer) rev ; + inherit (srcVer) rev; hash = "sha256:11mm72zmb479ss585jzqzhklyyqmdadnvr91ghzvjxc0j2a1hrr4"; extraPostFetch = '' @@ -58,6 +61,13 @@ buildBazelPackage rec { url = "https://github.com/envoyproxy/envoy/commit/68448aae7a78a3123097b6ea96016b270457e7b8.patch"; sha256 = "123kv3x37p8fgfp29jhw5xg5js5q5ipibs8hsm7gzfd5bcllnpfh"; }) + + # fix issues with brotli and GCC 11.2.0+ (-Werror=vla-parameter) + ./bump-brotli.patch + + # fix linux-aarch64 WAMR builds + # (upstream WAMR only detects aarch64 on Darwin, not Linux) + ./fix-aarch64-wamr.patch ]; nativeBuildInputs = [ @@ -75,8 +85,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8"; - aarch64-linux = "1l3ls47z20xrw6x9qps5jm7vq50xb1acv9gczfdrj9hw6jybgwgg"; + x86_64-linux = "0k2cna0vjzc8z7jvxdlcw741vacil8daczppv32bslw17af65vq6"; + aarch64-linux = "1ijv4arw67nprykn2wkn4ji8fbr284mc7p74zxfsky772s42yy9j"; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; @@ -128,6 +138,11 @@ buildBazelPackage rec { "--cxxopt=-Wno-maybe-uninitialized" "--cxxopt=-Wno-uninitialized" "--cxxopt=-Wno-error=type-limits" + + "--define=wasm=${wasmRuntime}" + ]; + bazelFetchFlags = [ + "--define=wasm=${wasmRuntime}" ]; passthru.tests = { diff --git a/pkgs/servers/http/envoy/fix-aarch64-wamr.patch b/pkgs/servers/http/envoy/fix-aarch64-wamr.patch new file mode 100644 index 00000000000..4d8bc6c02ad --- /dev/null +++ b/pkgs/servers/http/envoy/fix-aarch64-wamr.patch @@ -0,0 +1,38 @@ +diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl +index f48ebe7056..1e5cc5d663 100644 +--- a/bazel/envoy_build_system.bzl ++++ b/bazel/envoy_build_system.bzl +@@ -102,6 +102,7 @@ def envoy_cmake( + pdb_name = "", + cmake_files_dir = "$BUILD_TMPDIR/CMakeFiles", + generate_crosstool_file = False, ++ generate_args = [], + **kwargs): + cache_entries.update({"CMAKE_BUILD_TYPE": "Bazel"}) + cache_entries_debug = dict(cache_entries) +@@ -131,7 +132,7 @@ def envoy_cmake( + "@envoy//bazel:dbg_build": cache_entries_debug, + "//conditions:default": cache_entries, + }), +- generate_args = ["-GNinja"], ++ generate_args = ["-GNinja"] + generate_args, + targets = ["", "install"], + # TODO: Remove install target and make this work + install = False, +diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD +index 4d3a281669..b4716dfe2e 100644 +--- a/bazel/foreign_cc/BUILD ++++ b/bazel/foreign_cc/BUILD +@@ -394,6 +394,12 @@ envoy_cmake( + "WAMR_BUILD_LIBC_WASI": "0", + "WAMR_BUILD_TAIL_CALL": "1", + }, ++ generate_args = select({ ++ "//conditions:default": [], ++ "@platforms//cpu:aarch64": [ ++ "-DWAMR_BUILD_TARGET=AARCH64", ++ ], ++ }), + lib_source = "@com_github_wamr//:all", + out_static_libs = ["libvmlib.a"], + tags = ["skip_on_windows"], diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 95a454850b6..9e3075f09b7 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -114,7 +114,9 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString libOnly '' - rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} + find $out/share -maxdepth 1 -mindepth 1 ! -name "vala" -prune -exec rm -r {} \; + find $out/share/vala -maxdepth 1 -mindepth 1 ! -name "vapi" -prune -exec rm -r {} \; + rm -r $out/{bin,etc,lib/pulse-*} '' + '' moveToOutput lib/cmake "$dev" diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix new file mode 100644 index 00000000000..3d52ccc96f8 --- /dev/null +++ b/pkgs/servers/telegram-bot-api/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gperf, openssl, zlib }: + +stdenv.mkDerivation { + pname = "telegram-bot-api"; + version = "5.7"; + + src = fetchFromGitHub { + repo = "telegram-bot-api"; + owner = "tdlib"; + rev = "c57b04c4c8c4e8d8bb6fdd0bd3bfb5b93b9d8f05"; + sha256 = "sha256-WetzX8GBdwQAnnZjek+W4v+QN1aUFdlvs+Jv6n1B+eY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake gperf ]; + buildInputs = [ openssl zlib ]; + + meta = with lib; { + description = "Telegram Bot API server"; + homepage = "https://github.com/tdlib/telegram-bot-api"; + license = licenses.boost; + maintainers = with maintainers; [ Anillc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 19ca69ecb94..9f3dcbe1812 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -7,10 +7,10 @@ let archString = if stdenv.isAarch64 then "arm64" platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-h5zjn8wtgHmsJFiGq1rja6kZTZj3Q72W2kH3AexRDQs=" - else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-NHM9ZUpBJb59Oq0Ke7DcvaN+bZ9MjSpXBRu5Ng9OVZ0=" - else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-QSL0lmxa7rGoNOx7JB310wF3VoUy96e9ZFop5rAvdBM=" - else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-bUacA4DwjDNlIG7yooXxUGL9AysAogNWuQDvcTqo1sE=" + platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-VF8C9JXVureJnMTyQD4SDeq/whyQOpk1dFtu6cJQRO8=" + else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-WqQQFdFTgIGi0fEtHjHf2rtP2l5YqdMQZH09O+34JTo=" + else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-oKlX6NfTOxrxMkH+vWGMMTyVJqD2F2CB5qx+8EvNBE8=" + else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-sWOmylDyy6n8SbnVDY5+wSJ2PPEd+vuoxbMU2iECyxY=" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -20,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.2.2"; + version = "7.2.3"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6fbd78c422d..32e4fe9749a 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -98,6 +98,7 @@ rec { doSign = localSystem.isAarch64 && last != null; doUpdateAutoTools = localSystem.isAarch64 && last != null; + inherit (last.pkgs) runCommandLocal; mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" @@ -223,23 +224,15 @@ rec { ''; }; - pbzx = stdenv.mkDerivation { - name = "bootstrap-stage0-pbzx"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${bootstrapTools}/bin/pbzx $out/bin - ''; - }; + pbzx = self.runCommandLocal "bootstrap-stage0-pbzx" { } '' + mkdir -p $out/bin + ln -s ${bootstrapTools}/bin/pbzx $out/bin + ''; - cpio = stdenv.mkDerivation { - name = "bootstrap-stage0-cpio"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${bootstrapFiles.cpio} $out/bin/cpio - ''; - }; + cpio = self.runCommandLocal "bootstrap-stage0-cpio" { } '' + mkdir -p $out/bin + ln -s ${bootstrapFiles.cpio} $out/bin/cpio + ''; darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { darwin-stubs = superDarwin.darwin-stubs.override { inherit (self) stdenvNoCC fetchurl; }; @@ -253,43 +246,21 @@ rec { ''; }; - sigtool = stdenv.mkDerivation { - name = "bootstrap-stage0-sigtool"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${bootstrapTools}/bin/sigtool $out/bin - - # Rewrite nuked references - sed -e "s|[^( ]*\bsigtool\b|$out/bin/sigtool|g" \ - ${bootstrapTools}/bin/codesign > $out/bin/codesign - chmod a+x $out/bin/codesign - ''; - # on next bootstrap tools update, use the following: - # installPhase = '' - # mkdir -p $out/bin - # ln -s ${bootstrapTools}/bin/sigtool $out/bin - # ln -s ${bootstrapTools}/bin/codesign $out/bin - # ''; - }; + sigtool = self.runCommandLocal "bootstrap-stage0-sigtool" { } '' + mkdir -p $out/bin + ln -s ${bootstrapTools}/bin/sigtool $out/bin + ln -s ${bootstrapTools}/bin/codesign $out/bin + ''; - print-reexports = stdenv.mkDerivation { - name = "bootstrap-stage0-print-reexports"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${bootstrapTools}/bin/print-reexports $out/bin - ''; - }; + print-reexports = self.runCommandLocal "bootstrap-stage0-print-reexports" { } '' + mkdir -p $out/bin + ln -s ${bootstrapTools}/bin/print-reexports $out/bin + ''; - rewrite-tbd = stdenv.mkDerivation { - name = "bootstrap-stage0-rewrite-tbd"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${bootstrapTools}/bin/rewrite-tbd $out/bin - ''; - }; + rewrite-tbd = self.runCommandLocal "bootstrap-stage0-rewrite-tbd" { } '' + mkdir -p $out/bin + ln -s ${bootstrapTools}/bin/rewrite-tbd $out/bin + ''; binutils-unwrapped = { name = "bootstrap-stage0-binutils"; outPath = bootstrapTools; }; @@ -359,7 +330,7 @@ rec { libcxx = stdenv.mkDerivation { name = "bootstrap-stage0-libcxx"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/lib $out/include ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 63aaf6bb72e..2ab03bda8b7 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -67,6 +67,8 @@ with pkgs; writers = callPackage ../build-support/writers/test.nix {}; + testers = callPackage ../build-support/testers/test/default.nix {}; + dhall = callPackage ./dhall { }; makeWrapper = callPackage ./make-wrapper {}; diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index b5bbf994ffa..2d3389c4a01 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -44,6 +44,7 @@ let "invalid-env" "prefix" "suffix" + "overlength-strings" ]; f = name: lib.nameValuePair name (makeGoldenTest name); in builtins.listToAttrs (builtins.map f names); diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.c b/pkgs/test/make-binary-wrapper/overlength-strings.c new file mode 100644 index 00000000000..579705d33e9 --- /dev/null +++ b/pkgs/test/make-binary-wrapper/overlength-strings.c @@ -0,0 +1,25 @@ +#define _GNU_SOURCE /* See feature_test_macros(7) */ +#include +#include +#include +#include + +#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0) + +void set_env_prefix(char *env, char *sep, char *prefix) { + char *existing = getenv(env); + if (existing) { + char *val; + assert_success(asprintf(&val, "%s%s%s", prefix, sep, existing)); + assert_success(setenv(env, val, 1)); + free(val); + } else { + assert_success(setenv(env, prefix, 1)); + } +} + +int main(int argc, char **argv) { + set_env_prefix("PATH", ":", "/nix/store/00000000000000000000000000000000-loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"); + argv[0] = "/send/me/flags"; + return execv("/send/me/flags", argv); +} diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.cmdline b/pkgs/test/make-binary-wrapper/overlength-strings.cmdline new file mode 100644 index 00000000000..686abbb1cdb --- /dev/null +++ b/pkgs/test/make-binary-wrapper/overlength-strings.cmdline @@ -0,0 +1 @@ + --prefix PATH : /nix/store/00000000000000000000000000000000-loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong diff --git a/pkgs/test/make-binary-wrapper/overlength-strings.env b/pkgs/test/make-binary-wrapper/overlength-strings.env new file mode 100644 index 00000000000..83a02f5f834 --- /dev/null +++ b/pkgs/test/make-binary-wrapper/overlength-strings.env @@ -0,0 +1,3 @@ +PATH=/nix/store/00000000000000000000000000000000-loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong +CWD=SUBST_CWD +SUBST_ARGV0 diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index 5e9857134de..bdd5e3c6d8b 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -1,7 +1,7 @@ /* This file is a test that makes sure that the `pkgs.nixos` and -`pkgs.nixosTest` functions work. It's far from a perfect test suite, +`pkgs.testers.nixosTest` functions work. It's far from a perfect test suite, but better than not checking them at all on hydra. To run this test: @@ -27,17 +27,5 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( system.stateVersion = lib.trivial.release; }).toplevel; - nixosTest-test = pkgs.nixosTest ({ lib, pkgs, figlet, ... }: { - name = "nixosTest-test"; - nodes.machine = { pkgs, ... }: { - system.nixos = dummyVersioning; - environment.systemPackages = [ pkgs.hello figlet ]; - system.stateVersion = lib.trivial.release; - }; - testScript = '' - machine.succeed("hello | figlet >/dev/console") - ''; - }); - } ) diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index d751cb8f087..32355205d59 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchurl, imake, libXt, libXaw, libXtst -, libXi, libXpm, xorgproto, gccmakedep, Xaw3d }: +{ lib, stdenv, fetchurl, libXt, libXaw, libXtst +, libXi, libXpm, pkg-config, xorgproto, Xaw3d }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xvkbd"; - version = "3.9"; + version = "4.1"; src = fetchurl { - url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.9.tar.gz"; - sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q"; + url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-${version}.tar.gz"; + sha256 = "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm"; }; - nativeBuildInputs = [ imake gccmakedep ]; + nativeBuildInputs = [ pkg-config ] ; buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; - installTargets = [ "install" "install.man" ]; + makeFlags = [ - "BINDIR=${placeholder "out"}/bin" - "CONFDIR=${placeholder "out"}/etc/X11" - "LIBDIR=${placeholder "out"}/lib/X11" - "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" - "MANPATH=${placeholder "out"}/man" + # avoid default libXt location + "appdefaultdir=${placeholder "out"}/share/X11/app-defaults" + "datarootdir=${placeholder "out"}/share" ]; + preInstall = '' + # workaround absence of libXt in $DESTDIR location. + mkdir -p $out/share/X11 + ''; + meta = with lib; { description = "Virtual keyboard for X window system"; longDescription = '' diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index b1c14d6c8aa..c10a269c4f7 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.9.98"; + version = "1.0.18"; src = fetchzip { url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; - sha256 = "0bvd6fin05dkh6x5qx2f58c0zsmxpdlwb8wqm0y04bax1mhm1bsf"; + sha256 = "03bs7c2n4cxpsjkrcwinmjarcfwxvkg10xvnjk5r1rnkzlrsy8pm"; }; packageJSON = ./package.json; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 3b08a4ccbc5..5883d362116 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.9.98", + "version": "1.0.18", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -25,6 +25,7 @@ "*.js", "amt", "bin", + "rdp", "views", "emails", "agents", @@ -67,6 +68,7 @@ "passport-reddit": "*", "passport-azure-oauth2": "*", "jwt-simple": "*", + "@mstrhakr/passport-generic-oidc": "*", "passport-saml": "*", "ws": "5.2.3", "cbor": "5.2.0", @@ -87,7 +89,6 @@ "loadavg-windows": "*", "node-sspi": "*", "ldapauth-fork": "*", - "node-rdpjs-2": "*", "ssh2": "*", "image-size": "*", "acme-client": "*", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 55b08db09a9..56c80e65786 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -14,14 +14,14 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/generator@^7.17.3", "@babel/generator@^7.4.0": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200" - integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg== +"@babel/generator@^7.17.10", "@babel/generator@^7.4.0": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189" + integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg== dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.17.10" + "@jridgewell/gen-mapping" "^0.1.0" jsesc "^2.5.1" - source-map "^0.5.0" "@babel/helper-environment-visitor@^7.16.7": version "7.16.7" @@ -30,21 +30,13 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" - integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== +"@babel/helper-function-name@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" + integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== dependencies: - "@babel/helper-get-function-arity" "^7.16.7" "@babel/template" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-get-function-arity@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" - integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== - dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.17.0" "@babel/helper-hoist-variables@^7.16.7": version "7.16.7" @@ -66,18 +58,18 @@ integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== "@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== + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" + integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== dependencies: "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.4.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" - integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== +"@babel/parser@^7.16.7", "@babel/parser@^7.17.10", "@babel/parser@^7.4.3": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" + integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== "@babel/template@^7.16.7", "@babel/template@^7.4.0": version "7.16.7" @@ -89,35 +81,64 @@ "@babel/types" "^7.16.7" "@babel/traverse@^7.4.3": - version "7.17.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" - integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5" + integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.3" + "@babel/generator" "^7.17.10" "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" + "@babel/helper-function-name" "^7.17.9" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.3" - "@babel/types" "^7.17.0" + "@babel/parser" "^7.17.10" + "@babel/types" "^7.17.10" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.4.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== +"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.4.0": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4" + integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A== dependencies: "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== + +"@mstrhakr/passport-generic-oidc@*": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@mstrhakr/passport-generic-oidc/-/passport-generic-oidc-0.3.0.tgz#46dbb306ee757f1c30002a6e21c2fe60b37aff0c" + integrity sha512-jRFXht2MFleqDiCuzeH6Nyg/YfmgwUmB/9KqeSg0QDZi+Sx1t0GSI0NBg/iA6NbWnoQFh6/ieOx/jRHHJNUiFg== + dependencies: + base64url "^3.0.1" + oauth "^0.9.15" + passport-strategy "^1.0.0" + request "^2.88.0" + webfinger "^0.4.2" + "@mysql/xdevapi@*": - version "8.0.28" - resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.28.tgz#68f3b029e72ef8519e5aad7084ded2573af058b5" - integrity sha512-+plt6Ua6uVpV754w6QR2Lzg0iria7ynlaPPORM0YfiP6cabIAyanlnNmKkXmYR3eGc8kL3GW/zw4HJ2CIlnR6A== + version "8.0.29" + resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.29.tgz#e91d3e96cc15d419f04d7a9df8ba8f78c9b808aa" + integrity sha512-9E6+g9fKBu2mhLEnYfr+KKRyb5W52Z01NkBrgS3uQA7MweZmlLV/pMlAP27J5GfBsW2okP8gnm3Dkrj0ZhfR2Q== dependencies: - google-protobuf "3.14.0" + google-protobuf "3.19.4" parsimmon "1.16.0" "@sendgrid/client@^7.6.2": @@ -161,14 +182,14 @@ "@types/node" "*" "@types/node@*", "@types/node@^17.0.10": - version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" - integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== + version "17.0.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d" + integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q== "@types/node@^14.14.14": - version "14.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" - integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== + version "14.18.16" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.16.tgz#878f670ba3f00482bf859b6550b6010610fc54b5" + integrity sha512-X3bUMdK/VmvrWdoTkz+VCn6nwKwrKCFTHtqwBIaQJNx4RUIBBUFXM00bqPz/DsDd+Icjmzm6/tyYZzeGVqb6/Q== "@types/webidl-conversions@*": version "6.1.1" @@ -414,10 +435,10 @@ mkdirp "^1.0.4" underscore "^1.13.1" -abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== +abab@^2.0.5, abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== abbrev@1: version "1.1.1" @@ -445,15 +466,15 @@ accepts@~1.3.5, accepts@~1.3.8: negotiator "0.6.3" acme-client@*: - version "4.2.3" - resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.3.tgz#f789be89113dc6a656c7bd697fb72e08e52f6877" - integrity sha512-fzNysQ7OdBWPlELQbjjjLo2eqrmMpdd6DZ9/d4jxHJItpKC4GKYLTxA3UIYca9BcY4Zr8un/axyEGnyRHKLGbw== + version "4.2.5" + resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.5.tgz#d18e29aadb38fbc8c6d4ce289f26392b51b5a698" + integrity sha512-dtnck4sdZ2owFLTC73Ewjx0kmvsRjTRgaOc8UztCNODT+lr1DXj0tiuUXjeY4LAzZryXCtCib/E+KD8NYeP1aw== dependencies: - axios "0.21.4" + axios "0.26.1" backo2 "^1.0.0" bluebird "^3.5.0" debug "^4.1.1" - node-forge "^1.2.0" + node-forge "^1.3.0" acorn-globals@^6.0.0: version "6.0.0" @@ -486,9 +507,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.5.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== aedes-packet@^1.0.0: version "1.0.0" @@ -676,12 +697,12 @@ archiver@4.0.2: zip-stream "^3.0.1" archiver@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" - integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== + version "5.3.1" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.1.tgz#21e92811d6f09ecfce649fbefefe8c79e57cbbb6" + integrity sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w== dependencies: archiver-utils "^2.1.0" - async "^3.2.0" + async "^3.2.3" buffer-crc32 "^0.2.1" readable-stream "^3.6.0" readdir-glob "^1.0.0" @@ -827,13 +848,13 @@ async-limiter@~1.0.0: integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== async@^2.0.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" -async@^3.2.0, async@~3.2.0: +async@^3.2.0, async@^3.2.3, async@~3.2.0: version "3.2.3" resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== @@ -858,34 +879,20 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@0.21.4, axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - -axios@^0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" - integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== - dependencies: - follow-redirects "^1.14.4" - -axios@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" - integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== - dependencies: - follow-redirects "^1.14.7" - -axios@^0.26.0: +axios@0.26.1, axios@^0.26.0, axios@^0.26.1: version "0.26.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== dependencies: follow-redirects "^1.14.8" +axios@^0.21.1: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== + dependencies: + follow-redirects "^1.14.0" + babel-cli@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" @@ -1392,7 +1399,7 @@ base64-js@^1.3.0, base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64url@3.x.x: +base64url@3.x.x, base64url@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== @@ -1486,21 +1493,23 @@ bn.js@^4.0.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -body-parser@1.19.2, body-parser@^1.19.0: - version "1.19.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e" - integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw== +body-parser@1.20.0, body-parser@^1.19.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" + integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== dependencies: bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" - depd "~1.1.2" - http-errors "1.8.1" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.9.7" - raw-body "2.4.3" + on-finished "2.4.1" + qs "6.10.3" + raw-body "2.5.1" type-is "~1.6.18" + unpipe "1.0.0" brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.11" @@ -1510,6 +1519,13 @@ brace-expansion@^1.0.0, brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^1.8.2: version "1.8.5" resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" @@ -1535,7 +1551,7 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.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== @@ -1553,9 +1569,9 @@ bson@^1.1.4: integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== bson@^4.4.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.1.tgz#2b5da517539bb0f7f3ffb54ac70a384ca899641c" - integrity sha512-I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw== + version "4.6.3" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.3.tgz#d1a9a0b84b9e84b62390811fc5580f6a8b1d858c" + integrity sha512-rAqP5hcUVJhXP2MCSNVsf0oM2OGU1So6A9pVRDYayvJ5+hygXHQApf87wd5NlhPM1J9RJnbqxIG/f8QTzRoQ4A== dependencies: buffer "^5.6.0" @@ -1587,6 +1603,11 @@ build-url@^1.0.10: resolved "https://registry.yarnpkg.com/build-url/-/build-url-1.3.3.tgz#fad1ef30d8861931f85bc1f41fca0a537be31e5f" integrity sha512-uSC8d+d4SlbXTu/9nBhwEKi33CE0KQgCvfy8QwyrrO5vCuXr9hN021ZBh8ip5vxPbMOrZiPwgqcupuhezxiP3g== +buildcheck@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5" + integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA== + bulk-write-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz#085bdc65caf19ceece4ff365fdb951ef0c6e3db8" @@ -1595,16 +1616,6 @@ bulk-write-stream@^2.0.0: inherits "^2.0.3" readable-stream "^3.1.1" -bunyan@^1.8.12: - version "1.8.15" - resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" - integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== - optionalDependencies: - dtrace-provider "~0.8" - moment "^2.19.3" - mv "~2" - safe-json-stringify "~1" - bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -2092,10 +2103,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== cookies@0.8.0: version "0.8.0" @@ -2136,20 +2147,18 @@ cp-file@^6.2.0: pify "^4.0.1" safe-buffer "^5.0.1" -cpu-features@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.2.tgz#9f636156f1155fd04bdbaa028bb3c2fbef3cea7a" - integrity sha512-/2yieBqvMcRj8McNzkycjW2v3OIUOibBfd2dLEJ0nWts8NobAxwiyw9phVNS6oDL8x8tz9F7uNVFEVpJncQpeA== +cpu-features@~0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8" + integrity sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A== dependencies: - nan "^2.14.1" + buildcheck "0.0.3" + nan "^2.15.0" crc-32@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.1.tgz#436d2bcaad27bcb6bd073a2587139d3024a16460" - integrity sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w== - dependencies: - exit-on-epipe "~1.0.1" - printj "~1.3.1" + version "1.2.2" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff" + integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ== crc32-stream@^3.0.1: version "3.0.1" @@ -2235,13 +2244,13 @@ dashdash@^1.12.0: assert-plus "^1.0.0" data-urls@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.1.tgz#597fc2ae30f8bc4dbcf731fcd1b1954353afc6f8" - integrity sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" + integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== dependencies: - abab "^2.0.3" + abab "^2.0.6" whatwg-mimetype "^3.0.0" - whatwg-url "^10.0.0" + whatwg-url "^11.0.0" dateformat@~3.0.3: version "3.0.3" @@ -2249,9 +2258,9 @@ dateformat@~3.0.3: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.29: - version "1.10.8" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41" - integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow== + version "1.11.1" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.1.tgz#90b33a3dda3417258d48ad2771b415def6545eb0" + integrity sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA== ddata@~0.1.25: version "0.1.28" @@ -2282,9 +2291,9 @@ debug@3.1.0: ms "2.0.0" debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -2367,20 +2376,20 @@ denque@^2.0.1: resolved "https://registry.yarnpkg.com/denque/-/denque-2.0.1.tgz#bcef4c1b80dc32efe97515744f21a4229ab8934a" integrity sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ== +depd@2.0.0, 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== + 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= +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-file@^1.0.0: version "1.0.0" @@ -2432,13 +2441,6 @@ domexception@^4.0.0: dependencies: webidl-conversions "^7.0.0" -dtrace-provider@~0.8: - version "0.8.8" - resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e" - integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg== - dependencies: - nan "^2.14.0" - each-series@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/each-series/-/each-series-1.0.0.tgz#f886e6c66dfdb25ef1fe73564146ee5cb478afcb" @@ -2558,11 +2560,6 @@ events@^3.0.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -exit-on-epipe@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" - integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== - exit@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -2619,37 +2616,38 @@ express-ws@4.0.0: ws "^5.2.0" express@^4.17.0: - version "4.17.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1" - integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg== + version "4.18.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" + integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.2" + body-parser "1.20.0" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.2" + cookie "0.5.0" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.9.7" + qs "6.10.3" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.17.2" - serve-static "1.14.2" + send "0.18.0" + serve-static "1.15.0" setprototypeof "1.2.0" - statuses "~1.5.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" @@ -2830,17 +2828,17 @@ filter-where@^1.0.1: dependencies: test-value "^1.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== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-cache-dir@^2.1.0: @@ -2908,10 +2906,10 @@ flagged-respawn@^1.0.1: resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== -follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7, follow-redirects@^1.14.8: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +follow-redirects@^1.14.0, follow-redirects@^1.14.8: + version "1.15.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" + integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -3024,15 +3022,15 @@ function-bind@^1.1.1: integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== gaxios@^4.0.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.2.tgz#845827c2dc25a0213c8ab4155c7a28910f5be83f" - integrity sha512-T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q== + version "4.3.3" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22" + integrity sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA== dependencies: abort-controller "^3.0.0" extend "^3.0.2" https-proxy-agent "^5.0.0" is-stream "^2.0.0" - node-fetch "^2.6.1" + node-fetch "^2.6.7" gcp-metadata@^4.2.0: version "4.3.1" @@ -3103,17 +3101,6 @@ glob@^4: minimatch "^2.0.1" once "^1.3.0" -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -3180,9 +3167,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== google-auth-library@^7.0.2, google-auth-library@^7.14.0: - version "7.14.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.0.tgz#9d6a20592f7b4d4c463cd3e93934c4b1711d5dc6" - integrity sha512-or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA== + version "7.14.1" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c" + integrity sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3195,16 +3182,16 @@ google-auth-library@^7.0.2, google-auth-library@^7.14.0: lru-cache "^6.0.0" google-p12-pem@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.3.tgz#5497998798ee86c2fc1f4bb1f92b7729baf37537" - integrity sha512-MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b" + integrity sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg== dependencies: - node-forge "^1.0.0" + node-forge "^1.3.1" -google-protobuf@3.14.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.14.0.tgz#20373d22046e63831a5110e11a84f713cc43651e" - integrity sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w== +google-protobuf@3.19.4: + version "3.19.4" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.4.tgz#8d32c3e34be9250956f28c0fb90955d13f311888" + integrity sha512-OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg== googleapis-common@^5.0.2: version "5.1.0" @@ -3219,19 +3206,19 @@ googleapis-common@^5.0.2: uuid "^8.0.0" googleapis@*: - version "96.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-96.0.0.tgz#95bdf0e57bc912581ba7bc10eb202301f2b05dc1" - integrity sha512-tEQtcukxA4sW1OXh35teJbui+BIjMTghH6i0tvUctyXgMDO0Upu3+hrytrw9JqZJxtXReM3Wr5+g4U7veqHpBQ== + version "100.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-100.0.0.tgz#baeeba7877ee7dd3250643b3803c4a9c24bcf8dd" + integrity sha512-RToFQGY54B756IDbjdyjb1vWFmn03bYpXHB2lIf0eq2UBYsIbYOLZ0kqSomfJnpclEukwEmMF7Jn6Wsev871ew== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.8: - version "4.2.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" - integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -grunt-cli@~1.4.2: +grunt-cli@~1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff" integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ== @@ -3286,16 +3273,16 @@ grunt-legacy-util@~2.0.1: which "~2.0.2" grunt@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.4.1.tgz#7d1e17db1f9c8108777f7273d6b9359755576f50" - integrity sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA== + version "1.5.2" + resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.5.2.tgz#46b014e28d17c85baac19d5e891bb3f04923c098" + integrity sha512-XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w== dependencies: dateformat "~3.0.3" eventemitter2 "~0.4.13" exit "~0.1.2" findup-sync "~0.3.0" glob "~7.1.6" - grunt-cli "~1.4.2" + grunt-cli "~1.4.3" grunt-known-options "~2.0.0" grunt-legacy-log "~3.0.0" grunt-legacy-util "~2.0.1" @@ -3530,7 +3517,18 @@ html-minifier@*: relateurl "^0.2.7" uglify-js "^3.5.1" -http-errors@1.8.1, http-errors@~1.8.1: +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.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== @@ -3567,9 +3565,9 @@ http_ece@1.1.0: urlsafe-base64 "~1.0.0" https-proxy-agent@*, 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== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -3700,9 +3698,9 @@ is-buffer@^1.1.5, is-buffer@~1.1.6: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== 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== + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== dependencies: has "^1.0.3" @@ -4635,29 +4633,24 @@ micromatch@^3.1.10: to-regex "^3.0.2" micromatch@^4.0.2: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" -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-db@>= 1.43.0 < 2": +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: - 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== + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: - mime-db "1.51.0" + mime-db "1.52.0" mime@1.6.0: version "1.6.0" @@ -4705,6 +4698,13 @@ minimatch@^2.0.1: dependencies: brace-expansion "^1.0.0" +minimatch@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + dependencies: + brace-expansion "^2.0.1" + minimatch@~3.0.4: version "3.0.8" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" @@ -4712,10 +4712,10 @@ minimatch@~3.0.4: dependencies: brace-expansion "^1.1.7" -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== +minimist@^1.2.5, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minimist@~0.0.1: version "0.0.10" @@ -4736,11 +4736,11 @@ mkdirp2@^1.0.3: integrity sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw== mkdirp@^0.5.0, mkdirp@^0.5.1, 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== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" mkdirp@^1.0.4, mkdirp@~1.0.4: version "1.0.4" @@ -4761,10 +4761,10 @@ moment-timezone@^0.5.34: dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.19.3: - version "2.29.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" - integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== +"moment@>= 2.9.0": + version "2.29.3" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" + integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== mongodb-connection-string-url@^1.0.1: version "1.1.2" @@ -4858,15 +4858,6 @@ mustache@^2.2.1: resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== -mv@~2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" - integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= - dependencies: - mkdirp "~0.5.1" - ncp "~2.0.0" - rimraf "~2.4.0" - mysql@*: version "2.18.1" resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717" @@ -4877,7 +4868,7 @@ mysql@*: safe-buffer "5.1.2" sqlstring "2.3.1" -nan@^2.12.1, nan@^2.13.2, nan@^2.14.0, nan@^2.14.1, nan@^2.15.0: +nan@^2.12.1, nan@^2.13.2, nan@^2.15.0: version "2.15.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== @@ -4904,11 +4895,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -ncp@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= - negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -4920,9 +4906,9 @@ neo-async@^2.6.0: integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== nested-error-stacks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" - integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug== + version "2.1.1" + resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz#26c8a3cee6cc05fbcf1e333cd2fc3e003326c0b5" + integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw== nested-property@^4.0.0: version "4.0.0" @@ -4941,25 +4927,17 @@ node-addon-api@^1.7.1: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-fetch@^2.3.0, node-fetch@^2.6.1: +node-fetch@^2.3.0, node-fetch@^2.6.7: 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" -node-forge@^1.0.0, node-forge@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c" - integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w== - -node-rdpjs-2@*: - version "0.3.5" - resolved "https://registry.yarnpkg.com/node-rdpjs-2/-/node-rdpjs-2-0.3.5.tgz#6f05fa175e70095a20b59c377be34fa1fe2fa444" - integrity sha512-ABgNbpbJlX2S4SZnsyoUd1MXINLq2y2hbrOXcoxn/NMl4/7uhM/JmXKublF3AooOgRCVKlXiefUVCIMSG/mNZw== - dependencies: - bunyan "^1.8.12" - lodash.isnumber "^3.0.3" +node-forge@^1.0.0, node-forge@^1.3.0, node-forge@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== node-sspi@*: version "0.2.9" @@ -4996,9 +4974,9 @@ node-xcs@*: "@xmpp/debug" "^0.9.2" nodemailer@*: - version "6.7.2" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.2.tgz#44b2ad5f7ed71b7067f7a21c4fedabaec62b85e0" - integrity sha512-Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q== + version "6.7.5" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.5.tgz#b30b1566f5fa2249f7bd49ced4c58bec6b25915e" + integrity sha512-6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg== nofilter@^1.0.4: version "1.0.4" @@ -5088,7 +5066,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -oauth@0.9.x: +oauth@0.9.x, oauth@^0.9.15: version "0.9.15" resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= @@ -5181,10 +5159,10 @@ object.pick@^1.2.0, object.pick@^1.3.0: dependencies: isobject "^3.0.1" -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= +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" @@ -5620,7 +5598,7 @@ pgtools@0.3.2: pg-connection-string "^2.4.0" yargs "^5.0.0" -picomatch@^2.2.3: +picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -5672,9 +5650,9 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plivo@*: - version "4.28.0" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.28.0.tgz#917813c55b45d33d291ee55dc7cfd868d53130c5" - integrity sha512-FQCc5TG5QUlNq1r0OlLvAHgJo15M+ou+dt7bWheataObxUxPqpga316zCOYR/sGzVzREPSB/ThpT9/cZeUcYgg== + version "4.32.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.32.0.tgz#11994c31e4d5275ff7b2e50ddf7d81fa6f8dee74" + integrity sha512-HHdiZ92RT2MNtQPESIsyBfzOB4I6JxTcwjL/MYcW111Vd80WKXm0g1rjOU8pv2Oci9O6j/9CSGCzwXtU7fb6RQ== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -5737,11 +5715,6 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= -printj@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz#9af6b1d55647a1587ac44f4c1654a4b95b8e12cb" - integrity sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg== - private@^0.1.6, private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -5814,12 +5787,7 @@ qlobber@^3.0.2, qlobber@^3.1.0: resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211" integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug== -qs@6.9.7: - version "6.9.7" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" - integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== - -qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: +qs@6.10.3, qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: version "6.10.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== @@ -5874,13 +5842,13 @@ range-parser@~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.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c" - integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g== +raw-body@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: bytes "3.1.2" - http-errors "1.8.1" + http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" @@ -6108,7 +6076,7 @@ request-promise-native@1.0.7: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@*: +request@*, request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -6248,13 +6216,6 @@ rimraf@^2.6.2, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@~2.4.0: - version "2.4.5" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" - integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= - dependencies: - glob "^6.0.1" - rimraf@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -6285,11 +6246,6 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-json-stringify@~1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" - integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -6334,7 +6290,7 @@ saslprep@*, saslprep@^1.0.0: dependencies: sparse-bitfield "^3.0.3" -sax@>=0.6.0: +sax@>=0.1.1, sax@>=0.6.0: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -6357,9 +6313,9 @@ semver-compare@^1.0.0: integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= semver@*: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== dependencies: lru-cache "^6.0.0" @@ -6373,34 +6329,34 @@ semver@^6.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -send@0.17.2: - version "0.17.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" - integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + depd "2.0.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "1.8.1" + http-errors "2.0.0" mime "1.6.0" ms "2.1.3" - on-finished "~2.3.0" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" -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== +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.2" + send "0.18.0" set-blocking@^2.0.0: version "2.0.0" @@ -6525,7 +6481,7 @@ source-map@^0.1.40: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -6608,14 +6564,14 @@ sqlstring@2.3.1: integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= ssh2@*: - version "1.7.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz#7aa30f2a5266f0ffd93944621b4eb1f403330fd4" - integrity sha512-u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g== + version "1.10.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.10.0.tgz#e05d870dfc8e83bc918a2ffb3dcbd4d523472dee" + integrity sha512-OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w== dependencies: asn1 "^0.2.4" bcrypt-pbkdf "^1.0.2" optionalDependencies: - cpu-features "0.0.2" + cpu-features "~0.0.4" nan "^2.15.0" sshpk@^1.7.0: @@ -6641,7 +6597,12 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.5.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -6651,6 +6612,11 @@ stealthy-require@^1.1.1: resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= +step@0.0.x: + version "0.0.6" + resolved "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz#143e7849a5d7d3f4a088fe29af94915216eeede2" + integrity sha1-FD54SaXX0/SgiP4pr5SRUhbu7eI= + stream-connect@^1.0.1, stream-connect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-connect/-/stream-connect-1.0.2.tgz#18bc81f2edb35b8b5d9a8009200a985314428a97" @@ -7019,11 +6985,11 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.75.1" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.75.1.tgz#7b9880e31a98c326f17dad3f1778f2a00805d351" - integrity sha512-q9h8AzJekL2etE4hPiZ3IOz9V6MkrY5d5cLvTra+Xe+jtDjQgarKbMUOYFhVHb/zXycf9qqW+Qk9de0ekgLwrQ== + version "3.77.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.77.0.tgz#23c67ad66e47c32b951f8c090d3b7d7354ef2ab8" + integrity sha512-jacZBKSzRBIoTdJv43U5bftdY9ptPAisH/ydd0k0ggja+GoecvCZ4MaoTgHRGDD2tR9srsw7U1nQCrqw0elobg== dependencies: - axios "^0.25.0" + axios "^0.26.1" dayjs "^1.8.29" https-proxy-agent "^5.0.0" jsonwebtoken "^8.5.1" @@ -7032,7 +6998,7 @@ twilio@*: qs "^6.9.4" rootpath "^0.1.2" scmp "^2.1.0" - url-parse "^1.5.6" + url-parse "^1.5.9" xmlbuilder "^13.0.2" type-check@~0.3.2: @@ -7066,9 +7032,9 @@ uglify-js@^2.6: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.15.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz#9aa82ca22419ba4c0137642ba0df800cb06e0471" - integrity sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg== + version "3.15.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d" + integrity sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA== uglify-to-browserify@~1.0.0: version "1.0.2" @@ -7101,9 +7067,9 @@ underscore.string@~3.3.5: util-deprecate "^1.0.2" underscore@^1.13.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881" - integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g== + version "1.13.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee" + integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA== underscore@~1.8.3: version "1.8.3" @@ -7165,7 +7131,7 @@ url-join@^4.0.1: resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== -url-parse@^1.5.3, url-parse@^1.5.6: +url-parse@^1.5.10, url-parse@^1.5.9: version "1.5.10" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== @@ -7327,9 +7293,9 @@ weak-map@^1.0.5: integrity sha512-lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw== web-push@*: - version "3.4.5" - resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.4.5.tgz#f94074ff150538872c7183e4d8881c8305920cf1" - integrity sha512-2njbTqZ6Q7ZqqK14YpK1GGmaZs3NmuGYF5b7abCXulUIWFSlSYcZ3NBJQRFcMiQDceD7vQknb8FUuvI1F7Qe/g== + version "3.5.0" + resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.5.0.tgz#4576533746052eda3bd50414b54a1b0a21eeaeae" + integrity sha512-JC0V9hzKTqlDYJ+LTZUXtW7B175qwwaqzbbMSWDxHWxZvd3xY0C2rcotMGDavub2nAAFw+sXTsqR65/KY2A5AQ== dependencies: asn1.js "^5.3.0" http_ece "1.1.0" @@ -7339,22 +7305,30 @@ web-push@*: urlsafe-base64 "^1.0.0" webdav@*: - version "4.8.0" - resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.8.0.tgz#b5d7ebe46039d048c177fb021c9da591cf3ac6f0" - integrity sha512-CVJvxu0attEfoQUKraDiNh3uMjNPNl+BY0pbcKbyc/X+8IXDnqAT4tT4Ge12w+j49fYuVpFVkpEGwBZabv7Uhw== + version "4.9.0" + resolved "https://registry.yarnpkg.com/webdav/-/webdav-4.9.0.tgz#cc12a55102feba8f87be6c6f2cd9bbb093abf22e" + integrity sha512-pMuRtZcjBk3i6q1iY5wBHdablKftoBfhrQEWWEejSh2LXgd0J6VE5V0c1tUlMrFHaVDx8iCoB9kupNzy8SMC4A== dependencies: - axios "^0.24.0" + axios "^0.26.1" base-64 "^1.0.0" fast-xml-parser "^3.19.0" he "^1.2.0" hot-patcher "^0.5.0" layerr "^0.1.2" md5 "^2.3.0" - minimatch "^3.0.4" + minimatch "^5.0.1" nested-property "^4.0.0" path-posix "^1.0.0" url-join "^4.0.1" - url-parse "^1.5.3" + url-parse "^1.5.10" + +webfinger@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d" + integrity sha1-NHem2XeZRhiWA5/P/GULc0aO520= + dependencies: + step "0.0.x" + xml2js "0.1.x" webidl-conversions@^3.0.0: version "3.0.1" @@ -7391,6 +7365,14 @@ whatwg-url@^10.0.0: tr46 "^3.0.0" webidl-conversions "^7.0.0" +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -7531,9 +7513,9 @@ ws@^7.0.0: integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== ws@^8.2.3: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + version "8.6.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23" + integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw== xml-crypto@^2.1.3: version "2.1.3" @@ -7557,6 +7539,13 @@ xml-name-validator@^4.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== +xml2js@0.1.x: + version "0.1.14" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c" + integrity sha1-UnTmf1pkxfkpdM2FE54DMq3GuQw= + dependencies: + sax ">=0.1.1" + xml2js@^0.4.19, xml2js@^0.4.23: version "0.4.23" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index 84a2393cf7c..1ed476a4de6 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -18,11 +18,11 @@ }; } { - name = "_babel_generator___generator_7.17.3.tgz"; + name = "_babel_generator___generator_7.17.10.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.17.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz"; - sha512 = "+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg=="; + name = "_babel_generator___generator_7.17.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz"; + sha512 = "46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg=="; }; } { @@ -34,19 +34,11 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.17.9.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; - sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; - }; - } - { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; - sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; + name = "_babel_helper_function_name___helper_function_name_7.17.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; + sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; }; } { @@ -74,19 +66,19 @@ }; } { - name = "_babel_highlight___highlight_7.16.10.tgz"; + name = "_babel_highlight___highlight_7.17.9.tgz"; path = fetchurl { - 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_highlight___highlight_7.17.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz"; + sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; }; } { - name = "_babel_parser___parser_7.17.3.tgz"; + name = "_babel_parser___parser_7.17.10.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.17.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz"; - sha512 = "7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="; + name = "_babel_parser___parser_7.17.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz"; + sha512 = "n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ=="; }; } { @@ -98,27 +90,59 @@ }; } { - name = "_babel_traverse___traverse_7.17.3.tgz"; + name = "_babel_traverse___traverse_7.17.10.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.17.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz"; + sha512 = "VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw=="; + }; + } + { + name = "_babel_types___types_7.17.10.tgz"; + path = fetchurl { + name = "_babel_types___types_7.17.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz"; + sha512 = "9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A=="; + }; + } + { + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + } + { + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + path = fetchurl { + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + }; + } + { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.17.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz"; - sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; + sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; }; } { - name = "_babel_types___types_7.17.0.tgz"; + name = "_mstrhakr_passport_generic_oidc___passport_generic_oidc_0.3.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + name = "_mstrhakr_passport_generic_oidc___passport_generic_oidc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@mstrhakr/passport-generic-oidc/-/passport-generic-oidc-0.3.0.tgz"; + sha512 = "jRFXht2MFleqDiCuzeH6Nyg/YfmgwUmB/9KqeSg0QDZi+Sx1t0GSI0NBg/iA6NbWnoQFh6/ieOx/jRHHJNUiFg=="; }; } { - name = "_mysql_xdevapi___xdevapi_8.0.28.tgz"; + name = "_mysql_xdevapi___xdevapi_8.0.29.tgz"; path = fetchurl { - name = "_mysql_xdevapi___xdevapi_8.0.28.tgz"; - url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.28.tgz"; - sha512 = "+plt6Ua6uVpV754w6QR2Lzg0iria7ynlaPPORM0YfiP6cabIAyanlnNmKkXmYR3eGc8kL3GW/zw4HJ2CIlnR6A=="; + name = "_mysql_xdevapi___xdevapi_8.0.29.tgz"; + url = "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.29.tgz"; + sha512 = "9E6+g9fKBu2mhLEnYfr+KKRyb5W52Z01NkBrgS3uQA7MweZmlLV/pMlAP27J5GfBsW2okP8gnm3Dkrj0ZhfR2Q=="; }; } { @@ -170,19 +194,19 @@ }; } { - name = "_types_node___node_17.0.21.tgz"; + name = "_types_node___node_17.0.31.tgz"; path = fetchurl { - name = "_types_node___node_17.0.21.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz"; - sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; + name = "_types_node___node_17.0.31.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz"; + sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q=="; }; } { - name = "_types_node___node_14.18.12.tgz"; + name = "_types_node___node_14.18.16.tgz"; path = fetchurl { - name = "_types_node___node_14.18.12.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; - sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; + name = "_types_node___node_14.18.16.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.16.tgz"; + sha512 = "X3bUMdK/VmvrWdoTkz+VCn6nwKwrKCFTHtqwBIaQJNx4RUIBBUFXM00bqPz/DsDd+Icjmzm6/tyYZzeGVqb6/Q=="; }; } { @@ -434,11 +458,11 @@ }; } { - name = "abab___abab_2.0.5.tgz"; + name = "abab___abab_2.0.6.tgz"; path = fetchurl { - name = "abab___abab_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; - sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + name = "abab___abab_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz"; + sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; }; } { @@ -474,11 +498,11 @@ }; } { - name = "acme_client___acme_client_4.2.3.tgz"; + name = "acme_client___acme_client_4.2.5.tgz"; path = fetchurl { - name = "acme_client___acme_client_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.3.tgz"; - sha512 = "fzNysQ7OdBWPlELQbjjjLo2eqrmMpdd6DZ9/d4jxHJItpKC4GKYLTxA3UIYca9BcY4Zr8un/axyEGnyRHKLGbw=="; + name = "acme_client___acme_client_4.2.5.tgz"; + url = "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.5.tgz"; + sha512 = "dtnck4sdZ2owFLTC73Ewjx0kmvsRjTRgaOc8UztCNODT+lr1DXj0tiuUXjeY4LAzZryXCtCib/E+KD8NYeP1aw=="; }; } { @@ -522,11 +546,11 @@ }; } { - name = "acorn___acorn_8.7.0.tgz"; + name = "acorn___acorn_8.7.1.tgz"; path = fetchurl { - name = "acorn___acorn_8.7.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + name = "acorn___acorn_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; } { @@ -698,11 +722,11 @@ }; } { - name = "archiver___archiver_5.3.0.tgz"; + name = "archiver___archiver_5.3.1.tgz"; path = fetchurl { - name = "archiver___archiver_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz"; - sha512 = "iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg=="; + name = "archiver___archiver_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.1.tgz"; + sha512 = "8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w=="; }; } { @@ -882,11 +906,11 @@ }; } { - name = "async___async_2.6.3.tgz"; + name = "async___async_2.6.4.tgz"; path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + name = "async___async_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; } { @@ -929,30 +953,6 @@ sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; } - { - name = "axios___axios_0.21.4.tgz"; - path = fetchurl { - name = "axios___axios_0.21.4.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - } - { - name = "axios___axios_0.24.0.tgz"; - path = fetchurl { - name = "axios___axios_0.24.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - } - { - name = "axios___axios_0.25.0.tgz"; - path = fetchurl { - name = "axios___axios_0.25.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz"; - sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; - }; - } { name = "axios___axios_0.26.1.tgz"; path = fetchurl { @@ -961,6 +961,14 @@ sha512 = "fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA=="; }; } + { + name = "axios___axios_0.21.4.tgz"; + path = fetchurl { + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; + }; + } { name = "babel_cli___babel_cli_6.26.0.tgz"; path = fetchurl { @@ -1506,11 +1514,11 @@ }; } { - name = "body_parser___body_parser_1.19.2.tgz"; + name = "body_parser___body_parser_1.20.0.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.19.2.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; + name = "body_parser___body_parser_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz"; + sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; }; } { @@ -1521,6 +1529,14 @@ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } + { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + } { name = "braces___braces_1.8.5.tgz"; path = fetchurl { @@ -1562,11 +1578,11 @@ }; } { - name = "bson___bson_4.6.1.tgz"; + name = "bson___bson_4.6.3.tgz"; path = fetchurl { - name = "bson___bson_4.6.1.tgz"; - url = "https://registry.yarnpkg.com/bson/-/bson-4.6.1.tgz"; - sha512 = "I1LQ7Hz5zgwR4QquilLNZwbhPw0Apx7i7X9kGMBTsqPdml/03Q9NBtD9nt/19ahjlphktQImrnderxqpzeVDjw=="; + name = "bson___bson_4.6.3.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-4.6.3.tgz"; + sha512 = "rAqP5hcUVJhXP2MCSNVsf0oM2OGU1So6A9pVRDYayvJ5+hygXHQApf87wd5NlhPM1J9RJnbqxIG/f8QTzRoQ4A=="; }; } { @@ -1610,19 +1626,19 @@ }; } { - name = "bulk_write_stream___bulk_write_stream_2.0.1.tgz"; + name = "buildcheck___buildcheck_0.0.3.tgz"; path = fetchurl { - name = "bulk_write_stream___bulk_write_stream_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz"; - sha512 = "XWOLjgHtpDasHfwM8oO4df1JoZwa7/OwTsXDzh4rUTo+9CowzeOFBZz43w+H14h1fyq+xl28tVIBrdjcjj4Gug=="; + name = "buildcheck___buildcheck_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz"; + sha512 = "pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA=="; }; } { - name = "bunyan___bunyan_1.8.15.tgz"; + name = "bulk_write_stream___bulk_write_stream_2.0.1.tgz"; path = fetchurl { - name = "bunyan___bunyan_1.8.15.tgz"; - url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz"; - sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig=="; + name = "bulk_write_stream___bulk_write_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz"; + sha512 = "XWOLjgHtpDasHfwM8oO4df1JoZwa7/OwTsXDzh4rUTo+9CowzeOFBZz43w+H14h1fyq+xl28tVIBrdjcjj4Gug=="; }; } { @@ -2106,11 +2122,11 @@ }; } { - name = "cookie___cookie_0.4.2.tgz"; + name = "cookie___cookie_0.5.0.tgz"; path = fetchurl { - name = "cookie___cookie_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + name = "cookie___cookie_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; } { @@ -2162,19 +2178,19 @@ }; } { - name = "cpu_features___cpu_features_0.0.2.tgz"; + name = "cpu_features___cpu_features_0.0.4.tgz"; path = fetchurl { - name = "cpu_features___cpu_features_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.2.tgz"; - sha512 = "/2yieBqvMcRj8McNzkycjW2v3OIUOibBfd2dLEJ0nWts8NobAxwiyw9phVNS6oDL8x8tz9F7uNVFEVpJncQpeA=="; + name = "cpu_features___cpu_features_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz"; + sha512 = "fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A=="; }; } { - name = "crc_32___crc_32_1.2.1.tgz"; + name = "crc_32___crc_32_1.2.2.tgz"; path = fetchurl { - name = "crc_32___crc_32_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.1.tgz"; - sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; + name = "crc_32___crc_32_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz"; + sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; } { @@ -2266,11 +2282,11 @@ }; } { - name = "data_urls___data_urls_3.0.1.tgz"; + name = "data_urls___data_urls_3.0.2.tgz"; path = fetchurl { - name = "data_urls___data_urls_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.1.tgz"; - sha512 = "Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw=="; + name = "data_urls___data_urls_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz"; + sha512 = "Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ=="; }; } { @@ -2282,11 +2298,11 @@ }; } { - name = "dayjs___dayjs_1.10.8.tgz"; + name = "dayjs___dayjs_1.11.1.tgz"; path = fetchurl { - name = "dayjs___dayjs_1.10.8.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz"; - sha512 = "wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="; + name = "dayjs___dayjs_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.1.tgz"; + sha512 = "ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA=="; }; } { @@ -2314,11 +2330,11 @@ }; } { - name = "debug___debug_4.3.3.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - 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.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { @@ -2433,14 +2449,6 @@ sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; }; } - { - name = "depd___depd_1.1.2.tgz"; - path = fetchurl { - name = "depd___depd_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; - }; - } { name = "depd___depd_2.0.0.tgz"; path = fetchurl { @@ -2450,11 +2458,19 @@ }; } { - name = "destroy___destroy_1.0.4.tgz"; + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; + }; + } + { + name = "destroy___destroy_1.2.0.tgz"; path = fetchurl { - name = "destroy___destroy_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "l4hXRCxEdJ5CBmE+N5RiBYJqvYA="; + name = "destroy___destroy_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; } { @@ -2497,14 +2513,6 @@ sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; }; } - { - name = "dtrace_provider___dtrace_provider_0.8.8.tgz"; - path = fetchurl { - name = "dtrace_provider___dtrace_provider_0.8.8.tgz"; - url = "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz"; - sha512 = "b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg=="; - }; - } { name = "each_series___each_series_1.0.0.tgz"; path = fetchurl { @@ -2665,14 +2673,6 @@ sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; }; } - { - name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; - path = fetchurl { - name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; - sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; - }; - } { name = "exit___exit_0.1.2.tgz"; path = fetchurl { @@ -2730,11 +2730,11 @@ }; } { - name = "express___express_4.17.3.tgz"; + name = "express___express_4.18.1.tgz"; path = fetchurl { - name = "express___express_4.17.3.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + name = "express___express_4.18.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz"; + sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; } { @@ -2938,11 +2938,11 @@ }; } { - name = "finalhandler___finalhandler_1.1.2.tgz"; + name = "finalhandler___finalhandler_1.2.0.tgz"; path = fetchurl { - name = "finalhandler___finalhandler_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + name = "finalhandler___finalhandler_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; } { @@ -3010,11 +3010,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.9.tgz"; + name = "follow_redirects___follow_redirects_1.15.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.9.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + name = "follow_redirects___follow_redirects_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz"; + sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; }; } { @@ -3154,11 +3154,11 @@ }; } { - name = "gaxios___gaxios_4.3.2.tgz"; + name = "gaxios___gaxios_4.3.3.tgz"; path = fetchurl { - name = "gaxios___gaxios_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.2.tgz"; - sha512 = "T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q=="; + name = "gaxios___gaxios_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz"; + sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; }; } { @@ -3241,14 +3241,6 @@ sha1 = "xstz0yJsHv7wTePFbQEvAzd+4V8="; }; } - { - name = "glob___glob_6.0.4.tgz"; - path = fetchurl { - name = "glob___glob_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz"; - sha1 = "DwiGD2oVUSey+t1PnOJLGqtuTSI="; - }; - } { name = "glob___glob_7.2.0.tgz"; path = fetchurl { @@ -3306,27 +3298,27 @@ }; } { - name = "google_auth_library___google_auth_library_7.14.0.tgz"; + name = "google_auth_library___google_auth_library_7.14.1.tgz"; path = fetchurl { - name = "google_auth_library___google_auth_library_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.0.tgz"; - sha512 = "or8r7qUqGVI3W8lVSdPh0ZpeFyQHeE73g5c0p+bLNTTUFXJ+GSeDQmZRZ2p4H8cF/RJYa4PNvi/A1ar1uVNLFA=="; + name = "google_auth_library___google_auth_library_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz"; + sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; }; } { - name = "google_p12_pem___google_p12_pem_3.1.3.tgz"; + name = "google_p12_pem___google_p12_pem_3.1.4.tgz"; path = fetchurl { - name = "google_p12_pem___google_p12_pem_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.3.tgz"; - sha512 = "MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ=="; + name = "google_p12_pem___google_p12_pem_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz"; + sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; }; } { - name = "google_protobuf___google_protobuf_3.14.0.tgz"; + name = "google_protobuf___google_protobuf_3.19.4.tgz"; path = fetchurl { - name = "google_protobuf___google_protobuf_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.14.0.tgz"; - sha512 = "bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w=="; + name = "google_protobuf___google_protobuf_3.19.4.tgz"; + url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.4.tgz"; + sha512 = "OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg=="; }; } { @@ -3338,19 +3330,19 @@ }; } { - name = "googleapis___googleapis_96.0.0.tgz"; + name = "googleapis___googleapis_100.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_96.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-96.0.0.tgz"; - sha512 = "tEQtcukxA4sW1OXh35teJbui+BIjMTghH6i0tvUctyXgMDO0Upu3+hrytrw9JqZJxtXReM3Wr5+g4U7veqHpBQ=="; + name = "googleapis___googleapis_100.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-100.0.0.tgz"; + sha512 = "RToFQGY54B756IDbjdyjb1vWFmn03bYpXHB2lIf0eq2UBYsIbYOLZ0kqSomfJnpclEukwEmMF7Jn6Wsev871ew=="; }; } { - name = "graceful_fs___graceful_fs_4.2.9.tgz"; + name = "graceful_fs___graceful_fs_4.2.10.tgz"; path = fetchurl { - 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=="; + name = "graceful_fs___graceful_fs_4.2.10.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; } { @@ -3402,11 +3394,11 @@ }; } { - name = "grunt___grunt_1.4.1.tgz"; + name = "grunt___grunt_1.5.2.tgz"; path = fetchurl { - name = "grunt___grunt_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/grunt/-/grunt-1.4.1.tgz"; - sha512 = "ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA=="; + name = "grunt___grunt_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/grunt/-/grunt-1.5.2.tgz"; + sha512 = "XCtfaIu72OyDqK24MjWiGC9SwlkuhkS1mrULr1xzuJ2XqAFhP3ZAchZGHJeSCY6mkaOXU4F7SbmmCF7xIVoC9w=="; }; } { @@ -3665,6 +3657,14 @@ sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; }; } + { + name = "http_errors___http_errors_2.0.0.tgz"; + path = fetchurl { + name = "http_errors___http_errors_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + } { name = "http_errors___http_errors_1.8.1.tgz"; path = fetchurl { @@ -3698,11 +3698,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; 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"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } { @@ -3874,11 +3874,11 @@ }; } { - name = "is_core_module___is_core_module_2.8.1.tgz"; + name = "is_core_module___is_core_module_2.9.0.tgz"; path = fetchurl { - 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=="; + name = "is_core_module___is_core_module_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; } { @@ -4898,19 +4898,11 @@ }; } { - name = "micromatch___micromatch_4.0.4.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; - }; - } - { - name = "mime_db___mime_db_1.51.0.tgz"; + name = "micromatch___micromatch_4.0.5.tgz"; path = fetchurl { - 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 = "micromatch___micromatch_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; } { @@ -4922,11 +4914,11 @@ }; } { - name = "mime_types___mime_types_2.1.34.tgz"; + name = "mime_types___mime_types_2.1.35.tgz"; path = fetchurl { - 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=="; + name = "mime_types___mime_types_2.1.35.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; } { @@ -4977,6 +4969,14 @@ sha1 = "jQh8OcazjAAbl/ynzm0OHoCvusc="; }; } + { + name = "minimatch___minimatch_5.0.1.tgz"; + path = fetchurl { + name = "minimatch___minimatch_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz"; + sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; + }; + } { name = "minimatch___minimatch_3.0.8.tgz"; path = fetchurl { @@ -4986,11 +4986,11 @@ }; } { - name = "minimist___minimist_1.2.5.tgz"; + name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + name = "minimist___minimist_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; } { @@ -5018,11 +5018,11 @@ }; } { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "mkdirp___mkdirp_0.5.6.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + name = "mkdirp___mkdirp_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; } { @@ -5050,11 +5050,11 @@ }; } { - name = "moment___moment_2.29.1.tgz"; + name = "moment___moment_2.29.3.tgz"; path = fetchurl { - name = "moment___moment_2.29.1.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + name = "moment___moment_2.29.3.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz"; + sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; }; } { @@ -5145,14 +5145,6 @@ sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; } - { - name = "mv___mv_2.1.1.tgz"; - path = fetchurl { - name = "mv___mv_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz"; - sha1 = "rmzg1vbV4KT32JN5jQPB6pVZtqI="; - }; - } { name = "mysql___mysql_2.18.1.tgz"; path = fetchurl { @@ -5185,14 +5177,6 @@ sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; } - { - name = "ncp___ncp_2.0.0.tgz"; - path = fetchurl { - name = "ncp___ncp_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz"; - sha1 = "GVoh1sRuNh0vsSgbo4uR6d9727M="; - }; - } { name = "negotiator___negotiator_0.6.3.tgz"; path = fetchurl { @@ -5210,11 +5194,11 @@ }; } { - name = "nested_error_stacks___nested_error_stacks_2.1.0.tgz"; + name = "nested_error_stacks___nested_error_stacks_2.1.1.tgz"; path = fetchurl { - name = "nested_error_stacks___nested_error_stacks_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz"; - sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; + name = "nested_error_stacks___nested_error_stacks_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz"; + sha512 = "9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw=="; }; } { @@ -5250,19 +5234,11 @@ }; } { - name = "node_forge___node_forge_1.2.1.tgz"; - path = fetchurl { - name = "node_forge___node_forge_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz"; - sha512 = "Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w=="; - }; - } - { - name = "node_rdpjs_2___node_rdpjs_2_0.3.5.tgz"; + name = "node_forge___node_forge_1.3.1.tgz"; path = fetchurl { - name = "node_rdpjs_2___node_rdpjs_2_0.3.5.tgz"; - url = "https://registry.yarnpkg.com/node-rdpjs-2/-/node-rdpjs-2-0.3.5.tgz"; - sha512 = "ABgNbpbJlX2S4SZnsyoUd1MXINLq2y2hbrOXcoxn/NMl4/7uhM/JmXKublF3AooOgRCVKlXiefUVCIMSG/mNZw=="; + name = "node_forge___node_forge_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz"; + sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; } { @@ -5298,11 +5274,11 @@ }; } { - name = "nodemailer___nodemailer_6.7.2.tgz"; + name = "nodemailer___nodemailer_6.7.5.tgz"; path = fetchurl { - name = "nodemailer___nodemailer_6.7.2.tgz"; - url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.2.tgz"; - sha512 = "Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q=="; + name = "nodemailer___nodemailer_6.7.5.tgz"; + url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.5.tgz"; + sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg=="; }; } { @@ -5490,11 +5466,11 @@ }; } { - name = "on_finished___on_finished_2.3.0.tgz"; + name = "on_finished___on_finished_2.4.1.tgz"; 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 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; + name = "on_finished___on_finished_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; }; } { @@ -6058,11 +6034,11 @@ }; } { - name = "plivo___plivo_4.28.0.tgz"; + name = "plivo___plivo_4.32.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.28.0.tgz"; - sha512 = "FQCc5TG5QUlNq1r0OlLvAHgJo15M+ou+dt7bWheataObxUxPqpga316zCOYR/sGzVzREPSB/ThpT9/cZeUcYgg=="; + name = "plivo___plivo_4.32.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.32.0.tgz"; + sha512 = "HHdiZ92RT2MNtQPESIsyBfzOB4I6JxTcwjL/MYcW111Vd80WKXm0g1rjOU8pv2Oci9O6j/9CSGCzwXtU7fb6RQ=="; }; } { @@ -6137,14 +6113,6 @@ sha1 = "gV7R9uvGWSb4ZbMQwHE7yzMVzks="; }; } - { - name = "printj___printj_1.3.1.tgz"; - path = fetchurl { - name = "printj___printj_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz"; - sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; - }; - } { name = "private___private_0.1.8.tgz"; path = fetchurl { @@ -6241,14 +6209,6 @@ sha512 = "B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug=="; }; } - { - name = "qs___qs_6.9.7.tgz"; - path = fetchurl { - name = "qs___qs_6.9.7.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - } { name = "qs___qs_6.10.3.tgz"; path = fetchurl { @@ -6322,11 +6282,11 @@ }; } { - name = "raw_body___raw_body_2.4.3.tgz"; + name = "raw_body___raw_body_2.5.1.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; + name = "raw_body___raw_body_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; } { @@ -6713,14 +6673,6 @@ sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; } - { - name = "rimraf___rimraf_2.4.5.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.4.5.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "7nEM5dk6j9uFb7Xqj/Di11k0sto="; - }; - } { name = "rimraf___rimraf_3.0.2.tgz"; path = fetchurl { @@ -6761,14 +6713,6 @@ sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } - { - name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; - path = fetchurl { - name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz"; - sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg=="; - }; - } { name = "safe_regex___safe_regex_1.1.0.tgz"; path = fetchurl { @@ -6858,11 +6802,11 @@ }; } { - name = "semver___semver_7.3.5.tgz"; + name = "semver___semver_7.3.7.tgz"; path = fetchurl { - name = "semver___semver_7.3.5.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + name = "semver___semver_7.3.7.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; } { @@ -6882,19 +6826,19 @@ }; } { - name = "send___send_0.17.2.tgz"; + name = "send___send_0.18.0.tgz"; path = fetchurl { - name = "send___send_0.17.2.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + name = "send___send_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; } { - name = "serve_static___serve_static_1.14.2.tgz"; + name = "serve_static___serve_static_1.15.0.tgz"; path = fetchurl { - 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=="; + name = "serve_static___serve_static_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; } { @@ -7130,11 +7074,11 @@ }; } { - name = "ssh2___ssh2_1.7.0.tgz"; + name = "ssh2___ssh2_1.10.0.tgz"; path = fetchurl { - name = "ssh2___ssh2_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.7.0.tgz"; - sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g=="; + name = "ssh2___ssh2_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/ssh2/-/ssh2-1.10.0.tgz"; + sha512 = "OnKAAmf4j8wCRrXXZv3Tp5lCZkLJZtgZbn45ELiShCg27djDQ3XFGvIzuGsIsf4hdHslP+VdhA9BhUQdTdfd9w=="; }; } { @@ -7153,6 +7097,14 @@ sha1 = "YICcOcv/VTNyJv1eC1IPNB8ftcY="; }; } + { + name = "statuses___statuses_2.0.1.tgz"; + path = fetchurl { + name = "statuses___statuses_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + } { name = "statuses___statuses_1.5.0.tgz"; path = fetchurl { @@ -7169,6 +7121,14 @@ sha1 = "NbCYdbT/SfJqd35QmzCQoyJr8ks="; }; } + { + name = "step___step_0.0.6.tgz"; + path = fetchurl { + name = "step___step_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz"; + sha1 = "FD54SaXX0/SgiP4pr5SRUhbu7eI="; + }; + } { name = "stream_connect___stream_connect_1.0.2.tgz"; path = fetchurl { @@ -7610,11 +7570,11 @@ }; } { - name = "twilio___twilio_3.75.1.tgz"; + name = "twilio___twilio_3.77.0.tgz"; path = fetchurl { - name = "twilio___twilio_3.75.1.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.75.1.tgz"; - sha512 = "q9h8AzJekL2etE4hPiZ3IOz9V6MkrY5d5cLvTra+Xe+jtDjQgarKbMUOYFhVHb/zXycf9qqW+Qk9de0ekgLwrQ=="; + name = "twilio___twilio_3.77.0.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.77.0.tgz"; + sha512 = "jacZBKSzRBIoTdJv43U5bftdY9ptPAisH/ydd0k0ggja+GoecvCZ4MaoTgHRGDD2tR9srsw7U1nQCrqw0elobg=="; }; } { @@ -7650,11 +7610,11 @@ }; } { - name = "uglify_js___uglify_js_3.15.3.tgz"; + name = "uglify_js___uglify_js_3.15.4.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.15.3.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.3.tgz"; - sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; + name = "uglify_js___uglify_js_3.15.4.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz"; + sha512 = "vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA=="; }; } { @@ -7698,11 +7658,11 @@ }; } { - name = "underscore___underscore_1.13.2.tgz"; + name = "underscore___underscore_1.13.3.tgz"; path = fetchurl { - name = "underscore___underscore_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz"; - sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="; + name = "underscore___underscore_1.13.3.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz"; + sha512 = "QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA=="; }; } { @@ -7986,19 +7946,27 @@ }; } { - name = "web_push___web_push_3.4.5.tgz"; + name = "web_push___web_push_3.5.0.tgz"; + path = fetchurl { + name = "web_push___web_push_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/web-push/-/web-push-3.5.0.tgz"; + sha512 = "JC0V9hzKTqlDYJ+LTZUXtW7B175qwwaqzbbMSWDxHWxZvd3xY0C2rcotMGDavub2nAAFw+sXTsqR65/KY2A5AQ=="; + }; + } + { + name = "webdav___webdav_4.9.0.tgz"; path = fetchurl { - name = "web_push___web_push_3.4.5.tgz"; - url = "https://registry.yarnpkg.com/web-push/-/web-push-3.4.5.tgz"; - sha512 = "2njbTqZ6Q7ZqqK14YpK1GGmaZs3NmuGYF5b7abCXulUIWFSlSYcZ3NBJQRFcMiQDceD7vQknb8FUuvI1F7Qe/g=="; + name = "webdav___webdav_4.9.0.tgz"; + url = "https://registry.yarnpkg.com/webdav/-/webdav-4.9.0.tgz"; + sha512 = "pMuRtZcjBk3i6q1iY5wBHdablKftoBfhrQEWWEejSh2LXgd0J6VE5V0c1tUlMrFHaVDx8iCoB9kupNzy8SMC4A=="; }; } { - name = "webdav___webdav_4.8.0.tgz"; + name = "webfinger___webfinger_0.4.2.tgz"; path = fetchurl { - name = "webdav___webdav_4.8.0.tgz"; - url = "https://registry.yarnpkg.com/webdav/-/webdav-4.8.0.tgz"; - sha512 = "CVJvxu0attEfoQUKraDiNh3uMjNPNl+BY0pbcKbyc/X+8IXDnqAT4tT4Ge12w+j49fYuVpFVkpEGwBZabv7Uhw=="; + name = "webfinger___webfinger_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz"; + sha1 = "NHem2XeZRhiWA5/P/GULc0aO520="; }; } { @@ -8049,6 +8017,14 @@ sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; }; } + { + name = "whatwg_url___whatwg_url_11.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; + }; + } { name = "whatwg_url___whatwg_url_5.0.0.tgz"; path = fetchurl { @@ -8218,11 +8194,11 @@ }; } { - name = "ws___ws_8.5.0.tgz"; + name = "ws___ws_8.6.0.tgz"; path = fetchurl { - name = "ws___ws_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz"; - sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; + name = "ws___ws_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz"; + sha512 = "AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw=="; }; } { @@ -8249,6 +8225,14 @@ sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; }; } + { + name = "xml2js___xml2js_0.1.14.tgz"; + path = fetchurl { + name = "xml2js___xml2js_0.1.14.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz"; + sha1 = "UnTmf1pkxfkpdM2FE54DMq3GuQw="; + }; + } { name = "xml2js___xml2js_0.4.23.tgz"; path = fetchurl { diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix index 266b0830d5c..3cba21c188b 100644 --- a/pkgs/tools/archivers/gbl/default.nix +++ b/pkgs/tools/archivers/gbl/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , fetchpatch @@ -6,6 +7,7 @@ , openssl , testers , gbl +, Security }: rustPlatform.buildRustPackage rec { @@ -31,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-RUZ6wswRtV8chq3+bY9LTRf6IYMbZ9/GPl2X5UcF7d8="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; passthru.tests.version = testers.testVersion { package = gbl; }; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index c8dc645d69b..8d46197214c 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnu-efi }: +{ lib, stdenv, fetchurl, gnu-efi, nixosTests }: let archids = { @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.2"; + version = "0.13.3.1"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "0w6990ggns4xsdmgj3aq527q15frrxfmxwa3m6igabd4ai498n6x"; + sha256 = "1lfgqqiyl6isy25wrxzyi3s334ii057g88714igyjjmxh47kygks"; }; patches = [ @@ -107,6 +107,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + uefiCdrom = nixosTests.boot.uefiCdrom; + }; + meta = with lib; { description = "A graphical {,U}EFI boot manager"; longDescription = '' diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index e3d53297193..e28d4f8b9c7 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { ln -s $out/bin/wodim $out/bin/cdrecord ''; + cmakeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DBITFIELDS_HTOL=0" ]; + makeFlags = [ "PREFIX=\$(out)" ]; meta = { diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index bd8bf1adb9f..9abbe2e9a04 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation { passthru.tests = { smoke-test = nixosTests.bcachefs; + inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 75a39fdfe92..e15b4ad1f64 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv, gettext, xxd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libiconv, gettext, xxd }: stdenv.mkDerivation rec { pname = "dosfstools"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c="; }; + patches = [ + # macOS build fixes backported from master + # TODO: remove on the next release + (fetchpatch { + url = "https://github.com/dosfstools/dosfstools/commit/77ffb87e8272760b3bb2dec8f722103b0effb801.patch"; + sha256 = "sha256-xHxIs3faHK/sK3vAVoG8JcTe4zAV+ZtkozWIIFBvPWI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/boltbrowser/default.nix b/pkgs/tools/misc/boltbrowser/default.nix index 29635394954..3bfbfa1adee 100644 --- a/pkgs/tools/misc/boltbrowser/default.nix +++ b/pkgs/tools/misc/boltbrowser/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "boltbrowser"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "br0xen"; repo = pname; rev = version; - sha256 = "17v3pv80dxs285d0b6x772h5cb4f0xg9n5p9jwlir5hjbfn1635i"; + sha256 = "sha256-Obfhxe0AI5m4UTvs28PMOrBxWuwMW7FY4DMI80Ez0Ws="; }; - vendorSha256 = "1x28m72626cchnsasyxips8jaqs0l2p9jhjrdcgws144zm6fz3hv"; + vendorSha256 = "sha256-G47vTP2EBM0fa1lCma6gQGMlkb6xe620hYwZYcSpSPQ="; meta = with lib; { description = "CLI Browser for BoltDB files"; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 3e6ebb2f0d6..9cab0bc2237 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, recode, perl }: +{ lib, stdenv, fetchurl, cmake, recode, perl, withOffensive ? false }: stdenv.mkDerivation rec { pname = "fortune-mod"; - version = "3.12.0"; + version = "3.14.0"; # We use fetchurl instead of fetchFromGitHub because the release pack has some # special files. src = fetchurl { url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-fVrtfLmZiVDTSeuoOltX/vunGSizSw+ZhQhBn9t0C3E="; + sha256 = "sha256-jjBxCfjLjnhdKeMgJwEPytCVKQ4R4wHeF8/3Z/F6UgQ="; }; nativeBuildInputs = [ cmake perl ]; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLOCALDIR=${placeholder "out"}/share/fortunes" - "-DNO_OFFENSIVE=true" - ]; + ] ++ lib.optional (!withOffensive) "-DNO_OFFENSIVE=true"; patches = [ (builtins.toFile "not-a-game.patch" '' diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { -- '') ]; - postFixup = '' + postFixup = lib.optionalString (!withOffensive) '' rm -f $out/share/fortunes/men-women* ''; diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index e34afda9424..dd0af48ec64 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config}: +{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, stdenv}: rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/desbma/gotify-desktop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bryanasdev000 genofire ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index d2b79c4d011..d4b4012cde0 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-5sPw95lSbswIUbNIZ4mpA3WeZt7u+a5s4KxkTnN14Sw="; + sha256 = "sha256-Il3eF9bVrAaJkTDPB1DzEjROnJxIAnnk27qdT9qsp1k"; }; - cargoSha256 = "sha256-rPsiMeoc8cWUgmqAxdDGrAQdurIH3bzNq5tpocnnegA="; + cargoSha256 = "sha256-wRjPjCKsvqnJkybNVAdVMgBA9RaviFyCJPv3D5hipSs"; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index 16e67b848d6..744ce314ec4 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-static" "" ''; + buildInputs = lib.optionals stdenv.hostPlatform.isGnu [ + stdenv.glibc.static + ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 17e26fc33d1..68275f4c701 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-bMVClVt+D+LSvlD0m82MHJc+dcUuqGKo6gxtSqFwkHM="; + sha256 = "sha256-30j62GaO5SXG78c6vMpLZ+ixy1zesjXoX3L9Et/7uhU="; }; vendorSha256 = "sha256-Sx6l5GJ72A0SHEHyVtlte8Ed9fuJzZAkJzC0zpCbvK8="; diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index 48fc7bc32b4..146233b2e02 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -9,6 +9,7 @@ , gerbv , librsvg , bash +, fetchpatch }: stdenv.mkDerivation rec { @@ -22,6 +23,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-3VQlYtSi6yWWNuxTlBzvBtkM5hAss47xat+sEW+P79E="; }; + patches = [ + # the patch below is part of upstream mainline, we can remove this + # when they make their next release + (fetchpatch { + url = "https://github.com/pcb2gcode/pcb2gcode/commit/01cd18a6d859ab1aac6c532c99be9109f083448d.patch"; + sha256 = "sha256-5hl8KsDxSWMzXS3oRG0fBfHFq0IpZ//sU8lfY9Yp8L0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ boost glibmm gtkmm2 gerbv librsvg ]; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 1501f8edda1..972b60d3649 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -8,23 +8,22 @@ stdenv.mkDerivation rec { pname = "recutils"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/recutils/${pname}-${version}.tar.gz"; - hash = "sha256-346uaVk/26U+Jky/SyMH37ghIMCbb6sj4trVGomlsZM="; + hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4="; }; - hardeningDisable = [ "format" ]; - buildInputs = [ curl ]; checkInputs = [ - check bc + check ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 2fc816e1ab3..81979c0903f 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.5"; + version = "0.5.2"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-11IA8WeDFnukm6kskjA6Qu4+rPoLTBjz6NIixAIOH5U="; + sha256 = "sha256-wKgkEn2BoJfk3kMXOAKlFvXgCcnwHlgu2VgwL2QM06Q="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 79d3ab7b638..faf4b558ad6 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchpatch, buildPythonPackage -, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,7 +8,6 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true -, phantomjsSupport ? false , hlsEncryptedSupport ? true , installShellFiles, makeWrapper }: @@ -52,8 +51,7 @@ buildPythonPackage rec { packagesToBinPath = [ atomicparsley ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional rtmpSupport rtmpdump - ++ lib.optional phantomjsSupport phantomjs2; + ++ lib.optional rtmpSupport rtmpdump; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; setupPyBuildFlags = [ diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 1a87a31e338..d67678f6ee5 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -5,7 +5,6 @@ , certifi , ffmpeg , rtmpdump -, phantomjs2 , atomicparsley , pycryptodomex , websockets @@ -13,7 +12,6 @@ , atomicparsleySupport ? true , ffmpegSupport ? true , rtmpSupport ? true -, phantomjsSupport ? false , withAlias ? false # Provides bin/youtube-dl for backcompat }: @@ -41,8 +39,7 @@ buildPythonPackage rec { packagesToBinPath = [] ++ lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional rtmpSupport rtmpdump - ++ lib.optional phantomjsSupport phantomjs2; + ++ lib.optional rtmpSupport rtmpdump; in lib.optionalString (packagesToBinPath != []) [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/tools/networking/curl/7.82.0-openssl-fix-CN-check.patch b/pkgs/tools/networking/curl/7.82.0-openssl-fix-CN-check.patch deleted file mode 100644 index 5d84f512499..00000000000 --- a/pkgs/tools/networking/curl/7.82.0-openssl-fix-CN-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 8 Mar 2022 13:38:13 +0100 -Subject: [PATCH] openssl: fix CN check error code - -Due to a missing 'else' this returns error too easily. - -Regressed in: d15692ebb - -Reported-by: Kristoffer Gleditsch -Fixes #8559 -Closes #8560 ---- - lib/vtls/openssl.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c -index 0b79fc50a9c5..4618beeb3867 100644 ---- a/lib/vtls/openssl.c -+++ b/lib/vtls/openssl.c -@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, - memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen); - peer_CN[peerlen] = '\0'; - } -- result = CURLE_OUT_OF_MEMORY; -+ else -+ result = CURLE_OUT_OF_MEMORY; - } - } - else /* not a UTF8 name */ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a4056fd28a9..bd37b4954c4 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,6 +24,15 @@ , wolfsslSupport ? false, wolfssl ? null , zlibSupport ? true, zlib ? null , zstdSupport ? false, zstd ? null + +# for passthru.tests +, coeurl +, curlcpp +, curlpp +, haskellPackages +, ocamlPackages +, phpExtensions +, python3 }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -54,19 +63,18 @@ assert zstdSupport -> zstd != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.82.0"; + version = "7.83.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-RtmgQAozQI/ZkncLBKRKdDSzA28ugImsKLV1c9WdNx8="; + sha256 = "sha256-JHx+x1IcQljmVjTlKScNIU/jKWmXHMy3KEXnqkaDH5Y="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch - ./7.82.0-openssl-fix-CN-check.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -159,6 +167,13 @@ stdenv.mkDerivation rec { passthru = { inherit opensslSupport openssl; + tests = { + inherit curlpp curlcpp coeurl; + haskell-curl = haskellPackages.curl; + ocaml-curly = ocamlPackages.curly; + php-curl = phpExtensions.curl; + pycurl = python3.pkgs.pycurl; + }; }; meta = with lib; { diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix deleted file mode 100644 index 8f5958193db..00000000000 --- a/pkgs/tools/networking/py-wmi-client/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, python2Packages, fetchFromGitHub }: - -python2Packages.buildPythonApplication rec { - pname = "py-wmi-client"; - version = "unstable-20160601"; - - src = fetchFromGitHub { - owner = "dlundgren"; - repo = pname; - rev = "9702b036df85c3e0ecdde84a753b353069f58208"; - sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d"; - }; - - propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ]; - - # no tests - doCheck = false; - - meta = with lib; { - description = "Python WMI Client implementation"; - homepage = "https://github.com/dlundgren/py-wmi-client"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index c5e60fb88fd..53f7d581b34 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-n9Ei1kpbDqOogNJJVvg9DRAPMVGNChCGGiuCVsuK3/8="; + hash = "sha256-4N45IBDlIVbZbZgdX2DBmjolFHwzPjHVyWGadhR1FFw="; }; - cargoSha256 = "sha256-6546jD+zDoScrJmpw5xtNdWeIPJ9Ma0bcIdnI1kFmu8="; + cargoSha256 = "sha256-o7NDw7P6Flut0ZFnDUdVCmuUzW2P+KXyfu0gApTEx60="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 4fb28559483..3c6e446df4d 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -29,20 +29,18 @@ python3.pkgs.buildPythonApplication rec { dnspython httpcore httpx - httpx-ntlm - httpx-socks humanize loguru Mako markupsafe - pysocks six sqlalchemy tld yaswfp ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata - ]; + ] ++ httpx.extras-require.brotli + ++ httpx.extras-require.socks; checkInputs = with python3.pkgs; [ respx @@ -52,8 +50,6 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # Ignore pinned versions - substituteInPlace setup.py \ - --replace "httpx-socks[asyncio] == 0.6.0" "httpx-socks[asyncio]" sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py substituteInPlace setup.cfg \ --replace " --cov --cov-report=xml" "" diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index d1e3065efd2..c9e93d42738 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -27,7 +27,9 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; buildInputs = [ curl.dev zlib.dev protobuf ] ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] @@ -80,6 +82,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" + "--disable-ebpf" ] ++ optionals withCloud [ "--enable-cloud" "--with-aclk-ng" diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 079055bd3ba..6e3ccc45a03 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error" NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" ''; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index f11a05fdbd6..c0894f31a01 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2202.0"; + version = "8.2204.1"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "sha256-5BMIpaFxk5s8vCRunUvTC+ROgBUh4EzZXQUfo4Z9Zzg="; + sha256 = "sha256-ptcx5GrT1k9q1LGbvxv1bKR2CkSiS7loIxidwucfcCg="; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix new file mode 100644 index 00000000000..c4b4acdbb48 --- /dev/null +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -0,0 +1,186 @@ +{ lib, stdenv, system ? builtins.currentSystem, ovftoolBundles ? {} +, requireFile, buildFHSUserEnv, autoPatchelfHook, makeWrapper, unzip +, glibc, c-ares, libressl, curl, expat, icu60, xercesc, zlib +}: + +let + version = "4.4.1-16812187"; + + # FHS environment required to unpack ovftool on x86. + ovftoolX86Unpacker = buildFHSUserEnv rec { + name = "ovftool-unpacker"; + targetPkgs = pkgs: [ pkgs.bash ]; + multiPkgs = targetPkgs; + runScript = "bash"; + }; + + # unpackPhase for i686 and x86_64 ovftool self-extracting bundles. + ovftoolX86UnpackPhase = '' + runHook preUnpack + # This is a self-extracting shell script and needs a FHS environment to run. + # In reality, it could be doing anything, which is bad for reproducibility. + # Our postUnpack uses nix-hash to verify the hash to prevent problems. + # + # Note that the Arch PKGBUILD at + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vmware-ovftool + # appears to use xvfb-run - this hasn't been proven necessary so far. + # + cp ${ovftoolSource} ./ovftool.bundle + chmod +x ./ovftool.bundle + ${ovftoolX86Unpacker}/bin/ovftool-unpacker ./ovftool.bundle -x ovftool + rm ovftool.bundle + extracted=ovftool/vmware-ovftool/ + if [ -d "$extracted" ]; then + # Move the directory we care about to ovftool/ + mv "$extracted" . + rm -r ovftool + mv "$(basename -- "$extracted")" ovftool + echo "ovftool extracted successfully" >&2 + else + echo "Could not find $extracted - are you sure this is ovftool?" >&2 + rm -r ovftool + exit 1 + fi + runHook postUnpack + ''; + + # unpackPhase for aarch64 .zip. + ovftoolAarch64UnpackPhase = '' + runHook preUnpack + unzip ${ovftoolSource} + extracted=ovftool/ + if [ -d "$extracted" ]; then + echo "ovftool extracted successfully" >&2 + else + echo "Could not find $extracted - are you sure this is ovftool?" >&2 + exit 1 + fi + runHook postUnpack + ''; + + # When the version is bumped, postUnpackHash will change + # for all these supported systems. Update it from the printed error on build. + # + # This is just a sanity check, since ovftool is a self-extracting bundle + # that could be doing absolutely anything on 2/3 of the supported platforms. + ovftoolSystems = { + "i686-linux" = { + filename = "VMware-ovftool-${version}-lin.i386.bundle"; + sha256 = "0gx78g3s77mmpir7jbiskna10i6262ihal1ywivlb6xxxxbhqzwj"; + unpackPhase = ovftoolX86UnpackPhase; + postUnpackHash = "1k8rp8ywhs0cl9aad37v1p0493bdvkxrsvwg5pgv2bhvjs4hqk7n"; + }; + "x86_64-linux" = { + filename = "VMware-ovftool-${version}-lin.x86_64.bundle"; + sha256 = "1kp2bp4d9i8y7q25yqff2bn62mh292lws7b66lyn8ka9b35kvnzc"; + unpackPhase = ovftoolX86UnpackPhase; + postUnpackHash = "0zvyakwi4iishqxxisihgh91bmdsfvj5vchm2c192hia03a143py"; + }; + "aarch64-linux" = { + filename = "VMware-ovftool-${version}-lin.aarch64.zip"; + sha256 = "0all8bwv5p5adnzqvrly6nzmxmfpywvlbfr0finr4n100yv0v1xy"; + unpackPhase = ovftoolAarch64UnpackPhase; + postUnpackHash = "16vyyzrmryi8b7mrd6nxnhywvvj2pw0ban4qfiqfahw763fn6971"; + }; + }; + + ovftoolSystem = if builtins.hasAttr system ovftoolSystems then + ovftoolSystems.${system} + else throw "System '${system}' is unsupported by ovftool"; + + ovftoolSource = if builtins.hasAttr system ovftoolBundles then + ovftoolBundles.${system} + else + requireFile { + name = ovftoolSystem.filename; + url = "https://my.vmware.com/group/vmware/downloads/get-download?downloadGroup=OVFTOOL441"; + sha256 = ovftoolSystem.sha256; + }; +in +stdenv.mkDerivation rec { + pname = "ovftool"; + inherit version; + + src = ovftoolSource; + + buildInputs = [ + glibc + libressl + c-ares + (curl.override { openssl = libressl; }) + expat + icu60 + xercesc + zlib + ]; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; + + sourceRoot = "."; + + unpackPhase = ovftoolSystem.unpackPhase; + + postUnpackHash = ovftoolSystem.postUnpackHash; + + # Expects a directory named 'ovftool' containing the ovftool install. + # Based on https://aur.archlinux.org/packages/vmware-ovftool/ + # with the addition of a libexec directory and a Nix-style binary wrapper. + installPhase = '' + runHook preInstall + if [ -d ovftool ]; then + # Ensure we're in the staging directory + cd ovftool + fi + # libraries + install -m 755 -d "$out/lib/${pname}" + # These all appear to be VMWare proprietary except for libgoogleurl. + # The rest of the libraries that the installer extracts are omitted here, + # and provided in buildInputs. + # + # FIXME: can we replace libgoogleurl? Possibly from Chromium? + # + install -m 644 -t "$out/lib/${pname}" \ + libgoogleurl.so.59 \ + libssoclient.so \ + libvim-types.so libvmacore.so libvmomi.so + # ovftool specifically wants 1.0.2 but our libcrypto is named 1.0.0 + ln -s "${lib.getLib libressl}/lib/libcrypto.so" \ + "$out/lib/${pname}/libcrypto.so.1.0.2" + ln -s "${lib.getLib libressl}/lib/libssl.so" \ + "$out/lib/${pname}/libssl.so.1.0.2" + # libexec + install -m 755 -d "$out/libexec/${pname}" + install -m 755 -t "$out/libexec/${pname}" ovftool.bin + install -m 644 -t "$out/libexec/${pname}" icudt44l.dat + # libexec resources + for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do + install -m 755 -d "$out/libexec/${pname}/$subdir" + install -m 644 -t "$out/libexec/${pname}/$subdir" "$subdir"/*.* + done + # EULA/OSS files + install -m 755 -d "$out/share/licenses/${pname}" + install -m 644 -t "$out/share/licenses/${pname}" \ + "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt" + # documentation files + install -m 755 -d "$out/share/doc/${pname}" + install -m 644 -t "$out/share/doc/${pname}" "README.txt" + # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by + # VMWare's wrapper script. We use C.UTF-8 instead. + install -m 755 -d "$out/bin" + makeWrapper "$out/libexec/${pname}/ovftool.bin" "$out/bin/ovftool" \ + --set-default LC_CTYPE C.UTF-8 \ + --prefix LD_LIBRARY_PATH : "$out/lib" + runHook postInstall + ''; + + preFixup = '' + addAutoPatchelfSearchPath "$out/lib" + ''; + + meta = with lib; { + description = "VMWare tools for working with OVF, OVA, and VMX images"; + license = licenses.unfree; + maintainers = with maintainers; [ numinit wolfangaukang ]; + platforms = builtins.attrNames ovftoolSystems; + }; +} diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index d9d44212601..7f9935b6c3c 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -10,6 +10,11 @@ , wayland , wayland-protocols , gtk-layer-shell +# gtk-layer-shell fails to cross-compile due to a hard dependency +# on gobject-introspection. +# Disable it when cross-compiling since it's an optional dependency. +# This disables transparency support. +, withGtkLayerShell ? (stdenv.buildPlatform == stdenv.hostPlatform) }: stdenv.mkDerivation rec { @@ -23,12 +28,15 @@ stdenv.mkDerivation rec { sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; }; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ gtk3 libxkbcommon wayland wayland-protocols + ] ++ lib.optionals withGtkLayerShell [ gtk-layer-shell ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8315b70dbfc..ac387f67ef8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -106,6 +106,10 @@ mapAliases ({ bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 + bazel_0 = throw "bazel 0 is past end of life as it is not an lts version"; # Added 2022-05-09 + bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09 + bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 + bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 @@ -380,6 +384,7 @@ mapAliases ({ fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 fastnlo = fastnlo_toolkit; # Added 2021-04-24 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13 + feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; @@ -871,6 +876,7 @@ mapAliases ({ nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; nixopsUnstable = nixops_unstable; # Added 2022-03-03 + nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 @@ -941,8 +947,8 @@ mapAliases ({ pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 phantomjs = throw "phantomjs 1.9.8 has been dropped due to lack of maintenance and security issues"; # Added 2022-02-20 + phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22 philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26 - # Obsolete PHP version aliases php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03 php73Packages = php73; # Added 2021-06-03 @@ -1061,6 +1067,7 @@ mapAliases ({ pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 pulseeffects-pw = easyeffects; # Added 2021-07-07 + py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; @@ -1277,6 +1284,7 @@ mapAliases ({ terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 + invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 tex-gyre-bonum-math = throw "'tex-gyre-bonum-math' has been renamed to/replaced by 'tex-gyre-math.bonum'"; # Converted to throw 2022-02-22 tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3614e65d4f1..9c906177bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -750,28 +750,13 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; - # See doc/builders/testers.chapter.md or - # https://nixos.org/manual/nixpkgs/unstable/#tester-invalidateFetcherByDrvHash - invalidateFetcherByDrvHash = f: args: - let - drvPath = (f args).drvPath; - # It's safe to discard the context, because we don't access the path. - salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath)); - # New derivation incorporating the original drv hash in the name - salted = f (args // { name = "${args.name or "source"}-salted-${salt}"; }); - # Make sure we did change the derivation. If the fetcher ignores `name`, - # `invalidateFetcherByDrvHash` doesn't work. - checked = - if salted.drvPath == drvPath - then throw "invalidateFetcherByDrvHash: Adding the derivation hash to the fixed-output derivation name had no effect. Make sure the fetcher's name argument ends up in the derivation name. Otherwise, the fetcher will not be re-run when its implementation changes. This is important for testing." - else salted; - in checked; - lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; + libgtkflow = callPackage ../development/libraries/libgtkflow { }; + libredirect = callPackage ../build-support/libredirect { }; madonctl = callPackage ../applications/misc/madonctl { }; @@ -2214,7 +2199,9 @@ with pkgs; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; - gbl = callPackage ../tools/archivers/gbl { }; + gbl = callPackage ../tools/archivers/gbl { + inherit (darwin.apple_sdk.frameworks) Security; + }; genann = callPackage ../development/libraries/genann { }; @@ -5796,8 +5783,6 @@ with pkgs; featherpad = qt5.callPackage ../applications/editors/featherpad {}; - feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; - fend = callPackage ../tools/misc/fend { }; ferm = callPackage ../tools/networking/ferm { }; @@ -7641,6 +7626,7 @@ with pkgs; lagrange = callPackage ../applications/networking/browsers/lagrange { inherit (darwin.apple_sdk.frameworks) AppKit; }; + lagrange-tui = lagrange.override { enableTUI = true; }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -9101,6 +9087,8 @@ with pkgs; otpw = callPackage ../os-specific/linux/otpw { }; + ovftool = callPackage ../tools/virtualization/ovftool { }; + overcommit = callPackage ../development/tools/overcommit { }; overmind = callPackage ../applications/misc/overmind { }; @@ -14847,37 +14835,6 @@ with pkgs; bazel = bazel_3; - bazel_0 = bazel_0_26; - - bazel_0_26 = callPackage ../development/tools/build-managers/bazel/bazel_0_26 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8_headless; - buildJdkName = "jdk8"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; - - bazel_0_29 = callPackage ../development/tools/build-managers/bazel/bazel_0_29 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8_headless; - buildJdkName = "jdk8"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - bazel_self = bazel_0_29; - }; - - bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { - inherit (darwin) cctools; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - buildJdk = jdk8_headless; - buildJdkName = "jdk8"; - runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - bazel_self = bazel_1; - }; - bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; @@ -15931,8 +15888,6 @@ with pkgs; pgcli = pkgs.python3Packages.pgcli; - phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; - picotool = callPackage ../development/tools/picotool { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -17909,8 +17864,13 @@ with pkgs; } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu71 = callPackage ../development/libraries/icu/71.nix ({ + nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu70; + icu = icu71; id3lib = callPackage ../development/libraries/id3lib { }; @@ -20494,6 +20454,8 @@ with pkgs; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; + sealcurses = callPackage ../development/libraries/sealcurses { }; + seasocks = callPackage ../development/libraries/seasocks { }; serd = callPackage ../development/libraries/serd {}; @@ -20846,6 +20808,8 @@ with pkgs; tet = callPackage ../development/tools/misc/tet { }; + the-foundation = callPackage ../development/libraries/the-foundation { }; + theft = callPackage ../development/libraries/theft { }; thrift = callPackage ../development/libraries/thrift { }; @@ -22451,10 +22415,7 @@ with pkgs; pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; - qpid-cpp = callPackage ../servers/amqp/qpid-cpp { - boost = boost155; - inherit (python2Packages) buildPythonPackage qpid-python; - }; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; @@ -27046,7 +27007,9 @@ with pkgs; marker = callPackage ../applications/editors/marker { }; - musikcube = callPackage ../applications/audio/musikcube {}; + musikcube = callPackage ../applications/audio/musikcube { + inherit (darwin.apple_sdk.frameworks) Cocoa SystemConfiguration; + }; libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; @@ -27074,6 +27037,8 @@ with pkgs; pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; + shelf = libsForQt5.callPackage ../applications/office/shelf { }; + shepherd = nodePackages."@nerdwallet/shepherd"; skate = callPackage ../applications/misc/skate { }; @@ -28474,6 +28439,8 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; + roxctl = callPackage ../applications/networking/cluster/roxctl { }; + rqbit = callPackage ../applications/networking/p2p/rqbit { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -29285,6 +29252,8 @@ with pkgs; rcs = callPackage ../applications/version-management/rcs { }; + rcshist = callPackage ../applications/version-management/rcshist { }; + rdesktop = callPackage ../applications/networking/remote/rdesktop { }; rdedup = callPackage ../tools/backup/rdedup { @@ -29864,6 +29833,8 @@ with pkgs; abseil-cpp = abseil-cpp_202111; }; + telegram-bot-api = callPackage ../servers/telegram-bot-api { }; + tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -31165,6 +31136,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; }; + haven-cli = callPackage ../applications/blockchains/haven-cli { + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; }; @@ -34196,58 +34171,6 @@ with pkgs; }; }; - /* - * Run a NixOS VM network test using this evaluation of Nixpkgs. - * - * It is mostly equivalent to `import ./make-test-python.nix` from the - * NixOS manual[1], except that your `pkgs` will be used instead of - * letting NixOS invoke Nixpkgs again. If a test machine needs to - * set NixOS options under `nixpkgs`, it must set only the - * `nixpkgs.pkgs` option. For the details, see the Nixpkgs - * `pkgs.nixos` documentation. - * - * Parameter: - * A NixOS VM test network, or path to it. Example: - * - * { lib, ... }: - * { name = "my-test"; - * nodes = { - * machine-1 = someNixOSConfiguration; - * machine-2 = ...; - * } - * } - * - * Result: - * A derivation that runs the VM test. - * - * [1]: For writing NixOS tests, see - * https://nixos.org/nixos/manual/index.html#sec-nixos-tests - */ - nixosTest = - let - /* The nixos/lib/testing-python.nix module, preapplied with arguments that - * make sense for this evaluation of Nixpkgs. - */ - nixosTesting = - (import ../../nixos/lib/testing-python.nix { - inherit (stdenv.hostPlatform) system; - inherit pkgs; - extraConfigurations = [( - { lib, ... }: { - config.nixpkgs.pkgs = lib.mkDefault pkgs; - } - )]; - }); - in - test: - let - loadedTest = if builtins.typeOf test == "path" - then import test - else test; - calledTest = lib.toFunction loadedTest pkgs; - in - nixosTesting.makeTest calledTest; - nixosOptionsDoc = attrs: (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs); @@ -34463,8 +34386,6 @@ with pkgs; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; - py-wmi-client = callPackage ../tools/networking/py-wmi-client { }; - qdl = callPackage ../tools/misc/qdl { }; rates = callPackage ../tools/misc/rates { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3fa17b35853..8795f855691 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -19,7 +19,6 @@ , html-tidy , icu64 , libXpm -, libedit , libffi , libiconv , libjpeg @@ -80,16 +79,29 @@ lib.makeScope pkgs.newScope (self: with self; { pname = "php-${name}"; extensionName = name; + outputs = [ "out" "dev" ]; + inherit (php.unwrapped) version src; - sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php.unwrapped autoconf pkg-config re2c ]; - inherit configureFlags internalDeps buildInputs - zendExtension doCheck; - prePatch = "pushd ../.."; - postPatch = "popd"; + nativeBuildInputs = [ + php.unwrapped + autoconf + pkg-config + re2c + ]; + + inherit configureFlags internalDeps buildInputs zendExtension doCheck; + + preConfigurePhases = [ + "cdToExtensionRootPhase" + ]; + + cdToExtensionRootPhase = '' + # Go to extension source root. + cd "ext/${name}" + ''; preConfigure = '' nullglobRestore=$(shopt -p nullglob) @@ -101,19 +113,28 @@ lib.makeScope pkgs.newScope (self: with self; { fi $nullglobRestore + phpize ${postPhpize} - ${lib.concatMapStringsSep "\n" + + ${lib.concatMapStringsSep + "\n" (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") - internalDeps} + internalDeps + } ''; + checkPhase = '' runHook preCheck + NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test + runHook postCheck ''; - outputs = [ "out" "dev" ]; + installPhase = '' + runHook preInstall + mkdir -p $out/lib/php/extensions cp modules/${name}.so $out/lib/php/extensions/${name}.so mkdir -p $dev/include @@ -122,6 +143,8 @@ lib.makeScope pkgs.newScope (self: with self; { --filter="- *" \ --prune-empty-dirs \ . $dev/include/ + + runHook postInstall ''; meta = { @@ -520,10 +543,23 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "pspell"; configureFlags = [ "--with-pspell=${aspell}" ]; } { name = "readline"; - buildInputs = [ libedit readline ]; - configureFlags = [ "--with-readline=${readline.dev}" ]; - postPhpize = lib.optionalString (lib.versionOlder php.version "7.4") '' - substituteInPlace configure --replace 'as_fn_error $? "Please reinstall libedit - I cannot find readline.h" "$LINENO" 5' ':' + buildInputs = [ + readline + ]; + configureFlags = [ + "--with-readline=${readline.dev}" + ]; + postPatch = '' + # Fix `--with-readline` option not being available. + # `PHP_ALWAYS_SHARED` generated by phpize enables all options + # without the possibility to override them. But when `--with-libedit` + # is enabled, `--with-readline` is not registered. + echo ' + AC_DEFUN([PHP_ALWAYS_SHARED],[ + test "[$]$1" != "no" && ext_shared=yes + ])dnl + ' | cat - ext/readline/config.m4 > ext/readline/config.m4.tmp + mv ext/readline/config.m4{.tmp,} ''; doCheck = false; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3c6b11d4a6..dec038f9692 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -120,6 +120,7 @@ in { pythonImportsCheckHook pythonNamespacesHook pythonRecompileBytecodeHook + pythonRelaxDepsHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook setuptoolsBuildHook @@ -9494,6 +9495,8 @@ in { six = callPackage ../development/python-modules/six { }; + sjcl = callPackage ../development/python-modules/sjcl { }; + skein = callPackage ../development/python-modules/skein { }; skidl = callPackage ../development/python-modules/skidl { }; @@ -11193,7 +11196,6 @@ in { youtube-dl-light = callPackage ../tools/misc/youtube-dl { ffmpegSupport = false; - phantomjsSupport = false; }; yoyo-migrations = callPackage ../development/python-modules/yoyo-migrations { }; @@ -11203,7 +11205,6 @@ in { yt-dlp-light = callPackage ../tools/misc/yt-dlp { atomicparsleySupport = false; ffmpegSupport = false; - phantomjsSupport = false; rtmpSupport = false; };